| Message ID | 1430990964-10528-23-git-send-email-zhaoshenglong@huawei.com |
|---|---|
| State | New |
| Headers | show |
On 7 May 2015 at 10:29, Shannon Zhao <zhaoshenglong@huawei.com> wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > Expose the needed device information to the table generation > insfrastructure and register a machine_init_done notify to "infrastructure". > call virt_acpi_build(). > > Add CONFIG_ACPI to arm-softmmu.mak. > > Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > --- > default-configs/arm-softmmu.mak | 1 + > default-configs/i386-softmmu.mak | 3 ++ > default-configs/mips-softmmu.mak | 3 ++ > default-configs/mips64-softmmu.mak | 3 ++ > default-configs/mips64el-softmmu.mak | 3 ++ > default-configs/mipsel-softmmu.mak | 3 ++ > default-configs/x86_64-softmmu.mak | 3 ++ > hw/acpi/Makefile.objs | 5 ++- > hw/arm/virt.c | 78 ++++++++++++++++++++++++++++++++---- > hw/i2c/Makefile.objs | 2 +- > 10 files changed, 94 insertions(+), 10 deletions(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index a767e4b..74f1db3 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -101,3 +101,4 @@ CONFIG_ALLWINNER_A10=y > CONFIG_XIO3130=y > CONFIG_IOH3420=y > CONFIG_I82801B11=y > +CONFIG_ACPI=y > diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak > index 6a74e00..d2de500 100644 > --- a/default-configs/i386-softmmu.mak > +++ b/default-configs/i386-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_CORE=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y This is splitting the basic CONFIG_ACPI into several pieces, right? I think that deserves its own patch. What's the difference now between "CONFIG_ACPI" and "CONFIG_ACPI_CORE" ? > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_IDE_ISA=y > diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak > index cce2c81..c96d42d 100644 > --- a/default-configs/mips-softmmu.mak > +++ b/default-configs/mips-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_CORE=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak > index 7a88a08..d229f9e 100644 > --- a/default-configs/mips64-softmmu.mak > +++ b/default-configs/mips64-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_CORE=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak > index 095de43..ea31b8b 100644 > --- a/default-configs/mips64el-softmmu.mak > +++ b/default-configs/mips64el-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_CORE=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak > index 0e25108..9a4462e 100644 > --- a/default-configs/mipsel-softmmu.mak > +++ b/default-configs/mipsel-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_CORE=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak > index 46b87dd..11019b6 100644 > --- a/default-configs/x86_64-softmmu.mak > +++ b/default-configs/x86_64-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_CORE=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_IDE_ISA=y > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > index b9fefa7..511771a 100644 > --- a/hw/acpi/Makefile.objs > +++ b/hw/acpi/Makefile.objs > @@ -1,5 +1,6 @@ > -common-obj-$(CONFIG_ACPI) += core.o piix4.o ich9.o pcihp.o cpu_hotplug.o > -common-obj-$(CONFIG_ACPI) += memory_hotplug.o > +common-obj-$(CONFIG_ACPI_CORE) += core.o piix4.o ich9.o pcihp.o Why is x86 specific stuff like piix4 in the CONFIG_ACPI_CORE set? > +common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o > +common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o > common-obj-$(CONFIG_ACPI) += acpi_interface.o > common-obj-$(CONFIG_ACPI) += bios-linker-loader.o > common-obj-$(CONFIG_ACPI) += aml-build.o > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 565f573..9291045 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -43,6 +43,7 @@ > #include "qemu/bitops.h" > #include "qemu/error-report.h" > #include "hw/pci-host/gpex.h" > +#include "hw/arm/virt-acpi-build.h" > > #define NUM_VIRTIO_TRANSPORTS 32 > > @@ -60,6 +61,11 @@ > #define GIC_FDT_IRQ_PPI_CPU_START 8 > #define GIC_FDT_IRQ_PPI_CPU_WIDTH 8 > > +#define ARCH_TIMER_VIRT_IRQ 11 > +#define ARCH_TIMER_S_EL1_IRQ 13 > +#define ARCH_TIMER_NS_EL1_IRQ 14 > +#define ARCH_TIMER_NS_EL2_IRQ 10 > + > enum { > VIRT_FLASH, > VIRT_MEM, > @@ -149,6 +155,29 @@ static const int a15irqmap[] = { > [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ > }; > > +static AcpiMadtInfo madt_info = { > + (MemMap *)&a15memmap[VIRT_GIC_CPU], > + (MemMap *)&a15memmap[VIRT_GIC_DIST] These casts are really bad. You should just make sure the types agree properly so we don't need a cast at all, rather than having two different types which we implicitly require to have identical structure. > +}; > + > +static AcpiDsdtInfo dsdt_info = { "AcpiDsdtInfo" sounds like it ought to be a generic ACPI structure, but in fact it's been defined in include/hw/arm/virt-acpi-build.h. Is it actually generic but in the wrong place? Or if it's not generic, why can't the ACPI table building code use our existing MemMapEntry[] and irqmap[] arrays to get the information it wants, rather than having its own data structures that we have to copy everything across to? If there's missing info or unhelpful layout in the current virt data structures we can always improve them. > + (MemMap *)&a15memmap[VIRT_UART], > + .uart_irq = &a15irqmap[VIRT_UART], Please don't mix named-initializer and non-named-initializer syntax like this. > + (MemMap *)&a15memmap[VIRT_MMIO], > + .virtio_mmio_irq = &a15irqmap[VIRT_MMIO], > + .virtio_mmio_num = NUM_VIRTIO_TRANSPORTS, > + (MemMap *)&a15memmap[VIRT_RTC], > + .rtc_irq = &a15irqmap[VIRT_RTC], > + (MemMap *)&a15memmap[VIRT_FLASH], > +}; thanks -- PMM
On 2015/5/8 0:09, Peter Maydell wrote: > On 7 May 2015 at 10:29, Shannon Zhao <zhaoshenglong@huawei.com> wrote: >> From: Shannon Zhao <shannon.zhao@linaro.org> >> >> Expose the needed device information to the table generation >> insfrastructure and register a machine_init_done notify to > > "infrastructure". > >> call virt_acpi_build(). >> >> Add CONFIG_ACPI to arm-softmmu.mak. >> >> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> >> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> >> --- >> default-configs/arm-softmmu.mak | 1 + >> default-configs/i386-softmmu.mak | 3 ++ >> default-configs/mips-softmmu.mak | 3 ++ >> default-configs/mips64-softmmu.mak | 3 ++ >> default-configs/mips64el-softmmu.mak | 3 ++ >> default-configs/mipsel-softmmu.mak | 3 ++ >> default-configs/x86_64-softmmu.mak | 3 ++ >> hw/acpi/Makefile.objs | 5 ++- >> hw/arm/virt.c | 78 ++++++++++++++++++++++++++++++++---- >> hw/i2c/Makefile.objs | 2 +- >> 10 files changed, 94 insertions(+), 10 deletions(-) >> >> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak >> index a767e4b..74f1db3 100644 >> --- a/default-configs/arm-softmmu.mak >> +++ b/default-configs/arm-softmmu.mak >> @@ -101,3 +101,4 @@ CONFIG_ALLWINNER_A10=y >> CONFIG_XIO3130=y >> CONFIG_IOH3420=y >> CONFIG_I82801B11=y >> +CONFIG_ACPI=y >> diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak >> index 6a74e00..d2de500 100644 >> --- a/default-configs/i386-softmmu.mak >> +++ b/default-configs/i386-softmmu.mak >> @@ -15,6 +15,9 @@ CONFIG_PCSPK=y >> CONFIG_PCKBD=y >> CONFIG_FDC=y >> CONFIG_ACPI=y >> +CONFIG_ACPI_CORE=y >> +CONFIG_ACPI_MEMORY_HOTPLUG=y >> +CONFIG_ACPI_CPU_HOTPLUG=y > > This is splitting the basic CONFIG_ACPI into several pieces, right? > I think that deserves its own patch. > Ok, will split this patch. > What's the difference now between "CONFIG_ACPI" and "CONFIG_ACPI_CORE" ? > I didn't find a proper name. Maybe we should name it "CONFIG_ACPI_x86" for "core.o piix4.o ich9.o pcihp.o" as these files are for x86. >> CONFIG_APM=y >> CONFIG_I8257=y >> CONFIG_IDE_ISA=y >> diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak >> index cce2c81..c96d42d 100644 >> --- a/default-configs/mips-softmmu.mak >> +++ b/default-configs/mips-softmmu.mak >> @@ -15,6 +15,9 @@ CONFIG_PCSPK=y >> CONFIG_PCKBD=y >> CONFIG_FDC=y >> CONFIG_ACPI=y >> +CONFIG_ACPI_CORE=y >> +CONFIG_ACPI_MEMORY_HOTPLUG=y >> +CONFIG_ACPI_CPU_HOTPLUG=y >> CONFIG_APM=y >> CONFIG_I8257=y >> CONFIG_PIIX4=y >> diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak >> index 7a88a08..d229f9e 100644 >> --- a/default-configs/mips64-softmmu.mak >> +++ b/default-configs/mips64-softmmu.mak >> @@ -15,6 +15,9 @@ CONFIG_PCSPK=y >> CONFIG_PCKBD=y >> CONFIG_FDC=y >> CONFIG_ACPI=y >> +CONFIG_ACPI_CORE=y >> +CONFIG_ACPI_MEMORY_HOTPLUG=y >> +CONFIG_ACPI_CPU_HOTPLUG=y >> CONFIG_APM=y >> CONFIG_I8257=y >> CONFIG_PIIX4=y >> diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak >> index 095de43..ea31b8b 100644 >> --- a/default-configs/mips64el-softmmu.mak >> +++ b/default-configs/mips64el-softmmu.mak >> @@ -15,6 +15,9 @@ CONFIG_PCSPK=y >> CONFIG_PCKBD=y >> CONFIG_FDC=y >> CONFIG_ACPI=y >> +CONFIG_ACPI_CORE=y >> +CONFIG_ACPI_MEMORY_HOTPLUG=y >> +CONFIG_ACPI_CPU_HOTPLUG=y >> CONFIG_APM=y >> CONFIG_I8257=y >> CONFIG_PIIX4=y >> diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak >> index 0e25108..9a4462e 100644 >> --- a/default-configs/mipsel-softmmu.mak >> +++ b/default-configs/mipsel-softmmu.mak >> @@ -15,6 +15,9 @@ CONFIG_PCSPK=y >> CONFIG_PCKBD=y >> CONFIG_FDC=y >> CONFIG_ACPI=y >> +CONFIG_ACPI_CORE=y >> +CONFIG_ACPI_MEMORY_HOTPLUG=y >> +CONFIG_ACPI_CPU_HOTPLUG=y >> CONFIG_APM=y >> CONFIG_I8257=y >> CONFIG_PIIX4=y >> diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak >> index 46b87dd..11019b6 100644 >> --- a/default-configs/x86_64-softmmu.mak >> +++ b/default-configs/x86_64-softmmu.mak >> @@ -15,6 +15,9 @@ CONFIG_PCSPK=y >> CONFIG_PCKBD=y >> CONFIG_FDC=y >> CONFIG_ACPI=y >> +CONFIG_ACPI_CORE=y >> +CONFIG_ACPI_MEMORY_HOTPLUG=y >> +CONFIG_ACPI_CPU_HOTPLUG=y >> CONFIG_APM=y >> CONFIG_I8257=y >> CONFIG_IDE_ISA=y >> diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs >> index b9fefa7..511771a 100644 >> --- a/hw/acpi/Makefile.objs >> +++ b/hw/acpi/Makefile.objs >> @@ -1,5 +1,6 @@ >> -common-obj-$(CONFIG_ACPI) += core.o piix4.o ich9.o pcihp.o cpu_hotplug.o >> -common-obj-$(CONFIG_ACPI) += memory_hotplug.o >> +common-obj-$(CONFIG_ACPI_CORE) += core.o piix4.o ich9.o pcihp.o > > Why is x86 specific stuff like piix4 in the CONFIG_ACPI_CORE set? > >> +common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o >> +common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o >> common-obj-$(CONFIG_ACPI) += acpi_interface.o >> common-obj-$(CONFIG_ACPI) += bios-linker-loader.o >> common-obj-$(CONFIG_ACPI) += aml-build.o >> diff --git a/hw/arm/virt.c b/hw/arm/virt.c >> index 565f573..9291045 100644 >> --- a/hw/arm/virt.c >> +++ b/hw/arm/virt.c >> @@ -43,6 +43,7 @@ >> #include "qemu/bitops.h" >> #include "qemu/error-report.h" >> #include "hw/pci-host/gpex.h" >> +#include "hw/arm/virt-acpi-build.h" >> >> #define NUM_VIRTIO_TRANSPORTS 32 >> >> @@ -60,6 +61,11 @@ >> #define GIC_FDT_IRQ_PPI_CPU_START 8 >> #define GIC_FDT_IRQ_PPI_CPU_WIDTH 8 >> >> +#define ARCH_TIMER_VIRT_IRQ 11 >> +#define ARCH_TIMER_S_EL1_IRQ 13 >> +#define ARCH_TIMER_NS_EL1_IRQ 14 >> +#define ARCH_TIMER_NS_EL2_IRQ 10 >> + >> enum { >> VIRT_FLASH, >> VIRT_MEM, >> @@ -149,6 +155,29 @@ static const int a15irqmap[] = { >> [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ >> }; >> >> +static AcpiMadtInfo madt_info = { >> + (MemMap *)&a15memmap[VIRT_GIC_CPU], >> + (MemMap *)&a15memmap[VIRT_GIC_DIST] > > These casts are really bad. You should just make sure the > types agree properly so we don't need a cast at all, rather > than having two different types which we implicitly require > to have identical structure. > Ok, will fix this. >> +}; >> + >> +static AcpiDsdtInfo dsdt_info = { > > "AcpiDsdtInfo" sounds like it ought to be a generic > ACPI structure, but in fact it's been defined in > include/hw/arm/virt-acpi-build.h. Is it actually > generic but in the wrong place? Or if it's not > generic, It's not generic. This structure is used to get the virt borad info. > why can't the ACPI table building code use > our existing MemMapEntry[] and irqmap[] arrays to > get the information it wants, rather than having > its own data structures that we have to copy everything > across to? If there's missing info or unhelpful layout > in the current virt data structures we can always > improve them. > Ok, will reuse MemMapEntry[] and irqmap[]. >> + (MemMap *)&a15memmap[VIRT_UART], >> + .uart_irq = &a15irqmap[VIRT_UART], > > Please don't mix named-initializer and non-named-initializer > syntax like this. > >> + (MemMap *)&a15memmap[VIRT_MMIO], >> + .virtio_mmio_irq = &a15irqmap[VIRT_MMIO], >> + .virtio_mmio_num = NUM_VIRTIO_TRANSPORTS, >> + (MemMap *)&a15memmap[VIRT_RTC], >> + .rtc_irq = &a15irqmap[VIRT_RTC], >> + (MemMap *)&a15memmap[VIRT_FLASH], >> +}; > > thanks > -- PMM > > > . >
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index a767e4b..74f1db3 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -101,3 +101,4 @@ CONFIG_ALLWINNER_A10=y CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y +CONFIG_ACPI=y diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 6a74e00..d2de500 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -15,6 +15,9 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_ACPI_CORE=y +CONFIG_ACPI_MEMORY_HOTPLUG=y +CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y CONFIG_IDE_ISA=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index cce2c81..c96d42d 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -15,6 +15,9 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_ACPI_CORE=y +CONFIG_ACPI_MEMORY_HOTPLUG=y +CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y CONFIG_PIIX4=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 7a88a08..d229f9e 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -15,6 +15,9 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_ACPI_CORE=y +CONFIG_ACPI_MEMORY_HOTPLUG=y +CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y CONFIG_PIIX4=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 095de43..ea31b8b 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -15,6 +15,9 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_ACPI_CORE=y +CONFIG_ACPI_MEMORY_HOTPLUG=y +CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y CONFIG_PIIX4=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index 0e25108..9a4462e 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -15,6 +15,9 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_ACPI_CORE=y +CONFIG_ACPI_MEMORY_HOTPLUG=y +CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y CONFIG_PIIX4=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 46b87dd..11019b6 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -15,6 +15,9 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y +CONFIG_ACPI_CORE=y +CONFIG_ACPI_MEMORY_HOTPLUG=y +CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y CONFIG_IDE_ISA=y diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index b9fefa7..511771a 100644 --- a/hw/acpi/Makefile.objs +++ b/hw/acpi/Makefile.objs @@ -1,5 +1,6 @@ -common-obj-$(CONFIG_ACPI) += core.o piix4.o ich9.o pcihp.o cpu_hotplug.o -common-obj-$(CONFIG_ACPI) += memory_hotplug.o +common-obj-$(CONFIG_ACPI_CORE) += core.o piix4.o ich9.o pcihp.o +common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o +common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o common-obj-$(CONFIG_ACPI) += acpi_interface.o common-obj-$(CONFIG_ACPI) += bios-linker-loader.o common-obj-$(CONFIG_ACPI) += aml-build.o diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 565f573..9291045 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -43,6 +43,7 @@ #include "qemu/bitops.h" #include "qemu/error-report.h" #include "hw/pci-host/gpex.h" +#include "hw/arm/virt-acpi-build.h" #define NUM_VIRTIO_TRANSPORTS 32 @@ -60,6 +61,11 @@ #define GIC_FDT_IRQ_PPI_CPU_START 8 #define GIC_FDT_IRQ_PPI_CPU_WIDTH 8 +#define ARCH_TIMER_VIRT_IRQ 11 +#define ARCH_TIMER_S_EL1_IRQ 13 +#define ARCH_TIMER_NS_EL1_IRQ 14 +#define ARCH_TIMER_NS_EL2_IRQ 10 + enum { VIRT_FLASH, VIRT_MEM, @@ -149,6 +155,29 @@ static const int a15irqmap[] = { [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ }; +static AcpiMadtInfo madt_info = { + (MemMap *)&a15memmap[VIRT_GIC_CPU], + (MemMap *)&a15memmap[VIRT_GIC_DIST] +}; + +static AcpiDsdtInfo dsdt_info = { + (MemMap *)&a15memmap[VIRT_UART], + .uart_irq = &a15irqmap[VIRT_UART], + (MemMap *)&a15memmap[VIRT_MMIO], + .virtio_mmio_irq = &a15irqmap[VIRT_MMIO], + .virtio_mmio_num = NUM_VIRTIO_TRANSPORTS, + (MemMap *)&a15memmap[VIRT_RTC], + .rtc_irq = &a15irqmap[VIRT_RTC], + (MemMap *)&a15memmap[VIRT_FLASH], +}; + +static AcpiGtdtInfo gtdt_info = { + ARCH_TIMER_VIRT_IRQ + 16, + ARCH_TIMER_S_EL1_IRQ + 16, + ARCH_TIMER_NS_EL1_IRQ + 16, + ARCH_TIMER_NS_EL2_IRQ + 16 +}; + static VirtBoardInfo machines[] = { { .cpu_model = "cortex-a15", @@ -289,10 +318,10 @@ static void fdt_add_timer_nodes(const VirtBoardInfo *vbi) "arm,armv7-timer"); } qemu_fdt_setprop_cells(vbi->fdt, "/timer", "interrupts", - GIC_FDT_IRQ_TYPE_PPI, 13, irqflags, - GIC_FDT_IRQ_TYPE_PPI, 14, irqflags, - GIC_FDT_IRQ_TYPE_PPI, 11, irqflags, - GIC_FDT_IRQ_TYPE_PPI, 10, irqflags); + GIC_FDT_IRQ_TYPE_PPI, ARCH_TIMER_S_EL1_IRQ, irqflags, + GIC_FDT_IRQ_TYPE_PPI, ARCH_TIMER_NS_EL1_IRQ, irqflags, + GIC_FDT_IRQ_TYPE_PPI, ARCH_TIMER_VIRT_IRQ, irqflags, + GIC_FDT_IRQ_TYPE_PPI, ARCH_TIMER_NS_EL2_IRQ, irqflags); } static void fdt_add_cpu_nodes(const VirtBoardInfo *vbi) @@ -639,8 +668,8 @@ static void create_pcie_irq_map(const VirtBoardInfo *vbi, uint32_t gic_phandle, 0x7 /* PCI irq */); } -static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic, - uint32_t gic_phandle) +static AcpiPcieInfo *create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic, + uint32_t gic_phandle) { hwaddr base = vbi->memmap[VIRT_PCIE].base; hwaddr size = vbi->memmap[VIRT_PCIE].size; @@ -660,6 +689,7 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic, DeviceState *dev; char *nodename; int i; + AcpiPcieInfo *pcie_info; base_ecam = QEMU_ALIGN_DOWN(end - size_ecam, size_ecam); base_ioport = QEMU_ALIGN_DOWN(base_ecam - size_ioport, size_ioport); @@ -715,6 +745,18 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic, create_pcie_irq_map(vbi, gic_phandle, irq, nodename); g_free(nodename); + + pcie_info = g_malloc0(sizeof *pcie_info); + pcie_info->pcie_mmio.addr = base_mmio; + pcie_info->pcie_mmio.size = size_mmio; + pcie_info->pcie_ioport.addr = base_ioport; + pcie_info->pcie_ioport.size = size_ioport; + pcie_info->pcie_ecam.addr = base_ecam; + pcie_info->pcie_ecam.size = size_ecam; + pcie_info->nr_pcie_buses = nr_pcie_buses; + pcie_info->pcie_irq = &a15irqmap[VIRT_PCIE]; + + return pcie_info; } static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) @@ -725,6 +767,15 @@ static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) return board->fdt; } +static +void virt_guest_info_machine_done(Notifier *notifier, void *data) +{ + VirtGuestInfoState *guest_info_state = container_of(notifier, + VirtGuestInfoState, + machine_done); + virt_acpi_setup(&guest_info_state->info); +} + static void machvirt_init(MachineState *machine) { VirtMachineState *vms = VIRT_MACHINE(machine); @@ -734,6 +785,8 @@ static void machvirt_init(MachineState *machine) MemoryRegion *ram = g_new(MemoryRegion, 1); const char *cpu_model = machine->cpu_model; VirtBoardInfo *vbi; + VirtGuestInfoState *guest_info_state = g_malloc0(sizeof *guest_info_state); + VirtGuestInfo *guest_info = &guest_info_state->info; uint32_t gic_phandle; char **cpustr; @@ -817,7 +870,7 @@ static void machvirt_init(MachineState *machine) create_rtc(vbi, pic); - create_pcie(vbi, pic, gic_phandle); + guest_info->pcie_info = create_pcie(vbi, pic, gic_phandle); /* Create mmio transports, so the user can create virtio backends * (which will be automatically plugged in to the transports). If @@ -826,6 +879,7 @@ static void machvirt_init(MachineState *machine) create_virtio_devices(vbi, pic); create_fw_cfg(vbi); + rom_set_fw(fw_cfg_find()); vbi->bootinfo.ram_size = machine->ram_size; vbi->bootinfo.kernel_filename = machine->kernel_filename; @@ -836,6 +890,16 @@ static void machvirt_init(MachineState *machine) vbi->bootinfo.loader_start = vbi->memmap[VIRT_MEM].base; vbi->bootinfo.get_dtb = machvirt_dtb; vbi->bootinfo.firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0); + + guest_info->smp_cpus = smp_cpus; + guest_info->max_cpus = max_cpus; + guest_info->fw_cfg = fw_cfg_find(); + guest_info->madt_info = &madt_info; + guest_info->dsdt_info = &dsdt_info; + guest_info->gtdt_info = >dt_info; + guest_info_state->machine_done.notify = virt_guest_info_machine_done; + qemu_add_machine_init_done_notifier(&guest_info_state->machine_done); + arm_load_kernel(ARM_CPU(first_cpu), &vbi->bootinfo); } diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs index 648278e..c94e6e6 100644 --- a/hw/i2c/Makefile.objs +++ b/hw/i2c/Makefile.objs @@ -1,6 +1,6 @@ common-obj-y += core.o smbus.o smbus_eeprom.o common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o -common-obj-$(CONFIG_ACPI) += smbus_ich9.o +common-obj-$(CONFIG_ACPI_CORE) += smbus_ich9.o common-obj-$(CONFIG_APM) += pm_smbus.o common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o