Message ID | 20200505134305.22666-6-kraxel@redhat.com |
---|---|
State | New |
Headers | show |
Series | microvm: add acpi support | expand |
On Tue, 5 May 2020 15:42:57 +0200 Gerd Hoffmann <kraxel@redhat.com> wrote: the same question like with FACS, why legacy data are needed for with reduced profile? it mostly initializes data for fixed-hw model. I'd preffer if you drop FACS and use minimal FADT like build_fadt_rev5() does without pulling along a bunch of legacy junk (unless there is a good justification for it). > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > hw/i386/acpi-common.h | 5 ++++- > hw/i386/acpi-build.c | 43 +------------------------------------------ > hw/i386/acpi-common.c | 43 +++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 48 insertions(+), 43 deletions(-) > > diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h > index 583c320bbe7d..5788a13da9ca 100644 > --- a/hw/i386/acpi-common.h > +++ b/hw/i386/acpi-common.h > @@ -1,7 +1,8 @@ > #ifndef HW_I386_ACPI_COMMON_H > #define HW_I386_ACPI_COMMON_H > + > +#include "include/hw/acpi/acpi-defs.h" > #include "include/hw/acpi/acpi_dev_interface.h" > - > #include "include/hw/acpi/bios-linker-loader.h" > #include "include/hw/i386/x86.h" > > @@ -12,5 +13,7 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker, > X86MachineState *x86ms, AcpiDeviceIf *adev, > bool has_pci); > void acpi_build_facs(GArray *table_data); > +void acpi_init_common_fadt_data(MachineState *ms, Object *o, > + AcpiFadtData *data); > > #endif > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index a69b85a266e7..d1f14394734e 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -132,47 +132,6 @@ const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio = { > .bit_width = NVDIMM_ACPI_IO_LEN << 3 > }; > > -static void init_common_fadt_data(MachineState *ms, Object *o, > - AcpiFadtData *data) > -{ > - uint32_t io = object_property_get_uint(o, ACPI_PM_PROP_PM_IO_BASE, NULL); > - AmlAddressSpace as = AML_AS_SYSTEM_IO; > - AcpiFadtData fadt = { > - .rev = 3, > - .flags = > - (1 << ACPI_FADT_F_WBINVD) | > - (1 << ACPI_FADT_F_PROC_C1) | > - (1 << ACPI_FADT_F_SLP_BUTTON) | > - (1 << ACPI_FADT_F_RTC_S4) | > - (1 << ACPI_FADT_F_USE_PLATFORM_CLOCK) | > - /* APIC destination mode ("Flat Logical") has an upper limit of 8 > - * CPUs for more than 8 CPUs, "Clustered Logical" mode has to be > - * used > - */ > - ((ms->smp.max_cpus > 8) ? > - (1 << ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL) : 0), > - .int_model = 1 /* Multiple APIC */, > - .rtc_century = RTC_CENTURY, > - .plvl2_lat = 0xfff /* C2 state not supported */, > - .plvl3_lat = 0xfff /* C3 state not supported */, > - .smi_cmd = ACPI_PORT_SMI_CMD, > - .sci_int = object_property_get_uint(o, ACPI_PM_PROP_SCI_INT, NULL), > - .acpi_enable_cmd = > - object_property_get_uint(o, ACPI_PM_PROP_ACPI_ENABLE_CMD, NULL), > - .acpi_disable_cmd = > - object_property_get_uint(o, ACPI_PM_PROP_ACPI_DISABLE_CMD, NULL), > - .pm1a_evt = { .space_id = as, .bit_width = 4 * 8, .address = io }, > - .pm1a_cnt = { .space_id = as, .bit_width = 2 * 8, > - .address = io + 0x04 }, > - .pm_tmr = { .space_id = as, .bit_width = 4 * 8, .address = io + 0x08 }, > - .gpe0_blk = { .space_id = as, .bit_width = > - object_property_get_uint(o, ACPI_PM_PROP_GPE0_BLK_LEN, NULL) * 8, > - .address = object_property_get_uint(o, ACPI_PM_PROP_GPE0_BLK, NULL) > - }, > - }; > - *data = fadt; > -} > - > static Object *object_resolve_type_unambiguous(const char *typename) > { > bool ambig; > @@ -195,7 +154,7 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm) > pm->pcihp_io_len = 0; > > assert(obj); > - init_common_fadt_data(machine, obj, &pm->fadt); > + acpi_init_common_fadt_data(machine, obj, &pm->fadt); > if (piix) { > /* w2k requires FADT(rev1) or it won't boot, keep PC compatible */ > pm->fadt.rev = 1; > diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c > index 5187653893a8..69dfbf0252f3 100644 > --- a/hw/i386/acpi-common.c > +++ b/hw/i386/acpi-common.c > @@ -28,6 +28,8 @@ > #include "hw/acpi/aml-build.h" > #include "hw/acpi/utils.h" > #include "hw/i386/pc.h" > +#include "hw/isa/apm.h" > +#include "hw/rtc/mc146818rtc_regs.h" > #include "target/i386/cpu.h" > > #include "acpi-build.h" > @@ -161,3 +163,44 @@ void acpi_build_facs(GArray *table_data) > memcpy(&facs->signature, "FACS", 4); > facs->length = cpu_to_le32(sizeof(*facs)); > } > + > +void acpi_init_common_fadt_data(MachineState *ms, Object *o, > + AcpiFadtData *data) > +{ > + uint32_t io = object_property_get_uint(o, ACPI_PM_PROP_PM_IO_BASE, NULL); > + AmlAddressSpace as = AML_AS_SYSTEM_IO; > + AcpiFadtData fadt = { > + .rev = 3, > + .flags = > + (1 << ACPI_FADT_F_WBINVD) | > + (1 << ACPI_FADT_F_PROC_C1) | > + (1 << ACPI_FADT_F_SLP_BUTTON) | > + (1 << ACPI_FADT_F_RTC_S4) | > + (1 << ACPI_FADT_F_USE_PLATFORM_CLOCK) | > + /* APIC destination mode ("Flat Logical") has an upper limit of 8 > + * CPUs for more than 8 CPUs, "Clustered Logical" mode has to be > + * used > + */ > + ((ms->smp.max_cpus > 8) ? > + (1 << ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL) : 0), > + .int_model = 1 /* Multiple APIC */, > + .rtc_century = RTC_CENTURY, > + .plvl2_lat = 0xfff /* C2 state not supported */, > + .plvl3_lat = 0xfff /* C3 state not supported */, > + .smi_cmd = ACPI_PORT_SMI_CMD, > + .sci_int = object_property_get_uint(o, ACPI_PM_PROP_SCI_INT, NULL), > + .acpi_enable_cmd = > + object_property_get_uint(o, ACPI_PM_PROP_ACPI_ENABLE_CMD, NULL), > + .acpi_disable_cmd = > + object_property_get_uint(o, ACPI_PM_PROP_ACPI_DISABLE_CMD, NULL), > + .pm1a_evt = { .space_id = as, .bit_width = 4 * 8, .address = io }, > + .pm1a_cnt = { .space_id = as, .bit_width = 2 * 8, > + .address = io + 0x04 }, > + .pm_tmr = { .space_id = as, .bit_width = 4 * 8, .address = io + 0x08 }, > + .gpe0_blk = { .space_id = as, .bit_width = > + object_property_get_uint(o, ACPI_PM_PROP_GPE0_BLK_LEN, NULL) * 8, > + .address = object_property_get_uint(o, ACPI_PM_PROP_GPE0_BLK, NULL) > + }, > + }; > + *data = fadt; > +}
On Tue, May 05, 2020 at 04:25:55PM +0200, Igor Mammedov wrote: > On Tue, 5 May 2020 15:42:57 +0200 > Gerd Hoffmann <kraxel@redhat.com> wrote: > > the same question like with FACS, why legacy data are needed for with reduced profile? > it mostly initializes data for fixed-hw model. > > I'd preffer if you drop FACS and use minimal FADT like build_fadt_rev5() does > without pulling along a bunch of legacy junk (unless there is a good justification for it). Leftover from the isa-acpi version, it is indeed not needed any more (same for facs). take care, Gerd
diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h index 583c320bbe7d..5788a13da9ca 100644 --- a/hw/i386/acpi-common.h +++ b/hw/i386/acpi-common.h @@ -1,7 +1,8 @@ #ifndef HW_I386_ACPI_COMMON_H #define HW_I386_ACPI_COMMON_H + +#include "include/hw/acpi/acpi-defs.h" #include "include/hw/acpi/acpi_dev_interface.h" - #include "include/hw/acpi/bios-linker-loader.h" #include "include/hw/i386/x86.h" @@ -12,5 +13,7 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker, X86MachineState *x86ms, AcpiDeviceIf *adev, bool has_pci); void acpi_build_facs(GArray *table_data); +void acpi_init_common_fadt_data(MachineState *ms, Object *o, + AcpiFadtData *data); #endif diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index a69b85a266e7..d1f14394734e 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -132,47 +132,6 @@ const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio = { .bit_width = NVDIMM_ACPI_IO_LEN << 3 }; -static void init_common_fadt_data(MachineState *ms, Object *o, - AcpiFadtData *data) -{ - uint32_t io = object_property_get_uint(o, ACPI_PM_PROP_PM_IO_BASE, NULL); - AmlAddressSpace as = AML_AS_SYSTEM_IO; - AcpiFadtData fadt = { - .rev = 3, - .flags = - (1 << ACPI_FADT_F_WBINVD) | - (1 << ACPI_FADT_F_PROC_C1) | - (1 << ACPI_FADT_F_SLP_BUTTON) | - (1 << ACPI_FADT_F_RTC_S4) | - (1 << ACPI_FADT_F_USE_PLATFORM_CLOCK) | - /* APIC destination mode ("Flat Logical") has an upper limit of 8 - * CPUs for more than 8 CPUs, "Clustered Logical" mode has to be - * used - */ - ((ms->smp.max_cpus > 8) ? - (1 << ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL) : 0), - .int_model = 1 /* Multiple APIC */, - .rtc_century = RTC_CENTURY, - .plvl2_lat = 0xfff /* C2 state not supported */, - .plvl3_lat = 0xfff /* C3 state not supported */, - .smi_cmd = ACPI_PORT_SMI_CMD, - .sci_int = object_property_get_uint(o, ACPI_PM_PROP_SCI_INT, NULL), - .acpi_enable_cmd = - object_property_get_uint(o, ACPI_PM_PROP_ACPI_ENABLE_CMD, NULL), - .acpi_disable_cmd = - object_property_get_uint(o, ACPI_PM_PROP_ACPI_DISABLE_CMD, NULL), - .pm1a_evt = { .space_id = as, .bit_width = 4 * 8, .address = io }, - .pm1a_cnt = { .space_id = as, .bit_width = 2 * 8, - .address = io + 0x04 }, - .pm_tmr = { .space_id = as, .bit_width = 4 * 8, .address = io + 0x08 }, - .gpe0_blk = { .space_id = as, .bit_width = - object_property_get_uint(o, ACPI_PM_PROP_GPE0_BLK_LEN, NULL) * 8, - .address = object_property_get_uint(o, ACPI_PM_PROP_GPE0_BLK, NULL) - }, - }; - *data = fadt; -} - static Object *object_resolve_type_unambiguous(const char *typename) { bool ambig; @@ -195,7 +154,7 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm) pm->pcihp_io_len = 0; assert(obj); - init_common_fadt_data(machine, obj, &pm->fadt); + acpi_init_common_fadt_data(machine, obj, &pm->fadt); if (piix) { /* w2k requires FADT(rev1) or it won't boot, keep PC compatible */ pm->fadt.rev = 1; diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c index 5187653893a8..69dfbf0252f3 100644 --- a/hw/i386/acpi-common.c +++ b/hw/i386/acpi-common.c @@ -28,6 +28,8 @@ #include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" #include "hw/i386/pc.h" +#include "hw/isa/apm.h" +#include "hw/rtc/mc146818rtc_regs.h" #include "target/i386/cpu.h" #include "acpi-build.h" @@ -161,3 +163,44 @@ void acpi_build_facs(GArray *table_data) memcpy(&facs->signature, "FACS", 4); facs->length = cpu_to_le32(sizeof(*facs)); } + +void acpi_init_common_fadt_data(MachineState *ms, Object *o, + AcpiFadtData *data) +{ + uint32_t io = object_property_get_uint(o, ACPI_PM_PROP_PM_IO_BASE, NULL); + AmlAddressSpace as = AML_AS_SYSTEM_IO; + AcpiFadtData fadt = { + .rev = 3, + .flags = + (1 << ACPI_FADT_F_WBINVD) | + (1 << ACPI_FADT_F_PROC_C1) | + (1 << ACPI_FADT_F_SLP_BUTTON) | + (1 << ACPI_FADT_F_RTC_S4) | + (1 << ACPI_FADT_F_USE_PLATFORM_CLOCK) | + /* APIC destination mode ("Flat Logical") has an upper limit of 8 + * CPUs for more than 8 CPUs, "Clustered Logical" mode has to be + * used + */ + ((ms->smp.max_cpus > 8) ? + (1 << ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL) : 0), + .int_model = 1 /* Multiple APIC */, + .rtc_century = RTC_CENTURY, + .plvl2_lat = 0xfff /* C2 state not supported */, + .plvl3_lat = 0xfff /* C3 state not supported */, + .smi_cmd = ACPI_PORT_SMI_CMD, + .sci_int = object_property_get_uint(o, ACPI_PM_PROP_SCI_INT, NULL), + .acpi_enable_cmd = + object_property_get_uint(o, ACPI_PM_PROP_ACPI_ENABLE_CMD, NULL), + .acpi_disable_cmd = + object_property_get_uint(o, ACPI_PM_PROP_ACPI_DISABLE_CMD, NULL), + .pm1a_evt = { .space_id = as, .bit_width = 4 * 8, .address = io }, + .pm1a_cnt = { .space_id = as, .bit_width = 2 * 8, + .address = io + 0x04 }, + .pm_tmr = { .space_id = as, .bit_width = 4 * 8, .address = io + 0x08 }, + .gpe0_blk = { .space_id = as, .bit_width = + object_property_get_uint(o, ACPI_PM_PROP_GPE0_BLK_LEN, NULL) * 8, + .address = object_property_get_uint(o, ACPI_PM_PROP_GPE0_BLK, NULL) + }, + }; + *data = fadt; +}
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/i386/acpi-common.h | 5 ++++- hw/i386/acpi-build.c | 43 +------------------------------------------ hw/i386/acpi-common.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 43 deletions(-)