generalize build_fadt()
v2 cover generalize build_fadt()
v2:
* fix typo in "acpi: remove unused acpi-dsdt.aml"
* split ACPI_PORT_SMI_CMD into separate cleanup patch
* s/pm1_/pm1a_/, s/c2_latency/plvl2_lat/, s/c3_latency/plvl3_lat/ and fix conflicts in followup patches caused by renaming
* conditional FIRMWARE_CTRL, DSDT patching is introduced in the patch that makes build_fadt() generic instead of earlier "pc: acpi: isolate FADT specific data into AcpiFadtData structure"
* update comment to mention that build_fadt() supports 5.1 revision
Series first cleanups ACPI code around build_fadt() and then converts current packed structure approach to a build_append_FOO() API, getting rid of error prone explicit endianness conversions in code and making build_fadt() look more like APCI table declaration from spec, which should be easier to read/maintain. After that build_fadt() becomes generic enough that we could drop ARM specific implementation and reuse generic build_fadt(), reducing code duplication.
PS: tested only x86 which has make check coverage,
ARM was only slightly tested.
git tree for testing:
https://github.com/imammedo/qemu.git fadt_refactoring_v2
Igor Mammedov (10):
acpi: remove unused acpi-dsdt.aml
pc: replace pm object initialization with one-liner in
acpi_get_pm_info()
acpi: reuse AcpiGenericAddress instead of Acpi20GenericAddress
acpi: add build_append_gas() helper for Generic Address Structure
acpi: move ACPI_PORT_SMI_CMD define to header it belongs to
pc: acpi: isolate FADT specific data into AcpiFadtData structure
pc: acpi: use build_append_foo() API to construct FADT
acpi: move build_fadt() from i386 specific to generic ACPI source
virt_arm: acpi: reuse common build_fadt()
tests: acpi: don't read all fields in test_acpi_fadt_table()
include/hw/acpi/acpi-defs.h | 136 ++++++++---------------------- include/hw/acpi/aml-build.h | 23 ++++++ include/hw/isa/apm.h | 3 + Makefile | 1 - hw/acpi/aml-build.c | 140 +++++++++++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 39 ++++----- hw/i386/acpi-build.c | 196 ++++++++++++++------------------------------ hw/isa/apm.c | 1 - pc-bios/acpi-dsdt.aml | Bin 4405 -> 0 bytes tests/bios-tables-test.c | 82 ++++-------------- 10 files changed, 294 insertions(+), 327 deletions(-) delete mode 100644 pc-bios/acpi-dsdt.aml
Signature · 1 line
2.7.4
PATCH v2 1/10 acpi: remove unused acpi-dsdt.aml
SeaBIOS blob which is currently shipped with QEMU doesn't need acpi-dsdt.aml nor is able to use it and code that loaded it in QEMU was removed by (commit 9fb7aaaf4c "pc: drop external DSDT loading") in 2013.
--- Makefile | 1 - pc-bios/acpi-dsdt.aml | Bin 4405 -> 0 bytes 2 files changed, 1 deletion(-) delete mode 100644 pc-bios/acpi-dsdt.aml
Makefile +0 -1
@@ -648,7 +648,6 @@ bepo cz ifdef INSTALL_BLOBS BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \ -acpi-dsdt.aml \ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
pc-bios/acpi-dsdt.aml deleted binary +0 -0
Signature · 1 line
2.7.4
PATCH v2 2/10 pc: replace pm object initialization with one-liner in acpi_get_pm_info()
In reply to Igor Mammedovnext patch will need it before it gets to piix4/lpc branches that initializes 'obj' now.
--- hw/i386/acpi-build.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
hw/i386/acpi-build.c +1 -3
@@ -128,7 +128,7 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) {Object *piix =piix4_pm_find ();Object *lpc =ich9_lpc_find (); -Object *obj =NULL ; +Object *obj = piix ? piix : lpc;QObject *o; pm->force_rev1_fadt = false;
@@ -138,7 +138,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)if (piix) {/* w2k requires FADT(rev1) or it won't boot, keep PC compatible */ pm->force_rev1_fadt = true; - obj = piix; pm->cpu_hp_io_base =PIIX4_CPU_HOTPLUG_IO_BASE ; pm->pcihp_io_base =object_property_get_uint (obj,ACPI_PCIHP_IO_BASE_PROP ,NULL );
@@ -146,7 +145,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)object_property_get_uint (obj,ACPI_PCIHP_IO_LEN_PROP ,NULL ); }if (lpc) { - obj = lpc; pm->cpu_hp_io_base =ICH9_CPU_HOTPLUG_IO_BASE ; }assert (obj);
Signature · 1 line
2.7.4
PATCH v2 3/10 acpi: reuse AcpiGenericAddress instead of Acpi20GenericAddress
In reply to Igor MammedovDrop duplicate in form of Acpi20GenericAddress and reuse AcpiGenericAddress.
--- include/hw/acpi/acpi-defs.h | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
include/hw/acpi/acpi-defs.h +3 -14
@@ -40,18 +40,6 @@ enum { ACPI_FADT_F_LOW_POWER_S0_IDLE_CAPABLE, }; -/* -* ACPI 2.0 Generic Address Space definition. -*/ -struct Acpi20GenericAddress { -uint8_t address_space_id; -uint8_t register_bit_width; -uint8_t register_bit_offset; -uint8_t reserved; -uint64_t address; -}QEMU_PACKED ; -typedef struct Acpi20GenericAddress Acpi20GenericAddress ; -struct AcpiRsdpDescriptor {/* Root System Descriptor Pointer */ uint64_t signature;/* ACPI signature, contains "RSD PTR " */ uint8_t checksum;/* To make sum of struct == 0 */
@@ -167,7 +155,8 @@ struct AcpiGenericAddress {uint8_t space_id;/* Address space where struct or register exists */ uint8_t bit_width;/* Size in bits of given register */ uint8_t bit_offset;/* Bit offset within the register */ -uint8_t access_width;/* Minimum Access size (ACPI 3.0) */ +uint8_t access_width;/* ACPI 3.0: Minimum Access size (ACPI 3.0), +ACPI 2.0: Reserved, Table 5-1 */ uint64_t address;/* 64-bit address of struct or register */ }QEMU_PACKED ;
@@ -456,7 +445,7 @@ typedef struct AcpiGenericTimerTable AcpiGenericTimerTable;struct Acpi20Hpet {ACPI_TABLE_HEADER_DEF /* ACPI common table header */ uint32_t timer_block_id; -Acpi20GenericAddress addr; +struct AcpiGenericAddress addr;uint8_t hpet_number;uint16_t min_tick;uint8_t page_protect;
Signature · 1 line
2.7.4
PATCH v2 4/10 acpi: add build_append_gas() helper for Generic Address Structure
In reply to Igor Mammedovit will help to add Generic Address Structure to ACPI tables without using packed C structures and avoid endianness issues as API doesn't need an explicit conversion.
--- include/hw/acpi/aml-build.h | 20 ++++++++++++++++++++ hw/acpi/aml-build.c | 16 ++++++++++++++++ 2 files changed, 36 insertions(+)
include/hw/acpi/aml-build.h +20 -0
@@ -78,6 +78,15 @@ typedef enum { } AmlUpdateRule;typedef enum { +AML_AS_SYSTEM_MEMORY =0X00 , +AML_AS_SYSTEM_IO =0X01 , +AML_AS_PCI_CONFIG =0X02 , +AML_AS_EMBEDDED_CTRL =0X03 , +AML_AS_SMBUS =0X04 , +AML_AS_FFH =0X7F , +}AmlAddressSpace ; + +typedef enum { AML_SYSTEM_MEMORY = 0X00, AML_SYSTEM_IO = 0X01, AML_PCI_CONFIG = 0X02,
@@ -389,6 +398,17 @@ int build_append_named_dword(GArray *array, const char *name_format, ...) GCC_FMT_ATTR(2, 3); +void build_append_gas (GArray *table,AmlAddressSpace as, +uint8_t bit_width,uint8_t bit_offset, +uint8_t access_width,uint64_t address); + +static inline void +build_append_gas_from_struct (GArray *table,const struct AcpiGenericAddress *s) +{ +build_append_gas (table, s->space_id, s->bit_width, s->bit_offset, + s->access_width, s->address); +} +void build_srat_memory (AcpiSratMemoryAffinity *numamem,uint64_t base,uint64_t len,int node,MemoryAffinityFlags flags);
hw/acpi/aml-build.c +16 -0
@@ -258,6 +258,22 @@ static void build_append_int(GArray *table, uint64_t value) } } +/* Generic Address Structure (GAS) +* ACPI 2.0/3.0: 5.2.3.1 Generic Address Structure +* 2.0 compat note: +* @access_width must be 0, see ACPI 2.0:Table 5-1 +*/ +void build_append_gas (GArray *table,AmlAddressSpace as, +uint8_t bit_width,uint8_t bit_offset, +uint8_t access_width,uint64_t address) +{ +build_append_int_noprefix (table, as,1 ); +build_append_int_noprefix (table, bit_width,1 ); +build_append_int_noprefix (table, bit_offset,1 ); +build_append_int_noprefix (table, access_width,1 ); +build_append_int_noprefix (table, address,8 ); +} +/* * Build NAME(XXXX, 0x00000000) where 0x00000000 is encoded as a dword, * and return the offset to 0x00000000 for runtime patching.
Signature · 1 line
2.7.4
PATCH v2 5/10 acpi: move ACPI_PORT_SMI_CMD define to header it belongs to
In reply to Igor MammedovACPI_PORT_SMI_CMD is alias for APM_CNT_IOPORT, so make it really one instead of duplicating its value.
--- include/hw/isa/apm.h | 3 +++ hw/i386/acpi-build.c | 2 -- hw/isa/apm.c | 1 - 3 files changed, 3 insertions(+), 3 deletions(-)
include/hw/isa/apm.h +3 -0
@@ -5,6 +5,9 @@#include "hw/hw.h" #include "exec/memory.h" +#define APM_CNT_IOPORT 0xb2 +#define ACPI_PORT_SMI_CMD APM_CNT_IOPORT +typedef void (*apm_ctrl_changed_t )(uint32_t val,void *arg); typedef struct APMState {
hw/i386/acpi-build.c +0 -2
@@ -255,8 +255,6 @@ static void acpi_get_pci_holes(Range *hole, Range *hole64) NULL)); } -#define ACPI_PORT_SMI_CMD 0x00b2/* TODO: this is APM_CNT_IOPORT */ -static void acpi_align_size (GArray *blob,unsigned align) {/* Align size to multiple of given size. This reduces the chance
hw/isa/apm.c +0 -1
@@ -34,7 +34,6 @@#endif /* fixed I/O location */ -#define APM_CNT_IOPORT 0xb2#define APM_STS_IOPORT 0xb3 static void apm_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
Signature · 1 line
2.7.4
Re: [Qemu-arm] [PATCH v2 05/10] acpi: move ACPI_PORT_SMI_CMD define to header it belongs to
Hi,
Quoted 4 lines · Igor Mammedov
ACPI_PORT_SMI_CMDis alias forAPM_CNT_IOPORT, so make it really one instead of duplicating its value.Signed-off-by Igor Mammedov <[email protected]>
Eric
Quoted 46 lines
--- include/hw/isa/apm.h | 3 +++ hw/i386/acpi-build.c | 2 -- hw/isa/apm.c | 1 - 3 files changed, 3 insertions(+), 3 deletions(-)include/hw/isa/apm.h +3
-0@@ -5,6 +5,9 @@#include "hw/hw.h" #include "exec/memory.h" +#define APM_CNT_IOPORT 0xb2 +#define ACPI_PORT_SMI_CMD APM_CNT_IOPORT +typedef void (*apm_ctrl_changed_t )(uint32_t val,void *arg); typedef struct APMState {hw/i386/acpi-build.c +0
-2@@ -255,8 +255,6 @@ static void acpi_get_pci_holes(Range *hole, Range *hole64) NULL)); } -#define ACPI_PORT_SMI_CMD 0x00b2/* TODO: this is APM_CNT_IOPORT */ -static void acpi_align_size (GArray *blob,unsigned align) {/* Align size to multiple of given size. This reduces the chance hw/isa/apm.c +0
-1@@ -34,7 +34,6 @@#endif /* fixed I/O location */ -#define APM_CNT_IOPORT 0xb2#define APM_STS_IOPORT 0xb3 static void apm_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
PATCH v2 6/10 pc: acpi: isolate FADT specific data into AcpiFadtData structure
In reply to Igor Mammedovmove FADT data initialization out of fadt_setup() into dedicated init_fadt_data() that will set common for pc/q35 values in AcpiFadtData structure and acpi_get_pm_info() will complement it with pc/q35 specific values initialization.
That will allow to get rid of fadt_setup() and generalize build_fadt() so it could be easily extended for rev5 and reused by ARM target.
While at it also move facs/dsdt/xdsdt offsets from build_fadt() arg list into AcpiFadtData, as they belong to the same dataset.
---
v2:
changes requested by Auger Eric <[email protected]>
- s/pm1_/pm1a_/
- s/c2_latency/plvl2_lat/
- s/c3_latency/plvl3_lat/
- cleanup ACPI_PORT_SMI_CMD TODO, move it to hw/isa/apm.h
- move
if (f->facs_tbl_offset) / if (f->dsdt_tbl_offset)
bios_linker_loader_add_pointer(...)
into the patch that makes build_fadt() generic
---
include/hw/acpi/acpi-defs.h | 28 +++++++
hw/i386/acpi-build.c | 190 ++++++++++++++++++++++++--------------------
2 files changed, 130 insertions(+), 88 deletions(-)include/hw/acpi/acpi-defs.h +28 -0
@@ -175,6 +175,34 @@ struct AcpiFadtDescriptorRev5_1 {typedef struct AcpiFadtDescriptorRev5_1 AcpiFadtDescriptorRev5_1 ; +typedef struct AcpiFadtData { +struct AcpiGenericAddress pm1a_cnt;/* PM1a_CNT_BLK */ +struct AcpiGenericAddress pm1a_evt;/* PM1a_EVT_BLK */ +struct AcpiGenericAddress pm_tmr;/* PM_TMR_BLK */ +struct AcpiGenericAddress gpe0_blk;/* GPE0_BLK */ +struct AcpiGenericAddress reset_reg;/* RESET_REG */ +uint8_t reset_val;/* RESET_VALUE */ +uint8_t rev;/* Revision */ +uint32_t flags;/* Flags */ +uint32_t smi_cmd;/* SMI_CMD */ +uint16_t sci_int;/* SCI_INT */ +uint8_t int_model;/* INT_MODEL */ +uint8_t acpi_enable_cmd;/* ACPI_ENABLE */ +uint8_t acpi_disable_cmd;/* ACPI_DISABLE */ +uint8_t rtc_century;/* CENTURY */ +uint16_t plvl2_lat;/* P_LVL2_LAT */ +uint16_t plvl3_lat;/* P_LVL3_LAT */ + +/* +* respective tables offsets within ACPI_BUILD_TABLE_FILE, +* NULL if table doesn't exist (in that case field's value +* won't be patched by linker and will be kept set to 0) +*/ +unsigned *facs_tbl_offset;/* FACS offset in */ +unsigned *dsdt_tbl_offset; +unsigned *xdsdt_tbl_offset; +}AcpiFadtData ; +#define ACPI_FADT_ARM_PSCI_COMPLIANT (1 << 0)#define ACPI_FADT_ARM_PSCI_USE_HVC (1 << 1)
hw/i386/acpi-build.c +102 -88
287 lines not on this page · raw message
Signature · 1 line
2.7.4
Re: [Qemu-arm] [PATCH v2 06/10] pc: acpi: isolate FADT specific data into AcpiFadtData structure
Hi Igor,
Quoted 9 lines · Igor Mammedov
move FADT data initialization out of
fadt_setup()into dedicatedinit_fadt_data()that will set common for pc/q35 values in AcpiFadtData structure andacpi_get_pm_info()will complement it with pc/q35 specific values initialization.That will allow to get rid of
fadt_setup()and generalizebuild_fadt()so it could be easily extended for rev5 and reused by ARM target.
Quoted 8 lines
While at it also move facs/dsdt/xdsdt offsets from
build_fadt()arg list into AcpiFadtData, as they belong to the same dataset.Signed-off-by Igor Mammedov <[email protected]>---
v2:
changes requested by Auger Eric <[email protected]>
suggested ;-)
Quoted 302 lines
- s/pm1_/pm1a_/
- s/c2_latency/plvl2_lat/
- s/c3_latency/plvl3_lat/
- cleanupACPI_PORT_SMI_CMDTODO, move it tohw/isa/apm.h
- moveif (f->facs_tbl_offset) / if (f->dsdt_tbl_offset) bios_linker_loader_add_pointer(...) into the patch that makes build_fadt() generic --- include/hw/acpi/acpi-defs.h | 28 +++++++ hw/i386/acpi-build.c | 190 ++++++++++++++++++++++++-------------------- 2 files changed, 130 insertions(+), 88 deletions(-)include/hw/acpi/acpi-defs.h +28
-0@@ -175,6 +175,34 @@ struct AcpiFadtDescriptorRev5_1 {typedef struct AcpiFadtDescriptorRev5_1 AcpiFadtDescriptorRev5_1 ; +typedef struct AcpiFadtData { +struct AcpiGenericAddress pm1a_cnt;/* PM1a_CNT_BLK */ +struct AcpiGenericAddress pm1a_evt;/* PM1a_EVT_BLK */ +struct AcpiGenericAddress pm_tmr;/* PM_TMR_BLK */ +struct AcpiGenericAddress gpe0_blk;/* GPE0_BLK */ +struct AcpiGenericAddress reset_reg;/* RESET_REG */ +uint8_t reset_val;/* RESET_VALUE */ +uint8_t rev;/* Revision */ +uint32_t flags;/* Flags */ +uint32_t smi_cmd;/* SMI_CMD */ +uint16_t sci_int;/* SCI_INT */ +uint8_t int_model;/* INT_MODEL */ +uint8_t acpi_enable_cmd;/* ACPI_ENABLE */ +uint8_t acpi_disable_cmd;/* ACPI_DISABLE */ +uint8_t rtc_century;/* CENTURY */ +uint16_t plvl2_lat;/* P_LVL2_LAT */ +uint16_t plvl3_lat;/* P_LVL3_LAT */ + +/* +* respective tables offsets within ACPI_BUILD_TABLE_FILE, +* NULL if table doesn't exist (in that case field's value +* won't be patched by linker and will be kept set to 0) +*/ +unsigned *facs_tbl_offset;/* FACS offset in */ +unsigned *dsdt_tbl_offset; +unsigned *xdsdt_tbl_offset; +}AcpiFadtData ; +#define ACPI_FADT_ARM_PSCI_COMPLIANT (1 << 0)#define ACPI_FADT_ARM_PSCI_USE_HVC (1 << 1)hw/i386/acpi-build.c +85
-80@@ -91,17 +91,11 @@ typedef struct AcpiMcfgInfo { } AcpiMcfgInfo; typedef struct AcpiPmInfo { - bool force_rev1_fadt; bool s3_disabled; bool s4_disabled; bool pcihp_bridge_en; uint8_t s4_val; - uint16_t sci_int; - uint8_t acpi_enable_cmd; - uint8_t acpi_disable_cmd; - uint32_t gpe0_blk; - uint32_t gpe0_blk_len; - uint32_t io_base; + AcpiFadtData fadt; uint16_t cpu_hp_io_base; uint16_t pcihp_io_base; uint16_t pcihp_io_len;@@ -124,20 +118,59 @@ typedef struct AcpiBuildPciBusHotplugState {bool pcihp_bridge_en; } AcpiBuildPciBusHotplugState; +static void init_common_fadt_data (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 +*/ + ((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 void acpi_get_pm_info (AcpiPmInfo *pm) {Object *piix =piix4_pm_find ();Object *lpc =ich9_lpc_find ();Object *obj = piix ? piix : lpc;QObject *o; - - pm->force_rev1_fadt = false; pm->cpu_hp_io_base =0 ; pm->pcihp_io_base =0 ; pm->pcihp_io_len =0 ; + +init_common_fadt_data (obj, &pm->fadt);if (piix) {/* w2k requires FADT(rev1) or it won't boot, keep PC compatible */ - pm->force_rev1_fadt = true; + pm->fadt.rev =1 ; pm->cpu_hp_io_base =PIIX4_CPU_HOTPLUG_IO_BASE ; pm->pcihp_io_base =object_property_get_uint (obj,ACPI_PCIHP_IO_BASE_PROP ,NULL );@@ -145,10 +178,19 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)object_property_get_uint (obj,ACPI_PCIHP_IO_LEN_PROP ,NULL ); }if (lpc) { +struct AcpiGenericAddress r = { .space_id =AML_AS_SYSTEM_IO , + .bit_width =8 , .address =ICH9_RST_CNT_IOPORT }; + pm->fadt.reset_reg = r; + pm->fadt.reset_val =0xf ; + pm->fadt.flags |=1 <<ACPI_FADT_F_RESET_REG_SUP ; pm->cpu_hp_io_base =ICH9_CPU_HOTPLUG_IO_BASE ; }assert (obj); +/* The above need not be conditional on machine type because the reset port +* happens to be the same on PIIX (pc) and ICH9 (q35). */ +QEMU_BUILD_BUG_ON (ICH9_RST_CNT_IOPORT !=RCR_IOPORT ); +/* Fill in optional s3/s4 related properties */ o =object_property_get_qobject (obj,ACPI_PM_PROP_S3_DISABLED ,NULL );if (o) {@@ -172,22 +214,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) }qobject_decref (o); -/* Fill in mandatory properties */ - pm->sci_int =object_property_get_uint (obj,ACPI_PM_PROP_SCI_INT ,NULL ); - - pm->acpi_enable_cmd =object_property_get_uint (obj, -ACPI_PM_PROP_ACPI_ENABLE_CMD , -NULL ); - pm->acpi_disable_cmd = -object_property_get_uint (obj, -ACPI_PM_PROP_ACPI_DISABLE_CMD , -NULL ); - pm->io_base =object_property_get_uint (obj,ACPI_PM_PROP_PM_IO_BASE , -NULL ); - pm->gpe0_blk =object_property_get_uint (obj,ACPI_PM_PROP_GPE0_BLK , -NULL ); - pm->gpe0_blk_len =object_property_get_uint (obj,ACPI_PM_PROP_GPE0_BLK_LEN , -NULL ); pm->pcihp_bridge_en =object_property_get_bool (obj,"acpi-pci-hotplug-with-bridge-support" ,NULL );@@ -273,73 +299,53 @@ build_facs(GArray *table_data, BIOSLinker *linker) }/* Load chipset information in FADT */ -static void fadt_setup (AcpiFadtDescriptorRev3 *fadt,AcpiPmInfo *pm) +static void fadt_setup (AcpiFadtDescriptorRev3 *fadt,AcpiFadtData f) { - fadt->model =1 ; + fadt->model = f.int_model; fadt->reserved1 =0 ; - fadt->sci_int =cpu_to_le16 (pm->sci_int); - fadt->smi_cmd =cpu_to_le32 (ACPI_PORT_SMI_CMD ); - fadt->acpi_enable = pm->acpi_enable_cmd; - fadt->acpi_disable = pm->acpi_disable_cmd; + fadt->sci_int =cpu_to_le16 (f.sci_int); + fadt->smi_cmd =cpu_to_le32 (f.smi_cmd); + fadt->acpi_enable = f.acpi_enable_cmd; + fadt->acpi_disable = f.acpi_disable_cmd;/* EVT, CNT, TMR offset matches hw/acpi/core.c */ - fadt->pm1a_evt_blk =cpu_to_le32 (pm->io_base); - fadt->pm1a_cnt_blk =cpu_to_le32 (pm->io_base +0x04 ); - fadt->pm_tmr_blk =cpu_to_le32 (pm->io_base +0x08 ); - fadt->gpe0_blk =cpu_to_le32 (pm->gpe0_blk); + fadt->pm1a_evt_blk =cpu_to_le32 (f.pm1a_evt.address); + fadt->pm1a_cnt_blk =cpu_to_le32 (f.pm1a_cnt.address); + fadt->pm_tmr_blk =cpu_to_le32 (f.pm_tmr.address); + fadt->gpe0_blk =cpu_to_le32 (f.gpe0_blk.address);/* EVT, CNT, TMR length matches hw/acpi/core.c */ - fadt->pm1_evt_len =4 ; - fadt->pm1_cnt_len =2 ; - fadt->pm_tmr_len =4 ; - fadt->gpe0_blk_len = pm->gpe0_blk_len; - fadt->plvl2_lat =cpu_to_le16 (0xfff );/* C2 state not supported */ - fadt->plvl3_lat =cpu_to_le16 (0xfff );/* C3 state not supported */ - fadt->flags =cpu_to_le32 ((1 <<ACPI_FADT_F_WBINVD ) | - (1 <<ACPI_FADT_F_PROC_C1 ) | - (1 <<ACPI_FADT_F_SLP_BUTTON ) | - (1 <<ACPI_FADT_F_RTC_S4 )); - fadt->flags |=cpu_to_le32 (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 -*/ -if (max_cpus >8 ) { - fadt->flags |=cpu_to_le32 (1 <<ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL ); - } - fadt->century =RTC_CENTURY ; -if (pm->force_rev1_fadt) { + fadt->pm1_evt_len = f.pm1a_evt.bit_width /8 ; + fadt->pm1_cnt_len = f.pm1a_cnt.bit_width /8 ; + fadt->pm_tmr_len = f.pm_tmr.bit_width /8 ; + fadt->gpe0_blk_len = f.gpe0_blk.bit_width /8 ; + fadt->plvl2_lat =cpu_to_le16 (f.plvl2_lat); + fadt->plvl3_lat =cpu_to_le16 (f.plvl3_lat); + fadt->flags =cpu_to_le32 (f.flags); + fadt->century = f.rtc_century; +if (f.rev ==1 ) {return ; } - fadt->flags |=cpu_to_le32 (1 <<ACPI_FADT_F_RESET_REG_SUP ); - fadt->reset_value =0xf ; - fadt->reset_register.space_id =AML_SYSTEM_IO ; - fadt->reset_register.bit_width =8 ; - fadt->reset_register.address =cpu_to_le64 (ICH9_RST_CNT_IOPORT ); -/* The above need not be conditional on machine type because the reset port -* happens to be the same on PIIX (pc) and ICH9 (q35). */ -QEMU_BUILD_BUG_ON (ICH9_RST_CNT_IOPORT !=RCR_IOPORT ); + fadt->reset_value = f.reset_val; + fadt->reset_register = f.reset_reg; + fadt->reset_register.address =cpu_to_le64 (f.reset_reg.address); - fadt->xpm1a_event_block.space_id =AML_SYSTEM_IO ; - fadt->xpm1a_event_block.bit_width = fadt->pm1_evt_len *8 ; - fadt->xpm1a_event_block.address =cpu_to_le64 (pm->io_base); + fadt->xpm1a_event_block = f.pm1a_evt; + fadt->xpm1a_event_block.address =cpu_to_le64 (f.pm1a_evt.address); - fadt->xpm1a_control_block.space_id =AML_SYSTEM_IO ; - fadt->xpm1a_control_block.bit_width = fadt->pm1_cnt_len *8 ; - fadt->xpm1a_control_block.address =cpu_to_le64 (pm->io_base +0x4 ); + fadt->xpm1a_control_block = f.pm1a_cnt; + fadt->xpm1a_control_block.address =cpu_to_le64 (f.pm1a_cnt.address); - fadt->xpm_timer_block.space_id =AML_SYSTEM_IO ; - fadt->xpm_timer_block.bit_width = fadt->pm_tmr_len *8 ; - fadt->xpm_timer_block.address =cpu_to_le64 (pm->io_base +0x8 ); + fadt->xpm_timer_block = f.pm_tmr; + fadt->xpm_timer_block.address =cpu_to_le64 (f.pm_tmr.address); - fadt->xgpe0_block.space_id =AML_SYSTEM_IO ; - fadt->xgpe0_block.bit_width = pm->gpe0_blk_len *8 ; - fadt->xgpe0_block.address =cpu_to_le64 (pm->gpe0_blk); + fadt->xgpe0_block = f.gpe0_blk; + fadt->xgpe0_block.address =cpu_to_le64 (f.gpe0_blk.address); }/* FADT */ static void -build_fadt (GArray *table_data,BIOSLinker *linker,AcpiPmInfo *pm, -unsigned facs_tbl_offset,unsigned dsdt_tbl_offset, +build_fadt (GArray *table_data,BIOSLinker *linker,AcpiFadtData *f,const char *oem_id,const char *oem_table_id) {AcpiFadtDescriptorRev3 *fadt =acpi_data_push (table_data,sizeof (*fadt));@@ -347,29 +353,29 @@ build_fadt(GArray *table_data, BIOSLinker *linker, AcpiPmInfo *pm,unsigned dsdt_entry_offset = (char *)&fadt->dsdt - table_data->data;unsigned xdsdt_entry_offset = (char *)&fadt->x_dsdt - table_data->data;int fadt_size =sizeof (*fadt); -int rev =3 ;/* FACS address to be filled by Guest linker */ bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , fw_ctrl_offset,sizeof (fadt->firmware_ctrl), -ACPI_BUILD_TABLE_FILE , facs_tbl_offset); +ACPI_BUILD_TABLE_FILE , *f->facs_tbl_offset);/* DSDT address to be filled by Guest linker */ -fadt_setup (fadt, pm); +fadt_setup (fadt, *f); bios_linker_loader_add_pointer(linker,
hw/i386/acpi-build.c build_fadt(GArray *table_data, BIOSLinker *linker, AcpiPmInfo *pm, · line 370
Quoted 10 lines
hw/i386/acpi-build.c +4
-4ACPI_BUILD_TABLE_FILE , dsdt_entry_offset,sizeof (fadt->dsdt), - ACPI_BUILD_TABLE_FILE, dsdt_tbl_offset); -if (pm->force_rev1_fadt) { - rev =1 ; + ACPI_BUILD_TABLE_FILE, *f->dsdt_tbl_offset); + +if (f->rev ==1 ) { fadt_size = offsetof(typeof(*fadt), reset_register); - }else { + }else if (f->xdsdt_tbl_offset) {
I fail to understand why you added this check in this patch on not in [PATCH v2 08/10] but anyway
Thanks
Eric
Quoted 40 lines
hw/i386/acpi-build.c +13
-4bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , xdsdt_entry_offset,sizeof (fadt->x_dsdt), -ACPI_BUILD_TABLE_FILE , dsdt_tbl_offset); +ACPI_BUILD_TABLE_FILE , *f->xdsdt_tbl_offset); }build_header (linker, table_data, - (void *)fadt,"FACP" , fadt_size, rev, oem_id, oem_table_id); + (void *)fadt,"FACP" , fadt_size, f->rev, + oem_id, oem_table_id); } void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,@@ -2049,7 +2055,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,aml_append (dev,aml_name_decl ("_STA" ,aml_int (0xB ))); crs =aml_resource_template ();aml_append (crs, -aml_io (AML_DECODE16 , pm->gpe0_blk, pm->gpe0_blk,1 , pm->gpe0_blk_len) +aml_io ( +AML_DECODE16 , + pm->fadt.gpe0_blk.address, + pm->fadt.gpe0_blk.address, +1 , + pm->fadt.gpe0_blk.bit_width /8 ) );aml_append (dev,aml_name_decl ("_CRS" , crs));aml_append (scope, dev);@@ -2696,7 +2707,10 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)/* ACPI tables pointed to by RSDT */ fadt = tables_blob->len;acpi_add_table (table_offsets, tables_blob); -build_fadt (tables_blob, tables->linker, &pm, facs, dsdt, + pm.fadt.facs_tbl_offset = &facs; + pm.fadt.dsdt_tbl_offset = &dsdt; + pm.fadt.xdsdt_tbl_offset = &dsdt; +build_fadt (tables_blob, tables->linker, &pm.fadt, slic_oem.id, slic_oem.table_id); aml_len += tables_blob->len - fadt;
Re: [Qemu-arm] [PATCH v2 06/10] pc: acpi: isolate FADT specific data into AcpiFadtData structure
Quoted 320 lines · On Thu, 1 Mar 2018 09:43:35 +0100 Auger Eric <[email protected]> wrote:
Hi Igor,
Quoted 9 lines · Igor Mammedov
move FADT data initialization out of
fadt_setup()into dedicatedinit_fadt_data()that will set common for pc/q35 values in AcpiFadtData structure andacpi_get_pm_info()will complement it with pc/q35 specific values initialization.That will allow to get rid of
fadt_setup()and generalizebuild_fadt()so it could be easily extended for rev5 and reused by ARM target.Quoted 8 lines
While at it also move facs/dsdt/xdsdt offsets from
build_fadt()arg list into AcpiFadtData, as they belong to the same dataset.Signed-off-by Igor Mammedov <[email protected]>---
v2:
changes requested by Auger Eric <[email protected]>suggested ;-)
Quoted 298 lines
- s/pm1_/pm1a_/
- s/c2_latency/plvl2_lat/
- s/c3_latency/plvl3_lat/
- cleanupACPI_PORT_SMI_CMDTODO, move it tohw/isa/apm.h
- moveif (f->facs_tbl_offset) / if (f->dsdt_tbl_offset) bios_linker_loader_add_pointer(...) into the patch that makes build_fadt() generic --- include/hw/acpi/acpi-defs.h | 28 +++++++ hw/i386/acpi-build.c | 190 ++++++++++++++++++++++++-------------------- 2 files changed, 130 insertions(+), 88 deletions(-)include/hw/acpi/acpi-defs.h +28
-0@@ -175,6 +175,34 @@ struct AcpiFadtDescriptorRev5_1 {typedef struct AcpiFadtDescriptorRev5_1 AcpiFadtDescriptorRev5_1 ; +typedef struct AcpiFadtData { +struct AcpiGenericAddress pm1a_cnt;/* PM1a_CNT_BLK */ +struct AcpiGenericAddress pm1a_evt;/* PM1a_EVT_BLK */ +struct AcpiGenericAddress pm_tmr;/* PM_TMR_BLK */ +struct AcpiGenericAddress gpe0_blk;/* GPE0_BLK */ +struct AcpiGenericAddress reset_reg;/* RESET_REG */ +uint8_t reset_val;/* RESET_VALUE */ +uint8_t rev;/* Revision */ +uint32_t flags;/* Flags */ +uint32_t smi_cmd;/* SMI_CMD */ +uint16_t sci_int;/* SCI_INT */ +uint8_t int_model;/* INT_MODEL */ +uint8_t acpi_enable_cmd;/* ACPI_ENABLE */ +uint8_t acpi_disable_cmd;/* ACPI_DISABLE */ +uint8_t rtc_century;/* CENTURY */ +uint16_t plvl2_lat;/* P_LVL2_LAT */ +uint16_t plvl3_lat;/* P_LVL3_LAT */ + +/* +* respective tables offsets within ACPI_BUILD_TABLE_FILE, +* NULL if table doesn't exist (in that case field's value +* won't be patched by linker and will be kept set to 0) +*/ +unsigned *facs_tbl_offset;/* FACS offset in */ +unsigned *dsdt_tbl_offset; +unsigned *xdsdt_tbl_offset; +}AcpiFadtData ; +#define ACPI_FADT_ARM_PSCI_COMPLIANT (1 << 0)#define ACPI_FADT_ARM_PSCI_USE_HVC (1 << 1)hw/i386/acpi-build.c +84
-79@@ -91,17 +91,11 @@ typedef struct AcpiMcfgInfo { } AcpiMcfgInfo; typedef struct AcpiPmInfo { - bool force_rev1_fadt; bool s3_disabled; bool s4_disabled; bool pcihp_bridge_en; uint8_t s4_val; - uint16_t sci_int; - uint8_t acpi_enable_cmd; - uint8_t acpi_disable_cmd; - uint32_t gpe0_blk; - uint32_t gpe0_blk_len; - uint32_t io_base; + AcpiFadtData fadt; uint16_t cpu_hp_io_base; uint16_t pcihp_io_base; uint16_t pcihp_io_len;@@ -124,20 +118,59 @@ typedef struct AcpiBuildPciBusHotplugState {bool pcihp_bridge_en; } AcpiBuildPciBusHotplugState; +static void init_common_fadt_data (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 +*/ + ((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 void acpi_get_pm_info (AcpiPmInfo *pm) {Object *piix =piix4_pm_find ();Object *lpc =ich9_lpc_find ();Object *obj = piix ? piix : lpc;QObject *o; - - pm->force_rev1_fadt = false; pm->cpu_hp_io_base =0 ; pm->pcihp_io_base =0 ; pm->pcihp_io_len =0 ; + +init_common_fadt_data (obj, &pm->fadt);if (piix) {/* w2k requires FADT(rev1) or it won't boot, keep PC compatible */ - pm->force_rev1_fadt = true; + pm->fadt.rev =1 ; pm->cpu_hp_io_base =PIIX4_CPU_HOTPLUG_IO_BASE ; pm->pcihp_io_base =object_property_get_uint (obj,ACPI_PCIHP_IO_BASE_PROP ,NULL );@@ -145,10 +178,19 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)object_property_get_uint (obj,ACPI_PCIHP_IO_LEN_PROP ,NULL ); }if (lpc) { +struct AcpiGenericAddress r = { .space_id =AML_AS_SYSTEM_IO , + .bit_width =8 , .address =ICH9_RST_CNT_IOPORT }; + pm->fadt.reset_reg = r; + pm->fadt.reset_val =0xf ; + pm->fadt.flags |=1 <<ACPI_FADT_F_RESET_REG_SUP ; pm->cpu_hp_io_base =ICH9_CPU_HOTPLUG_IO_BASE ; }assert (obj); +/* The above need not be conditional on machine type because the reset port +* happens to be the same on PIIX (pc) and ICH9 (q35). */ +QEMU_BUILD_BUG_ON (ICH9_RST_CNT_IOPORT !=RCR_IOPORT ); +/* Fill in optional s3/s4 related properties */ o =object_property_get_qobject (obj,ACPI_PM_PROP_S3_DISABLED ,NULL );if (o) {@@ -172,22 +214,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) }qobject_decref (o); -/* Fill in mandatory properties */ - pm->sci_int =object_property_get_uint (obj,ACPI_PM_PROP_SCI_INT ,NULL ); - - pm->acpi_enable_cmd =object_property_get_uint (obj, -ACPI_PM_PROP_ACPI_ENABLE_CMD , -NULL ); - pm->acpi_disable_cmd = -object_property_get_uint (obj, -ACPI_PM_PROP_ACPI_DISABLE_CMD , -NULL ); - pm->io_base =object_property_get_uint (obj,ACPI_PM_PROP_PM_IO_BASE , -NULL ); - pm->gpe0_blk =object_property_get_uint (obj,ACPI_PM_PROP_GPE0_BLK , -NULL ); - pm->gpe0_blk_len =object_property_get_uint (obj,ACPI_PM_PROP_GPE0_BLK_LEN , -NULL ); pm->pcihp_bridge_en =object_property_get_bool (obj,"acpi-pci-hotplug-with-bridge-support" ,NULL );@@ -273,73 +299,53 @@ build_facs(GArray *table_data, BIOSLinker *linker) }/* Load chipset information in FADT */ -static void fadt_setup (AcpiFadtDescriptorRev3 *fadt,AcpiPmInfo *pm) +static void fadt_setup (AcpiFadtDescriptorRev3 *fadt,AcpiFadtData f) { - fadt->model =1 ; + fadt->model = f.int_model; fadt->reserved1 =0 ; - fadt->sci_int =cpu_to_le16 (pm->sci_int); - fadt->smi_cmd =cpu_to_le32 (ACPI_PORT_SMI_CMD ); - fadt->acpi_enable = pm->acpi_enable_cmd; - fadt->acpi_disable = pm->acpi_disable_cmd; + fadt->sci_int =cpu_to_le16 (f.sci_int); + fadt->smi_cmd =cpu_to_le32 (f.smi_cmd); + fadt->acpi_enable = f.acpi_enable_cmd; + fadt->acpi_disable = f.acpi_disable_cmd;/* EVT, CNT, TMR offset matches hw/acpi/core.c */ - fadt->pm1a_evt_blk =cpu_to_le32 (pm->io_base); - fadt->pm1a_cnt_blk =cpu_to_le32 (pm->io_base +0x04 ); - fadt->pm_tmr_blk =cpu_to_le32 (pm->io_base +0x08 ); - fadt->gpe0_blk =cpu_to_le32 (pm->gpe0_blk); + fadt->pm1a_evt_blk =cpu_to_le32 (f.pm1a_evt.address); + fadt->pm1a_cnt_blk =cpu_to_le32 (f.pm1a_cnt.address); + fadt->pm_tmr_blk =cpu_to_le32 (f.pm_tmr.address); + fadt->gpe0_blk =cpu_to_le32 (f.gpe0_blk.address);/* EVT, CNT, TMR length matches hw/acpi/core.c */ - fadt->pm1_evt_len =4 ; - fadt->pm1_cnt_len =2 ; - fadt->pm_tmr_len =4 ; - fadt->gpe0_blk_len = pm->gpe0_blk_len; - fadt->plvl2_lat =cpu_to_le16 (0xfff );/* C2 state not supported */ - fadt->plvl3_lat =cpu_to_le16 (0xfff );/* C3 state not supported */ - fadt->flags =cpu_to_le32 ((1 <<ACPI_FADT_F_WBINVD ) | - (1 <<ACPI_FADT_F_PROC_C1 ) | - (1 <<ACPI_FADT_F_SLP_BUTTON ) | - (1 <<ACPI_FADT_F_RTC_S4 )); - fadt->flags |=cpu_to_le32 (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 -*/ -if (max_cpus >8 ) { - fadt->flags |=cpu_to_le32 (1 <<ACPI_FADT_F_FORCE_APIC_CLUSTER_MODEL ); - } - fadt->century =RTC_CENTURY ; -if (pm->force_rev1_fadt) { + fadt->pm1_evt_len = f.pm1a_evt.bit_width /8 ; + fadt->pm1_cnt_len = f.pm1a_cnt.bit_width /8 ; + fadt->pm_tmr_len = f.pm_tmr.bit_width /8 ; + fadt->gpe0_blk_len = f.gpe0_blk.bit_width /8 ; + fadt->plvl2_lat =cpu_to_le16 (f.plvl2_lat); + fadt->plvl3_lat =cpu_to_le16 (f.plvl3_lat); + fadt->flags =cpu_to_le32 (f.flags); + fadt->century = f.rtc_century; +if (f.rev ==1 ) {return ; } - fadt->flags |=cpu_to_le32 (1 <<ACPI_FADT_F_RESET_REG_SUP ); - fadt->reset_value =0xf ; - fadt->reset_register.space_id =AML_SYSTEM_IO ; - fadt->reset_register.bit_width =8 ; - fadt->reset_register.address =cpu_to_le64 (ICH9_RST_CNT_IOPORT ); -/* The above need not be conditional on machine type because the reset port -* happens to be the same on PIIX (pc) and ICH9 (q35). */ -QEMU_BUILD_BUG_ON (ICH9_RST_CNT_IOPORT !=RCR_IOPORT ); + fadt->reset_value = f.reset_val; + fadt->reset_register = f.reset_reg; + fadt->reset_register.address =cpu_to_le64 (f.reset_reg.address); - fadt->xpm1a_event_block.space_id =AML_SYSTEM_IO ; - fadt->xpm1a_event_block.bit_width = fadt->pm1_evt_len *8 ; - fadt->xpm1a_event_block.address =cpu_to_le64 (pm->io_base); + fadt->xpm1a_event_block = f.pm1a_evt; + fadt->xpm1a_event_block.address =cpu_to_le64 (f.pm1a_evt.address); - fadt->xpm1a_control_block.space_id =AML_SYSTEM_IO ; - fadt->xpm1a_control_block.bit_width = fadt->pm1_cnt_len *8 ; - fadt->xpm1a_control_block.address =cpu_to_le64 (pm->io_base +0x4 ); + fadt->xpm1a_control_block = f.pm1a_cnt; + fadt->xpm1a_control_block.address =cpu_to_le64 (f.pm1a_cnt.address); - fadt->xpm_timer_block.space_id =AML_SYSTEM_IO ; - fadt->xpm_timer_block.bit_width = fadt->pm_tmr_len *8 ; - fadt->xpm_timer_block.address =cpu_to_le64 (pm->io_base +0x8 ); + fadt->xpm_timer_block = f.pm_tmr; + fadt->xpm_timer_block.address =cpu_to_le64 (f.pm_tmr.address); - fadt->xgpe0_block.space_id =AML_SYSTEM_IO ; - fadt->xgpe0_block.bit_width = pm->gpe0_blk_len *8 ; - fadt->xgpe0_block.address =cpu_to_le64 (pm->gpe0_blk); + fadt->xgpe0_block = f.gpe0_blk; + fadt->xgpe0_block.address =cpu_to_le64 (f.gpe0_blk.address); }/* FADT */ static void -build_fadt (GArray *table_data,BIOSLinker *linker,AcpiPmInfo *pm, -unsigned facs_tbl_offset,unsigned dsdt_tbl_offset, +build_fadt (GArray *table_data,BIOSLinker *linker,AcpiFadtData *f,const char *oem_id,const char *oem_table_id) {AcpiFadtDescriptorRev3 *fadt =acpi_data_push (table_data,sizeof (*fadt));@@ -347,29 +353,29 @@ build_fadt(GArray *table_data, BIOSLinker *linker, AcpiPmInfo *pm,unsigned dsdt_entry_offset = (char *)&fadt->dsdt - table_data->data;unsigned xdsdt_entry_offset = (char *)&fadt->x_dsdt - table_data->data;int fadt_size =sizeof (*fadt); -int rev =3 ;/* FACS address to be filled by Guest linker */ bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , fw_ctrl_offset,sizeof (fadt->firmware_ctrl), -ACPI_BUILD_TABLE_FILE , facs_tbl_offset); +ACPI_BUILD_TABLE_FILE , *f->facs_tbl_offset);
Quoted 16 lines
Quoted 4 lines
hw/i386/acpi-build.c +1
-1/* DSDT address to be filled by Guest linker */ -fadt_setup (fadt, pm); +fadt_setup (fadt, *f); bios_linker_loader_add_pointer(linker,hw/i386/acpi-build.c build_fadt(GArray *table_data, BIOSLinker *linker, AcpiPmInfo *pm, · line 370
Quoted 10 lines
hw/i386/acpi-build.c +4
-4ACPI_BUILD_TABLE_FILE , dsdt_entry_offset,sizeof (fadt->dsdt), - ACPI_BUILD_TABLE_FILE, dsdt_tbl_offset); -if (pm->force_rev1_fadt) { - rev =1 ; + ACPI_BUILD_TABLE_FILE, *f->dsdt_tbl_offset); + +if (f->rev ==1 ) { fadt_size = offsetof(typeof(*fadt), reset_register); - }else { + }else if (f->xdsdt_tbl_offset) {I fail to understand why you added this check in this patch on not in [PATCH v2 08/10] but anyway
Yep, it's not related to this patch and should be in 8/10. if I respin series, I'll move it there.
(condition is there is mostly for spec compliance (i.e. optional field) but it is always true in current code, though if we ever make it NULL in future it won't break and will still work as expected without fixing build_fadt())
Quoted 2 lines
Reviewed-by Eric Auger <[email protected]>
Thanks!
Quoted 44 lines
Thanks
Eric
Quoted 40 lines
hw/i386/acpi-build.c +13
-4bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , xdsdt_entry_offset,sizeof (fadt->x_dsdt), -ACPI_BUILD_TABLE_FILE , dsdt_tbl_offset); +ACPI_BUILD_TABLE_FILE , *f->xdsdt_tbl_offset); }build_header (linker, table_data, - (void *)fadt,"FACP" , fadt_size, rev, oem_id, oem_table_id); + (void *)fadt,"FACP" , fadt_size, f->rev, + oem_id, oem_table_id); } void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,@@ -2049,7 +2055,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,aml_append (dev,aml_name_decl ("_STA" ,aml_int (0xB ))); crs =aml_resource_template ();aml_append (crs, -aml_io (AML_DECODE16 , pm->gpe0_blk, pm->gpe0_blk,1 , pm->gpe0_blk_len) +aml_io ( +AML_DECODE16 , + pm->fadt.gpe0_blk.address, + pm->fadt.gpe0_blk.address, +1 , + pm->fadt.gpe0_blk.bit_width /8 ) );aml_append (dev,aml_name_decl ("_CRS" , crs));aml_append (scope, dev);@@ -2696,7 +2707,10 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)/* ACPI tables pointed to by RSDT */ fadt = tables_blob->len;acpi_add_table (table_offsets, tables_blob); -build_fadt (tables_blob, tables->linker, &pm, facs, dsdt, + pm.fadt.facs_tbl_offset = &facs; + pm.fadt.dsdt_tbl_offset = &dsdt; + pm.fadt.xdsdt_tbl_offset = &dsdt; +build_fadt (tables_blob, tables->linker, &pm.fadt, slic_oem.id, slic_oem.table_id); aml_len += tables_blob->len - fadt;
PATCH v2 7/10 pc: acpi: use build_append_foo() API to construct FADT
In reply to Igor Mammedovbuild_append_foo() API doesn't need explicit endianness conversions which eliminates a source of errors and it makes build_fadt() look like declarative definition of FADT table in ACPI spec, which makes it easy to review. Also it allows easily extending FADT to support other revisions which will be used by follow up patches where build_fadt() will be reused for ARM target.
--- hw/i386/acpi-build.c | 146 +++++++++++++++++++++++++++++---------------------- 1 file changed, 84 insertions(+), 62 deletions(-)
hw/i386/acpi-build.c +84 -62
@@ -298,84 +298,106 @@ build_facs(GArray *table_data, BIOSLinker *linker) facs->length =cpu_to_le32 (sizeof (*facs)); } -/* Load chipset information in FADT */ -static void fadt_setup (AcpiFadtDescriptorRev3 *fadt,AcpiFadtData f) -{ - fadt->model = f.int_model; - fadt->reserved1 =0 ; - fadt->sci_int =cpu_to_le16 (f.sci_int); - fadt->smi_cmd =cpu_to_le32 (f.smi_cmd); - fadt->acpi_enable = f.acpi_enable_cmd; - fadt->acpi_disable = f.acpi_disable_cmd; -/* EVT, CNT, TMR offset matches hw/acpi/core.c */ - fadt->pm1a_evt_blk =cpu_to_le32 (f.pm1a_evt.address); - fadt->pm1a_cnt_blk =cpu_to_le32 (f.pm1a_cnt.address); - fadt->pm_tmr_blk =cpu_to_le32 (f.pm_tmr.address); - fadt->gpe0_blk =cpu_to_le32 (f.gpe0_blk.address); -/* EVT, CNT, TMR length matches hw/acpi/core.c */ - fadt->pm1_evt_len = f.pm1a_evt.bit_width /8 ; - fadt->pm1_cnt_len = f.pm1a_cnt.bit_width /8 ; - fadt->pm_tmr_len = f.pm_tmr.bit_width /8 ; - fadt->gpe0_blk_len = f.gpe0_blk.bit_width /8 ; - fadt->plvl2_lat =cpu_to_le16 (f.plvl2_lat); - fadt->plvl3_lat =cpu_to_le16 (f.plvl3_lat); - fadt->flags =cpu_to_le32 (f.flags); - fadt->century = f.rtc_century; -if (f.rev ==1 ) { -return ; - } - - fadt->reset_value = f.reset_val; - fadt->reset_register = f.reset_reg; - fadt->reset_register.address =cpu_to_le64 (f.reset_reg.address); - - fadt->xpm1a_event_block = f.pm1a_evt; - fadt->xpm1a_event_block.address =cpu_to_le64 (f.pm1a_evt.address); - - fadt->xpm1a_control_block = f.pm1a_cnt; - fadt->xpm1a_control_block.address =cpu_to_le64 (f.pm1a_cnt.address); - - fadt->xpm_timer_block = f.pm_tmr; - fadt->xpm_timer_block.address =cpu_to_le64 (f.pm_tmr.address); - - fadt->xgpe0_block = f.gpe0_blk; - fadt->xgpe0_block.address =cpu_to_le64 (f.gpe0_blk.address); -} - -/* FADT */ static void -build_fadt (GArray *table_data,BIOSLinker *linker,AcpiFadtData *f, +build_fadt (GArray *tbl,BIOSLinker *linker,AcpiFadtData *f,const char *oem_id,const char *oem_table_id) { -AcpiFadtDescriptorRev3 *fadt =acpi_data_push (table_data,sizeof (*fadt)); -unsigned fw_ctrl_offset = (char *)&fadt->firmware_ctrl - table_data->data; -unsigned dsdt_entry_offset = (char *)&fadt->dsdt - table_data->data; -unsigned xdsdt_entry_offset = (char *)&fadt->x_dsdt - table_data->data; -int fadt_size =sizeof (*fadt); +int off; +int fadt_start = tbl->len; -/* FACS address to be filled by Guest linker */ +acpi_data_push (tbl,sizeof (AcpiTableHeader)); + +/* FACS address to be filled by Guest linker at runtime */ + off = tbl->len; +build_append_int_noprefix (tbl,0 ,4 );/* FIRMWARE_CTRL */ bios_linker_loader_add_pointer (linker, -ACPI_BUILD_TABLE_FILE , fw_ctrl_offset,sizeof (fadt->firmware_ctrl), +ACPI_BUILD_TABLE_FILE , off,4 ,ACPI_BUILD_TABLE_FILE , *f->facs_tbl_offset); -/* DSDT address to be filled by Guest linker */ -fadt_setup (fadt, *f); +/* DSDT address to be filled by Guest linker at runtime */ + off = tbl->len; +build_append_int_noprefix (tbl,0 ,4 );/* DSDT */ bios_linker_loader_add_pointer (linker, -ACPI_BUILD_TABLE_FILE , dsdt_entry_offset,sizeof (fadt->dsdt), +ACPI_BUILD_TABLE_FILE , off,4 ,ACPI_BUILD_TABLE_FILE , *f->dsdt_tbl_offset); +/* ACPI1.0: INT_MODEL, ACPI2.0+: Reserved */ +build_append_int_noprefix (tbl, f->int_model/* Multiple APIC */ ,1 ); +/* Preferred_PM_Profile */ +build_append_int_noprefix (tbl,0 /* Unspecified */ ,1 ); +build_append_int_noprefix (tbl, f->sci_int,2 );/* SCI_INT */ +build_append_int_noprefix (tbl, f->smi_cmd,4 );/* SMI_CMD */ +build_append_int_noprefix (tbl, f->acpi_enable_cmd,1 );/* ACPI_ENABLE */ +build_append_int_noprefix (tbl, f->acpi_disable_cmd,1 );/* ACPI_DISABLE */ +build_append_int_noprefix (tbl,0 /* not supported */ ,1 );/* S4BIOS_REQ */ +/* ACPI1.0: Reserved, ACPI2.0+: PSTATE_CNT */ +build_append_int_noprefix (tbl,0 ,1 ); +build_append_int_noprefix (tbl, f->pm1a_evt.address,4 );/* PM1a_EVT_BLK */ +build_append_int_noprefix (tbl,0 ,4 );/* PM1b_EVT_BLK */ +build_append_int_noprefix (tbl, f->pm1a_cnt.address,4 );/* PM1a_CNT_BLK */ +build_append_int_noprefix (tbl,0 ,4 );/* PM1b_CNT_BLK */ +build_append_int_noprefix (tbl,0 ,4 );/* PM2_CNT_BLK */ +build_append_int_noprefix (tbl, f->pm_tmr.address,4 );/* PM_TMR_BLK */ +build_append_int_noprefix (tbl, f->gpe0_blk.address,4 );/* GPE0_BLK */ +build_append_int_noprefix (tbl,0 ,4 );/* GPE1_BLK */ +/* PM1_EVT_LEN */ +build_append_int_noprefix (tbl, f->pm1a_evt.bit_width /8 ,1 ); +/* PM1_CNT_LEN */ +build_append_int_noprefix (tbl, f->pm1a_cnt.bit_width /8 ,1 ); +build_append_int_noprefix (tbl,0 ,1 );/* PM2_CNT_LEN */ +build_append_int_noprefix (tbl, f->pm_tmr.bit_width /8 ,1 );/* PM_TMR_LEN */ +/* GPE0_BLK_LEN */ +build_append_int_noprefix (tbl, f->gpe0_blk.bit_width /8 ,1 ); +build_append_int_noprefix (tbl,0 ,1 );/* GPE1_BLK_LEN */ +build_append_int_noprefix (tbl,0 ,1 );/* GPE1_BASE */ +build_append_int_noprefix (tbl,0 ,1 );/* CST_CNT */ +build_append_int_noprefix (tbl, f->plvl2_lat,2 );/* P_LVL2_LAT */ +build_append_int_noprefix (tbl, f->plvl3_lat,2 );/* P_LVL3_LAT */ +build_append_int_noprefix (tbl,0 ,2 );/* FLUSH_SIZE */ +build_append_int_noprefix (tbl,0 ,2 );/* FLUSH_STRIDE */ +build_append_int_noprefix (tbl,0 ,1 );/* DUTY_OFFSET */ +build_append_int_noprefix (tbl,0 ,1 );/* DUTY_WIDTH */ +build_append_int_noprefix (tbl,0 ,1 );/* DAY_ALRM */ +build_append_int_noprefix (tbl,0 ,1 );/* MON_ALRM */ +build_append_int_noprefix (tbl, f->rtc_century,1 );/* CENTURY */ +build_append_int_noprefix (tbl,0 ,2 );/* IAPC_BOOT_ARCH */ +build_append_int_noprefix (tbl,0 ,1 );/* Reserved */ +build_append_int_noprefix (tbl, f->flags,4 );/* Flags */ +if (f->rev ==1 ) { - fadt_size = offsetof(typeof(*fadt), reset_register); - }else if (f->xdsdt_tbl_offset) { + goto build_hdr; + } + +build_append_gas_from_struct (tbl, &f->reset_reg);/* RESET_REG */ +build_append_int_noprefix (tbl, f->reset_val,1 );/* RESET_VALUE */ +build_append_int_noprefix (tbl,0 ,3 );/* Reserved, ACPI 3.0 */ +build_append_int_noprefix (tbl,0 ,8 );/* X_FIRMWARE_CTRL */ + +/* XDSDT address to be filled by Guest linker at runtime */ + off = tbl->len; +build_append_int_noprefix (tbl,0 ,8 );/* X_DSDT */ +if (f->xdsdt_tbl_offset) {bios_linker_loader_add_pointer (linker, -ACPI_BUILD_TABLE_FILE , xdsdt_entry_offset,sizeof (fadt->x_dsdt), +ACPI_BUILD_TABLE_FILE , off,8 ,ACPI_BUILD_TABLE_FILE , *f->xdsdt_tbl_offset); } -build_header (linker, table_data, - (void *)fadt,"FACP" , fadt_size, f->rev, - oem_id, oem_table_id); +build_append_gas_from_struct (tbl, &f->pm1a_evt);/* X_PM1a_EVT_BLK */ +/* X_PM1b_EVT_BLK */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); +build_append_gas_from_struct (tbl, &f->pm1a_cnt);/* X_PM1a_CNT_BLK */ +/* X_PM1b_CNT_BLK */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); +/* X_PM2_CNT_BLK */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); +build_append_gas_from_struct (tbl, &f->pm_tmr);/* X_PM_TMR_BLK */ +build_append_gas_from_struct (tbl, &f->gpe0_blk);/* X_GPE0_BLK */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 );/* X_GPE1_BLK */ + +build_hdr: +build_header (linker, tbl, (void *)(tbl->data + fadt_start), +"FACP" , tbl->len - fadt_start, f->rev, oem_id, oem_table_id); } void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
Signature · 1 line
2.7.4
PATCH v2 8/10 acpi: move build_fadt() from i386 specific to generic ACPI source
In reply to Igor MammedovIt will be extended and reused by follow up patch for ARM target.
PS:
Since it's generic function now, don't patch FIRMWARE_CTRL, DSDT fields if they don't point to tables since platform might not provide them and use X_ variants instead if applicable.
---
v2:
- conditional FIRMWARE_CTRL, DSDT patching is introduced in this patch instead of earlier "pc: acpi: isolate FADT specific data into AcpiFadtData structure" as it better fits generalizing nature of this patch.
(Auger Eric <[email protected]>)
--- include/hw/acpi/aml-build.h | 3 ++ hw/acpi/aml-build.c | 105 ++++++++++++++++++++++++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 6 +-- hw/i386/acpi-build.c | 102 ------------------------------------------ 4 files changed, 111 insertions(+), 105 deletions(-)
include/hw/acpi/aml-build.h +3 -0
@@ -413,4 +413,7 @@ void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, uint64_t len, int node, MemoryAffinityFlags flags);void build_slit (GArray *table_data,BIOSLinker *linker); + +void build_fadt (GArray *tbl,BIOSLinker *linker,const AcpiFadtData *f, +const char *oem_id,const char *oem_table_id);#endif
hw/acpi/aml-build.c +105 -0
108 lines not on this page · raw message
hw/arm/virt-acpi-build.c +3 -3
@@ -651,8 +651,8 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }/* FADT */ -static void build_fadt (GArray *table_data,BIOSLinker *linker, -VirtMachineState *vms,unsigned dsdt_tbl_offset) +static void build_fadt_rev5 (GArray *table_data,BIOSLinker *linker, +VirtMachineState *vms,unsigned dsdt_tbl_offset) {int fadt_start = table_data->len;AcpiFadtDescriptorRev5_1 *fadt =acpi_data_push (table_data,sizeof (*fadt));
@@ -761,7 +761,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)/* FADT MADT GTDT MCFG SPCR pointed to by RSDT */ acpi_add_table (table_offsets, tables_blob); -build_fadt (tables_blob, tables->linker, vms, dsdt); +build_fadt_rev5 (tables_blob, tables->linker, vms, dsdt);acpi_add_table (table_offsets, tables_blob);build_madt (tables_blob, tables->linker, vms);
hw/i386/acpi-build.c +0 -102
108 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v2 9/10 virt_arm: acpi: reuse common build_fadt()
In reply to Igor MammedovExtend generic build_fadt() to support rev5.1 FADT and reuse it for 'virt' board, it would allow to phase out usage of AcpiFadtDescriptorRev5_1 and later ACPI_FADT_COMMON_DEF.
---
v2:
- update comment to mention that build_fadt() supports 5.1 revision
--- include/hw/acpi/acpi-defs.h | 12 ++---------- hw/acpi/aml-build.c | 23 +++++++++++++++++++++-- hw/arm/virt-acpi-build.c | 33 ++++++++++++--------------------- 3 files changed, 35 insertions(+), 33 deletions(-)
include/hw/acpi/acpi-defs.h +2 -10
@@ -165,16 +165,6 @@ struct AcpiFadtDescriptorRev3 { }QEMU_PACKED ;typedef struct AcpiFadtDescriptorRev3 AcpiFadtDescriptorRev3 ; -struct AcpiFadtDescriptorRev5_1 { -ACPI_FADT_COMMON_DEF -/* 64-bit Sleep Control register (ACPI 5.0) */ - struct AcpiGenericAddress sleep_control; -/* 64-bit Sleep Status register (ACPI 5.0) */ -struct AcpiGenericAddress sleep_status; -}QEMU_PACKED ; - -typedef struct AcpiFadtDescriptorRev5_1 AcpiFadtDescriptorRev5_1 ; - typedef struct AcpiFadtData { struct AcpiGenericAddress pm1a_cnt; /* PM1a_CNT_BLK */ struct AcpiGenericAddress pm1a_evt; /* PM1a_EVT_BLK */
@@ -192,6 +182,8 @@ typedef struct AcpiFadtData {uint8_t rtc_century;/* CENTURY */ uint16_t plvl2_lat;/* P_LVL2_LAT */ uint16_t plvl3_lat;/* P_LVL3_LAT */ +uint16_t arm_boot_arch;/* ARM_BOOT_ARCH */ +uint8_t minor_ver;/* FADT Minor Version */ /* * respective tables offsets within ACPI_BUILD_TABLE_FILE,
hw/acpi/aml-build.c +21 -2
@@ -1679,7 +1679,7 @@ void build_slit(GArray *table_data, BIOSLinker *linker) table_data->len - slit_start, 1, NULL, NULL); } -/* build rev1/rev3 FADT */ +/* build rev1/rev3/rev5.1 FADT */ void build_fadt (GArray *tbl,BIOSLinker *linker,const AcpiFadtData *f,const char *oem_id,const char *oem_table_id) {
@@ -1755,7 +1755,14 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,build_append_gas_from_struct (tbl, &f->reset_reg);/* RESET_REG */ build_append_int_noprefix (tbl, f->reset_val,1 );/* RESET_VALUE */ -build_append_int_noprefix (tbl,0 ,3 );/* Reserved, ACPI 3.0 */ +/* Since ACPI 5.1 */ +if ((f->rev >=6 ) || ((f->rev ==5 ) && f->minor_ver >0 )) { +build_append_int_noprefix (tbl, f->arm_boot_arch,2 );/* ARM_BOOT_ARCH */ +/* FADT Minor Version */ +build_append_int_noprefix (tbl, f->minor_ver,1 ); + }else { +build_append_int_noprefix (tbl,0 ,3 );/* Reserved upto ACPI 5.0 */ + }build_append_int_noprefix (tbl,0 ,8 );/* X_FIRMWARE_CTRL */ /* XDSDT address to be filled by Guest linker at runtime */
@@ -1779,6 +1786,18 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,build_append_gas_from_struct (tbl, &f->gpe0_blk);/* X_GPE0_BLK */ build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 );/* X_GPE1_BLK */ +if (f->rev <=4 ) { + goto build_hdr; + } + +/* SLEEP_CONTROL_REG */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); +/* SLEEP_STATUS_REG */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); + +/* TODO: extra fields need to be added to support revisions above rev5 */ +assert (f->rev ==5 ); + build_hdr:build_header (linker, tbl, (void *)(tbl->data + fadt_start),"FACP" , tbl->len - fadt_start, f->rev, oem_id, oem_table_id);
hw/arm/virt-acpi-build.c +12 -21
@@ -654,39 +654,30 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)static void build_fadt_rev5 (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms,unsigned dsdt_tbl_offset) { -int fadt_start = table_data->len; -AcpiFadtDescriptorRev5_1 *fadt =acpi_data_push (table_data,sizeof (*fadt)); -unsigned xdsdt_entry_offset = (char *)&fadt->x_dsdt - table_data->data; -uint16_t bootflags; +/* ACPI v5.1 */ +AcpiFadtData fadt = { + .rev =5 , + .minor_ver =1 , + .flags =1 <<ACPI_FADT_F_HW_REDUCED_ACPI , + .xdsdt_tbl_offset = &dsdt_tbl_offset, + };switch (vms->psci_conduit) {case QEMU_PSCI_CONDUIT_DISABLED : - bootflags =0 ; + fadt.arm_boot_arch =0 ;break ;case QEMU_PSCI_CONDUIT_HVC : - bootflags =ACPI_FADT_ARM_PSCI_COMPLIANT |ACPI_FADT_ARM_PSCI_USE_HVC ; + fadt.arm_boot_arch =ACPI_FADT_ARM_PSCI_COMPLIANT | +ACPI_FADT_ARM_PSCI_USE_HVC ;break ;case QEMU_PSCI_CONDUIT_SMC : - bootflags =ACPI_FADT_ARM_PSCI_COMPLIANT ; + fadt.arm_boot_arch =ACPI_FADT_ARM_PSCI_COMPLIANT ;break ;default :g_assert_not_reached (); } -/* Hardware Reduced = 1 and use PSCI 0.2+ */ - fadt->flags =cpu_to_le32 (1 <<ACPI_FADT_F_HW_REDUCED_ACPI ); - fadt->arm_boot_flags =cpu_to_le16 (bootflags); - -/* ACPI v5.1 (fadt->revision.fadt->minor_revision) */ - fadt->minor_revision =0x1 ; - -/* DSDT address to be filled by Guest linker */ -bios_linker_loader_add_pointer (linker, -ACPI_BUILD_TABLE_FILE , xdsdt_entry_offset,sizeof (fadt->x_dsdt), -ACPI_BUILD_TABLE_FILE , dsdt_tbl_offset); - -build_header (linker, table_data, (void *)(table_data->data + fadt_start), -"FACP" , table_data->len - fadt_start,5 ,NULL ,NULL ); +build_fadt (table_data, linker, &fadt,NULL ,NULL ); }/* DSDT */
Signature · 1 line
2.7.4
Re: [Qemu-arm] [PATCH v2 09/10] virt_arm: acpi: reuse common build_fadt()
Hi,
Quoted 79 lines · Igor Mammedov
Extend generic
build_fadt()to support rev5.1 FADT and reuse it for 'virt' board, it would allow to phase out usage ofAcpiFadtDescriptorRev5_1and laterACPI_FADT_COMMON_DEF.Signed-off-by Igor Mammedov <[email protected]>---
v2:
- update comment to mention thatbuild_fadt()supports 5.1 revision--- include/hw/acpi/acpi-defs.h | 12 ++---------- hw/acpi/aml-build.c | 23 +++++++++++++++++++++-- hw/arm/virt-acpi-build.c | 33 ++++++++++++--------------------- 3 files changed, 35 insertions(+), 33 deletions(-)include/hw/acpi/acpi-defs.h +2
-10@@ -165,16 +165,6 @@ struct AcpiFadtDescriptorRev3 { }QEMU_PACKED ;typedef struct AcpiFadtDescriptorRev3 AcpiFadtDescriptorRev3 ; -struct AcpiFadtDescriptorRev5_1 { -ACPI_FADT_COMMON_DEF -/* 64-bit Sleep Control register (ACPI 5.0) */ - struct AcpiGenericAddress sleep_control; -/* 64-bit Sleep Status register (ACPI 5.0) */ -struct AcpiGenericAddress sleep_status; -}QEMU_PACKED ; - -typedef struct AcpiFadtDescriptorRev5_1 AcpiFadtDescriptorRev5_1 ; - typedef struct AcpiFadtData { struct AcpiGenericAddress pm1a_cnt; /* PM1a_CNT_BLK */ struct AcpiGenericAddress pm1a_evt; /* PM1a_EVT_BLK */@@ -192,6 +182,8 @@ typedef struct AcpiFadtData {uint8_t rtc_century;/* CENTURY */ uint16_t plvl2_lat;/* P_LVL2_LAT */ uint16_t plvl3_lat;/* P_LVL3_LAT */ +uint16_t arm_boot_arch;/* ARM_BOOT_ARCH */ +uint8_t minor_ver;/* FADT Minor Version */ /* * respective tables offsets within ACPI_BUILD_TABLE_FILE, hw/acpi/aml-build.c +10
-2@@ -1679,7 +1679,7 @@ void build_slit(GArray *table_data, BIOSLinker *linker) table_data->len - slit_start, 1, NULL, NULL); } -/* build rev1/rev3 FADT */ +/* build rev1/rev3/rev5.1 FADT */ void build_fadt (GArray *tbl,BIOSLinker *linker,const AcpiFadtData *f,const char *oem_id,const char *oem_table_id) {@@ -1755,7 +1755,14 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,build_append_gas_from_struct (tbl, &f->reset_reg);/* RESET_REG */ build_append_int_noprefix (tbl, f->reset_val,1 );/* RESET_VALUE */ -build_append_int_noprefix (tbl,0 ,3 );/* Reserved, ACPI 3.0 */ +/* Since ACPI 5.1 */ +if ((f->rev >=6 ) || ((f->rev ==5 ) && f->minor_ver >0 )) { +build_append_int_noprefix (tbl, f->arm_boot_arch,2 );/* ARM_BOOT_ARCH */ +/* FADT Minor Version */ +build_append_int_noprefix (tbl, f->minor_ver,1 ); + }else { +build_append_int_noprefix (tbl,0 ,3 );/* Reserved upto ACPI 5.0 */ + }build_append_int_noprefix (tbl,0 ,8 );/* X_FIRMWARE_CTRL */ /* XDSDT address to be filled by Guest linker at runtime */ @@ -1779,6 +1786,18 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,build_append_gas_from_struct (tbl, &f->gpe0_blk);/* X_GPE0_BLK */ build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 );/* X_GPE1_BLK */ +if (f->rev <=4 ) {
hw/acpi/aml-build.c void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, · line 1799
Quoted 10 lines
hw/acpi/aml-build.c +10
-0+ goto build_hdr; + } + +/* SLEEP_CONTROL_REG */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); +/* SLEEP_STATUS_REG */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); + +/* TODO: extra fields need to be added to support revisions above rev5 */ +assert (f->rev ==5 );
My previous comment about asserting here if f->rev != 5 and previous (f->rev >= 6) check was skipped but that's not a big deal.
Thanks
Eric
Quoted 61 lines
hw/acpi/aml-build.c +1
-0+ build_hdr:build_header (linker, tbl, (void *)(tbl->data + fadt_start),"FACP" , tbl->len - fadt_start, f->rev, oem_id, oem_table_id);hw/arm/virt-acpi-build.c +12
-21@@ -654,39 +654,30 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)static void build_fadt_rev5 (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms,unsigned dsdt_tbl_offset) { -int fadt_start = table_data->len; -AcpiFadtDescriptorRev5_1 *fadt =acpi_data_push (table_data,sizeof (*fadt)); -unsigned xdsdt_entry_offset = (char *)&fadt->x_dsdt - table_data->data; -uint16_t bootflags; +/* ACPI v5.1 */ +AcpiFadtData fadt = { + .rev =5 , + .minor_ver =1 , + .flags =1 <<ACPI_FADT_F_HW_REDUCED_ACPI , + .xdsdt_tbl_offset = &dsdt_tbl_offset, + };switch (vms->psci_conduit) {case QEMU_PSCI_CONDUIT_DISABLED : - bootflags =0 ; + fadt.arm_boot_arch =0 ;break ;case QEMU_PSCI_CONDUIT_HVC : - bootflags =ACPI_FADT_ARM_PSCI_COMPLIANT |ACPI_FADT_ARM_PSCI_USE_HVC ; + fadt.arm_boot_arch =ACPI_FADT_ARM_PSCI_COMPLIANT | +ACPI_FADT_ARM_PSCI_USE_HVC ;break ;case QEMU_PSCI_CONDUIT_SMC : - bootflags =ACPI_FADT_ARM_PSCI_COMPLIANT ; + fadt.arm_boot_arch =ACPI_FADT_ARM_PSCI_COMPLIANT ;break ;default :g_assert_not_reached (); } -/* Hardware Reduced = 1 and use PSCI 0.2+ */ - fadt->flags =cpu_to_le32 (1 <<ACPI_FADT_F_HW_REDUCED_ACPI ); - fadt->arm_boot_flags =cpu_to_le16 (bootflags); - -/* ACPI v5.1 (fadt->revision.fadt->minor_revision) */ - fadt->minor_revision =0x1 ; - -/* DSDT address to be filled by Guest linker */ -bios_linker_loader_add_pointer (linker, -ACPI_BUILD_TABLE_FILE , xdsdt_entry_offset,sizeof (fadt->x_dsdt), -ACPI_BUILD_TABLE_FILE , dsdt_tbl_offset); - -build_header (linker, table_data, (void *)(table_data->data + fadt_start), -"FACP" , table_data->len - fadt_start,5 ,NULL ,NULL ); +build_fadt (table_data, linker, &fadt,NULL ,NULL ); }/* DSDT */
Re: [Qemu-arm] [PATCH v2 09/10] virt_arm: acpi: reuse common build_fadt()
Quoted 80 lines · On Thu, 1 Mar 2018 09:51:14 +0100 Auger Eric <[email protected]> wrote:
Hi,
Quoted 78 lines · Igor Mammedov
Extend generic
build_fadt()to support rev5.1 FADT and reuse it for 'virt' board, it would allow to phase out usage ofAcpiFadtDescriptorRev5_1and laterACPI_FADT_COMMON_DEF.Signed-off-by Igor Mammedov <[email protected]>---
v2:
- update comment to mention thatbuild_fadt()supports 5.1 revision--- include/hw/acpi/acpi-defs.h | 12 ++---------- hw/acpi/aml-build.c | 23 +++++++++++++++++++++-- hw/arm/virt-acpi-build.c | 33 ++++++++++++--------------------- 3 files changed, 35 insertions(+), 33 deletions(-)include/hw/acpi/acpi-defs.h +2
-10@@ -165,16 +165,6 @@ struct AcpiFadtDescriptorRev3 { }QEMU_PACKED ;typedef struct AcpiFadtDescriptorRev3 AcpiFadtDescriptorRev3 ; -struct AcpiFadtDescriptorRev5_1 { -ACPI_FADT_COMMON_DEF -/* 64-bit Sleep Control register (ACPI 5.0) */ - struct AcpiGenericAddress sleep_control; -/* 64-bit Sleep Status register (ACPI 5.0) */ -struct AcpiGenericAddress sleep_status; -}QEMU_PACKED ; - -typedef struct AcpiFadtDescriptorRev5_1 AcpiFadtDescriptorRev5_1 ; - typedef struct AcpiFadtData { struct AcpiGenericAddress pm1a_cnt; /* PM1a_CNT_BLK */ struct AcpiGenericAddress pm1a_evt; /* PM1a_EVT_BLK */@@ -192,6 +182,8 @@ typedef struct AcpiFadtData {uint8_t rtc_century;/* CENTURY */ uint16_t plvl2_lat;/* P_LVL2_LAT */ uint16_t plvl3_lat;/* P_LVL3_LAT */ +uint16_t arm_boot_arch;/* ARM_BOOT_ARCH */ +uint8_t minor_ver;/* FADT Minor Version */ /* * respective tables offsets within ACPI_BUILD_TABLE_FILE, hw/acpi/aml-build.c +9
-2@@ -1679,7 +1679,7 @@ void build_slit(GArray *table_data, BIOSLinker *linker) table_data->len - slit_start, 1, NULL, NULL); } -/* build rev1/rev3 FADT */ +/* build rev1/rev3/rev5.1 FADT */ void build_fadt (GArray *tbl,BIOSLinker *linker,const AcpiFadtData *f,const char *oem_id,const char *oem_table_id) {@@ -1755,7 +1755,14 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,build_append_gas_from_struct (tbl, &f->reset_reg);/* RESET_REG */ build_append_int_noprefix (tbl, f->reset_val,1 );/* RESET_VALUE */ -build_append_int_noprefix (tbl,0 ,3 );/* Reserved, ACPI 3.0 */ +/* Since ACPI 5.1 */ +if ((f->rev >=6 ) || ((f->rev ==5 ) && f->minor_ver >0 )) { +build_append_int_noprefix (tbl, f->arm_boot_arch,2 );/* ARM_BOOT_ARCH */ +/* FADT Minor Version */ +build_append_int_noprefix (tbl, f->minor_ver,1 ); + }else { +build_append_int_noprefix (tbl,0 ,3 );/* Reserved upto ACPI 5.0 */ + }build_append_int_noprefix (tbl,0 ,8 );/* X_FIRMWARE_CTRL */ /* XDSDT address to be filled by Guest linker at runtime */ @@ -1779,6 +1786,18 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,build_append_gas_from_struct (tbl, &f->gpe0_blk);/* X_GPE0_BLK */ build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 );/* X_GPE1_BLK */
Quoted 13 lines
hw/acpi/aml-build.c void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, · line 1799
Quoted 11 lines
hw/acpi/aml-build.c +11
-0+if (f->rev <=4 ) { + goto build_hdr; + } + +/* SLEEP_CONTROL_REG */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); +/* SLEEP_STATUS_REG */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); + +/* TODO: extra fields need to be added to support revisions above rev5 */ +assert (f->rev ==5 );My previous comment about asserting here if
f->rev!= 5 and previous (f->rev>= 6) check was skipped but that's not a big deal.
I've thought that I've replied to comment,
maybe I just didn't get meaning behind question?
So I'll try to explain again.
If we reach this point rev must be 5, so f->rev >= 6 would be confusing at this point. When v6 support is added this assert should be moved after v6 stuff and condition is amended to f->rev == 6.
Quoted 1 line
Reviewed-by Eric Auger <[email protected]>
Thanks!
Quoted 65 lines
Thanks
Eric
Quoted 61 lines
hw/acpi/aml-build.c +1
-0+ build_hdr:build_header (linker, tbl, (void *)(tbl->data + fadt_start),"FACP" , tbl->len - fadt_start, f->rev, oem_id, oem_table_id);hw/arm/virt-acpi-build.c +12
-21@@ -654,39 +654,30 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)static void build_fadt_rev5 (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms,unsigned dsdt_tbl_offset) { -int fadt_start = table_data->len; -AcpiFadtDescriptorRev5_1 *fadt =acpi_data_push (table_data,sizeof (*fadt)); -unsigned xdsdt_entry_offset = (char *)&fadt->x_dsdt - table_data->data; -uint16_t bootflags; +/* ACPI v5.1 */ +AcpiFadtData fadt = { + .rev =5 , + .minor_ver =1 , + .flags =1 <<ACPI_FADT_F_HW_REDUCED_ACPI , + .xdsdt_tbl_offset = &dsdt_tbl_offset, + };switch (vms->psci_conduit) {case QEMU_PSCI_CONDUIT_DISABLED : - bootflags =0 ; + fadt.arm_boot_arch =0 ;break ;case QEMU_PSCI_CONDUIT_HVC : - bootflags =ACPI_FADT_ARM_PSCI_COMPLIANT |ACPI_FADT_ARM_PSCI_USE_HVC ; + fadt.arm_boot_arch =ACPI_FADT_ARM_PSCI_COMPLIANT | +ACPI_FADT_ARM_PSCI_USE_HVC ;break ;case QEMU_PSCI_CONDUIT_SMC : - bootflags =ACPI_FADT_ARM_PSCI_COMPLIANT ; + fadt.arm_boot_arch =ACPI_FADT_ARM_PSCI_COMPLIANT ;break ;default :g_assert_not_reached (); } -/* Hardware Reduced = 1 and use PSCI 0.2+ */ - fadt->flags =cpu_to_le32 (1 <<ACPI_FADT_F_HW_REDUCED_ACPI ); - fadt->arm_boot_flags =cpu_to_le16 (bootflags); - -/* ACPI v5.1 (fadt->revision.fadt->minor_revision) */ - fadt->minor_revision =0x1 ; - -/* DSDT address to be filled by Guest linker */ -bios_linker_loader_add_pointer (linker, -ACPI_BUILD_TABLE_FILE , xdsdt_entry_offset,sizeof (fadt->x_dsdt), -ACPI_BUILD_TABLE_FILE , dsdt_tbl_offset); - -build_header (linker, table_data, (void *)(table_data->data + fadt_start), -"FACP" , table_data->len - fadt_start,5 ,NULL ,NULL ); +build_fadt (table_data, linker, &fadt,NULL ,NULL ); }/* DSDT */
Re: [Qemu-arm] [PATCH v2 09/10] virt_arm: acpi: reuse common build_fadt()
Quoted 65 lines · Igor Mammedov
Quoted 62 lines · On Thu, 1 Mar 2018 09:51:14 +0100 Auger Eric <[email protected]> wrote:
Hi,
Quoted 60 lines · Igor Mammedov
Extend generic
build_fadt()to support rev5.1 FADT and reuse it for 'virt' board, it would allow to phase out usage ofAcpiFadtDescriptorRev5_1and laterACPI_FADT_COMMON_DEF.Signed-off-by Igor Mammedov <[email protected]>---
v2:
- update comment to mention thatbuild_fadt()supports 5.1 revision--- include/hw/acpi/acpi-defs.h | 12 ++---------- hw/acpi/aml-build.c | 23 +++++++++++++++++++++-- hw/arm/virt-acpi-build.c | 33 ++++++++++++--------------------- 3 files changed, 35 insertions(+), 33 deletions(-)include/hw/acpi/acpi-defs.h +2
-10@@ -165,16 +165,6 @@ struct AcpiFadtDescriptorRev3 { }QEMU_PACKED ;typedef struct AcpiFadtDescriptorRev3 AcpiFadtDescriptorRev3 ; -struct AcpiFadtDescriptorRev5_1 { -ACPI_FADT_COMMON_DEF -/* 64-bit Sleep Control register (ACPI 5.0) */ - struct AcpiGenericAddress sleep_control; -/* 64-bit Sleep Status register (ACPI 5.0) */ -struct AcpiGenericAddress sleep_status; -}QEMU_PACKED ; - -typedef struct AcpiFadtDescriptorRev5_1 AcpiFadtDescriptorRev5_1 ; - typedef struct AcpiFadtData { struct AcpiGenericAddress pm1a_cnt; /* PM1a_CNT_BLK */ struct AcpiGenericAddress pm1a_evt; /* PM1a_EVT_BLK */@@ -192,6 +182,8 @@ typedef struct AcpiFadtData {uint8_t rtc_century;/* CENTURY */ uint16_t plvl2_lat;/* P_LVL2_LAT */ uint16_t plvl3_lat;/* P_LVL3_LAT */ +uint16_t arm_boot_arch;/* ARM_BOOT_ARCH */ +uint8_t minor_ver;/* FADT Minor Version */ /* * respective tables offsets within ACPI_BUILD_TABLE_FILE, hw/acpi/aml-build.c +1
-1@@ -1679,7 +1679,7 @@ void build_slit(GArray *table_data, BIOSLinker *linker) table_data->len - slit_start, 1, NULL, NULL); } -/* build rev1/rev3 FADT */ +/* build rev1/rev3/rev5.1 FADT */ void build_fadt (GArray *tbl,BIOSLinker *linker,const AcpiFadtData *f,const char *oem_id,const char *oem_table_id) {@@ -1755,7 +1755,14 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,
Quoted 3 lines
Quoted 3 lines
hw/acpi/aml-build.c void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, · line 1758
Quoted 3 lines
hw/acpi/aml-build.c +0
-1build_append_gas_from_struct (tbl, &f->reset_reg);/* RESET_REG */ build_append_int_noprefix (tbl, f->reset_val,1 );/* RESET_VALUE */ -build_append_int_noprefix (tbl,0 ,3 );/* Reserved, ACPI 3.0 */
I meant we could have assert(f->rev < 6) here
Quoted 2 lines
Quoted 2 lines
hw/acpi/aml-build.c void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, · line 1759
Quoted 2 lines
hw/acpi/aml-build.c +2
-0+/* Since ACPI 5.1 */ +if ((f->rev >=6 ) || ((f->rev ==5 ) && f->minor_ver >0 )) {
and remove (f->rev >= 6) as in any case rev6 is not supported (Hypervisor Vendor Identity field (8 byte) not duly added).
Or do I miss something?
Thanks
Eric
Quoted 104 lines
Quoted 13 lines
Quoted 13 lines
hw/acpi/aml-build.c +6
-0+build_append_int_noprefix (tbl, f->arm_boot_arch,2 );/* ARM_BOOT_ARCH */ +/* FADT Minor Version */ +build_append_int_noprefix (tbl, f->minor_ver,1 ); + }else { +build_append_int_noprefix (tbl,0 ,3 );/* Reserved upto ACPI 5.0 */ + }build_append_int_noprefix (tbl,0 ,8 );/* X_FIRMWARE_CTRL */ /* XDSDT address to be filled by Guest linker at runtime */ @@ -1779,6 +1786,18 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,build_append_gas_from_struct (tbl, &f->gpe0_blk);/* X_GPE0_BLK */ build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 );/* X_GPE1_BLK */ Quoted 13 lines
hw/acpi/aml-build.c void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, · line 1799
Quoted 11 lines
hw/acpi/aml-build.c +11
-0+if (f->rev <=4 ) { + goto build_hdr; + } + +/* SLEEP_CONTROL_REG */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); +/* SLEEP_STATUS_REG */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); + +/* TODO: extra fields need to be added to support revisions above rev5 */ +assert (f->rev ==5 );My previous comment about asserting here if
f->rev!= 5 and previous (f->rev>= 6) check was skipped but that's not a big deal.I've thought that I've replied to comment,
maybe I just didn't get meaning behind question?
So I'll try to explain again.If we reach this point rev must be 5, so
f->rev>= 6 would be confusing at this point. When v6 support is added this assert should be moved after v6 stuff and condition is amended tof->rev== 6.Quoted 1 line
Reviewed-by Eric Auger <[email protected]>Thanks!
Quoted 65 lines
Thanks
Eric
Quoted 61 lines
hw/acpi/aml-build.c +1
-0+ build_hdr:build_header (linker, tbl, (void *)(tbl->data + fadt_start),"FACP" , tbl->len - fadt_start, f->rev, oem_id, oem_table_id);hw/arm/virt-acpi-build.c +12
-21@@ -654,39 +654,30 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)static void build_fadt_rev5 (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms,unsigned dsdt_tbl_offset) { -int fadt_start = table_data->len; -AcpiFadtDescriptorRev5_1 *fadt =acpi_data_push (table_data,sizeof (*fadt)); -unsigned xdsdt_entry_offset = (char *)&fadt->x_dsdt - table_data->data; -uint16_t bootflags; +/* ACPI v5.1 */ +AcpiFadtData fadt = { + .rev =5 , + .minor_ver =1 , + .flags =1 <<ACPI_FADT_F_HW_REDUCED_ACPI , + .xdsdt_tbl_offset = &dsdt_tbl_offset, + };switch (vms->psci_conduit) {case QEMU_PSCI_CONDUIT_DISABLED : - bootflags =0 ; + fadt.arm_boot_arch =0 ;break ;case QEMU_PSCI_CONDUIT_HVC : - bootflags =ACPI_FADT_ARM_PSCI_COMPLIANT |ACPI_FADT_ARM_PSCI_USE_HVC ; + fadt.arm_boot_arch =ACPI_FADT_ARM_PSCI_COMPLIANT | +ACPI_FADT_ARM_PSCI_USE_HVC ;break ;case QEMU_PSCI_CONDUIT_SMC : - bootflags =ACPI_FADT_ARM_PSCI_COMPLIANT ; + fadt.arm_boot_arch =ACPI_FADT_ARM_PSCI_COMPLIANT ;break ;default :g_assert_not_reached (); } -/* Hardware Reduced = 1 and use PSCI 0.2+ */ - fadt->flags =cpu_to_le32 (1 <<ACPI_FADT_F_HW_REDUCED_ACPI ); - fadt->arm_boot_flags =cpu_to_le16 (bootflags); - -/* ACPI v5.1 (fadt->revision.fadt->minor_revision) */ - fadt->minor_revision =0x1 ; - -/* DSDT address to be filled by Guest linker */ -bios_linker_loader_add_pointer (linker, -ACPI_BUILD_TABLE_FILE , xdsdt_entry_offset,sizeof (fadt->x_dsdt), -ACPI_BUILD_TABLE_FILE , dsdt_tbl_offset); - -build_header (linker, table_data, (void *)(table_data->data + fadt_start), -"FACP" , table_data->len - fadt_start,5 ,NULL ,NULL ); +build_fadt (table_data, linker, &fadt,NULL ,NULL ); }/* DSDT */
Re: [Qemu-arm] [PATCH v2 09/10] virt_arm: acpi: reuse common build_fadt()
On Thu, 1 Mar 2018 10:38:52 +0100
Auger Eric <[email protected]> wrote:
[...]
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
hw/acpi/aml-build.c void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, · line 1758
Quoted 6 lines
{
hw/acpi/aml-build.c +0
-1@@ -1755,7 +1755,14 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,build_append_gas_from_struct (tbl, &f->reset_reg);/* RESET_REG */ build_append_int_noprefix (tbl, f->reset_val,1 );/* RESET_VALUE */ -build_append_int_noprefix (tbl,0 ,3 );/* Reserved, ACPI 3.0 */ I meant we could have
assert(f->rev < 6)here
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
hw/acpi/aml-build.c void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, · line 1759
Quoted 2 lines
hw/acpi/aml-build.c +2
-0+/* Since ACPI 5.1 */ +if ((f->rev >=6 ) || ((f->rev ==5 ) && f->minor_ver >0 )) {and remove (
f->rev>= 6) as in any case rev6 is not supported (Hypervisor Vendor Identity field (8 byte) not duly added).Or do I miss something?
Nope, you are right.
I've missed 'code above' part and didn't get suggestion the first time.
The reason why I didn't assert here is to keep this part (in the middle of table) working correctly without need to touch it when later revisions will add new fields at the end of table. So all we would have to do is to add new code at the end and update assert that sets revision limit.
condition here essentially implements specs, i.e.
from 5.1 onward reserved space should be used for now defined fields.
We might add similar conditions, for other 'Reserved' fields, in the future if new revisions start to use them.
Quoted 45 lines
Thanks
Eric
Quoted 42 lines
Quoted 13 lines
Quoted 13 lines
hw/acpi/aml-build.c +6
-0+build_append_int_noprefix (tbl, f->arm_boot_arch,2 );/* ARM_BOOT_ARCH */ +/* FADT Minor Version */ +build_append_int_noprefix (tbl, f->minor_ver,1 ); + }else { +build_append_int_noprefix (tbl,0 ,3 );/* Reserved upto ACPI 5.0 */ + }build_append_int_noprefix (tbl,0 ,8 );/* X_FIRMWARE_CTRL */ /* XDSDT address to be filled by Guest linker at runtime */ @@ -1779,6 +1786,18 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,build_append_gas_from_struct (tbl, &f->gpe0_blk);/* X_GPE0_BLK */ build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 );/* X_GPE1_BLK */ Quoted 13 lines
hw/acpi/aml-build.c void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, · line 1799
Quoted 11 lines
hw/acpi/aml-build.c +11
-0+if (f->rev <=4 ) { + goto build_hdr; + } + +/* SLEEP_CONTROL_REG */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); +/* SLEEP_STATUS_REG */ +build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 ); + +/* TODO: extra fields need to be added to support revisions above rev5 */ +assert (f->rev ==5 );My previous comment about asserting here if
f->rev!= 5 and previous (f->rev>= 6) check was skipped but that's not a big deal.I've thought that I've replied to comment,
maybe I just didn't get meaning behind question?
So I'll try to explain again.If we reach this point rev must be 5, so
f->rev>= 6 would be confusing at this point. When v6 support is added this assert should be moved after v6 stuff and condition is amended tof->rev== 6.Quoted 1 line
Reviewed-by Eric Auger <[email protected]>Thanks!
Quoted 4 lines
Thanks
Eric
[...]
PATCH v2 10/10 tests: acpi: don't read all fields in test_acpi_fadt_table()
In reply to Igor Mammedovthere is no point to read fields here but not actually checking them so drop it and read only header + dsdt/facs addresses since it's needed later to fetch that tables.
With this cleanup we can get rid of AcpiFadtDescriptorRev3/ ACPI_FADT_COMMON_DEF which have no users left.
--- include/hw/acpi/acpi-defs.h | 81 -------------------------------------------- tests/bios-tables-test.c | 82 ++++++++++----------------------------------- 2 files changed, 18 insertions(+), 145 deletions(-)
include/hw/acpi/acpi-defs.h +0 -81
@@ -75,82 +75,6 @@ struct AcpiTableHeader { }QEMU_PACKED ;typedef struct AcpiTableHeader AcpiTableHeader ; -/* -* ACPI Fixed ACPI Description Table (FADT) -*/ -#define ACPI_FADT_COMMON_DEF /* FADT common definition */ \ - ACPI_TABLE_HEADER_DEF/* ACPI common table header */ \ -uint32_t firmware_ctrl;/* Physical address of FACS */ \ -uint32_t dsdt;/* Physical address of DSDT */ \ -uint8_t model;/* System Interrupt Model */ \ -uint8_t reserved1;/* Reserved */ \ -uint16_t sci_int;/* System vector of SCI interrupt */ \ -uint32_t smi_cmd;/* Port address of SMI command port */ \ -uint8_t acpi_enable;/* Value to write to smi_cmd to enable ACPI */ \ -uint8_t acpi_disable;/* Value to write to smi_cmd to disable ACPI */ \ -/* Value to write to SMI CMD to enter S4BIOS state */ \ -uint8_t S4bios_req; \ -uint8_t reserved2;/* Reserved - must be zero */ \ -/* Port address of Power Mgt 1a acpi_event Reg Blk */ \ -uint32_t pm1a_evt_blk; \ -/* Port address of Power Mgt 1b acpi_event Reg Blk */ \ -uint32_t pm1b_evt_blk; \ -uint32_t pm1a_cnt_blk;/* Port address of Power Mgt 1a Control Reg Blk */ \ -uint32_t pm1b_cnt_blk;/* Port address of Power Mgt 1b Control Reg Blk */ \ -uint32_t pm2_cnt_blk;/* Port address of Power Mgt 2 Control Reg Blk */ \ -uint32_t pm_tmr_blk;/* Port address of Power Mgt Timer Ctrl Reg Blk */ \ -/* Port addr of General Purpose acpi_event 0 Reg Blk */ \ -uint32_t gpe0_blk; \ -/* Port addr of General Purpose acpi_event 1 Reg Blk */ \ -uint32_t gpe1_blk; \ -uint8_t pm1_evt_len;/* Byte length of ports at pm1_x_evt_blk */ \ -uint8_t pm1_cnt_len;/* Byte length of ports at pm1_x_cnt_blk */ \ -uint8_t pm2_cnt_len;/* Byte Length of ports at pm2_cnt_blk */ \ -uint8_t pm_tmr_len;/* Byte Length of ports at pm_tm_blk */ \ -uint8_t gpe0_blk_len;/* Byte Length of ports at gpe0_blk */ \ -uint8_t gpe1_blk_len;/* Byte Length of ports at gpe1_blk */ \ -uint8_t gpe1_base;/* Offset in gpe model where gpe1 events start */ \ -uint8_t reserved3;/* Reserved */ \ -uint16_t plvl2_lat;/* Worst case HW latency to enter/exit C2 state */ \ -uint16_t plvl3_lat;/* Worst case HW latency to enter/exit C3 state */ \ -uint16_t flush_size;/* Size of area read to flush caches */ \ -uint16_t flush_stride;/* Stride used in flushing caches */ \ -uint8_t duty_offset;/* Bit location of duty cycle field in p_cnt reg */ \ -uint8_t duty_width;/* Bit width of duty cycle field in p_cnt reg */ \ -uint8_t day_alrm;/* Index to day-of-month alarm in RTC CMOS RAM */ \ -uint8_t mon_alrm;/* Index to month-of-year alarm in RTC CMOS RAM */ \ -uint8_t century;/* Index to century in RTC CMOS RAM */ \ -/* IA-PC Boot Architecture Flags (see below for individual flags) */ \ -uint16_t boot_flags; \ -uint8_t reserved;/* Reserved, must be zero */ \ -/* Miscellaneous flag bits (see below for individual flags) */ \ -uint32_t flags; \ -/* 64-bit address of the Reset register */ \ -struct AcpiGenericAddress reset_register; \ -/* Value to write to the reset_register port to reset the system */ \ -uint8_t reset_value; \ -/* ARM-Specific Boot Flags (see below for individual flags) (ACPI 5.1) */ \ -uint16_t arm_boot_flags; \ -uint8_t minor_revision;/* FADT Minor Revision (ACPI 5.1) */ \ -uint64_t x_facs;/* 64-bit physical address of FACS */ \ -uint64_t x_dsdt;/* 64-bit physical address of DSDT */ \ -/* 64-bit Extended Power Mgt 1a Event Reg Blk address */ \ -struct AcpiGenericAddress xpm1a_event_block; \ -/* 64-bit Extended Power Mgt 1b Event Reg Blk address */ \ -struct AcpiGenericAddress xpm1b_event_block; \ -/* 64-bit Extended Power Mgt 1a Control Reg Blk address */ \ -struct AcpiGenericAddress xpm1a_control_block; \ -/* 64-bit Extended Power Mgt 1b Control Reg Blk address */ \ -struct AcpiGenericAddress xpm1b_control_block; \ -/* 64-bit Extended Power Mgt 2 Control Reg Blk address */ \ -struct AcpiGenericAddress xpm2_control_block; \ -/* 64-bit Extended Power Mgt Timer Ctrl Reg Blk address */ \ -struct AcpiGenericAddress xpm_timer_block; \ -/* 64-bit Extended General Purpose Event 0 Reg Blk address */ \ -struct AcpiGenericAddress xgpe0_block; \ -/* 64-bit Extended General Purpose Event 1 Reg Blk address */ \ -struct AcpiGenericAddress xgpe1_block; \ -struct AcpiGenericAddress {uint8_t space_id;/* Address space where struct or register exists */ uint8_t bit_width;/* Size in bits of given register */
@@ -160,11 +84,6 @@ struct AcpiGenericAddress {uint64_t address;/* 64-bit address of struct or register */ }QEMU_PACKED ; -struct AcpiFadtDescriptorRev3 { - ACPI_FADT_COMMON_DEF -}QEMU_PACKED ; -typedef struct AcpiFadtDescriptorRev3 AcpiFadtDescriptorRev3 ; - typedef struct AcpiFadtData { struct AcpiGenericAddress pm1a_cnt; /* PM1a_CNT_BLK */ struct AcpiGenericAddress pm1a_evt; /* PM1a_EVT_BLK */
tests/bios-tables-test.c +18 -64
123 lines not on this page · raw message
Signature · 1 line
2.7.4
Re: [Qemu-arm] [PATCH v2 10/10] tests: acpi: don't read all fields in test_acpi_fadt_table()
Hi Igor,
Quoted 8 lines · Igor Mammedov
there is no point to read fields here but not actually checking them so drop it and read only header + dsdt/facs addresses since it's needed later to fetch that tables.
With this cleanup we can get rid of AcpiFadtDescriptorRev3/
ACPI_FADT_COMMON_DEFwhich have no users left.Signed-off-by Igor Mammedov <[email protected]>
My only comment is you could have removed include/hw/acpi/acpi-defs.h defs in a separate subsequent patch after updating the test stuff. Besides,
Eric
Quoted 238 lines
--- include/hw/acpi/acpi-defs.h | 81 -------------------------------------------- tests/bios-tables-test.c | 82 ++++++++++----------------------------------- 2 files changed, 18 insertions(+), 145 deletions(-)include/hw/acpi/acpi-defs.h +0
-81@@ -75,82 +75,6 @@ struct AcpiTableHeader { }QEMU_PACKED ;typedef struct AcpiTableHeader AcpiTableHeader ; -/* -* ACPI Fixed ACPI Description Table (FADT) -*/ -#define ACPI_FADT_COMMON_DEF /* FADT common definition */ \ - ACPI_TABLE_HEADER_DEF/* ACPI common table header */ \ -uint32_t firmware_ctrl;/* Physical address of FACS */ \ -uint32_t dsdt;/* Physical address of DSDT */ \ -uint8_t model;/* System Interrupt Model */ \ -uint8_t reserved1;/* Reserved */ \ -uint16_t sci_int;/* System vector of SCI interrupt */ \ -uint32_t smi_cmd;/* Port address of SMI command port */ \ -uint8_t acpi_enable;/* Value to write to smi_cmd to enable ACPI */ \ -uint8_t acpi_disable;/* Value to write to smi_cmd to disable ACPI */ \ -/* Value to write to SMI CMD to enter S4BIOS state */ \ -uint8_t S4bios_req; \ -uint8_t reserved2;/* Reserved - must be zero */ \ -/* Port address of Power Mgt 1a acpi_event Reg Blk */ \ -uint32_t pm1a_evt_blk; \ -/* Port address of Power Mgt 1b acpi_event Reg Blk */ \ -uint32_t pm1b_evt_blk; \ -uint32_t pm1a_cnt_blk;/* Port address of Power Mgt 1a Control Reg Blk */ \ -uint32_t pm1b_cnt_blk;/* Port address of Power Mgt 1b Control Reg Blk */ \ -uint32_t pm2_cnt_blk;/* Port address of Power Mgt 2 Control Reg Blk */ \ -uint32_t pm_tmr_blk;/* Port address of Power Mgt Timer Ctrl Reg Blk */ \ -/* Port addr of General Purpose acpi_event 0 Reg Blk */ \ -uint32_t gpe0_blk; \ -/* Port addr of General Purpose acpi_event 1 Reg Blk */ \ -uint32_t gpe1_blk; \ -uint8_t pm1_evt_len;/* Byte length of ports at pm1_x_evt_blk */ \ -uint8_t pm1_cnt_len;/* Byte length of ports at pm1_x_cnt_blk */ \ -uint8_t pm2_cnt_len;/* Byte Length of ports at pm2_cnt_blk */ \ -uint8_t pm_tmr_len;/* Byte Length of ports at pm_tm_blk */ \ -uint8_t gpe0_blk_len;/* Byte Length of ports at gpe0_blk */ \ -uint8_t gpe1_blk_len;/* Byte Length of ports at gpe1_blk */ \ -uint8_t gpe1_base;/* Offset in gpe model where gpe1 events start */ \ -uint8_t reserved3;/* Reserved */ \ -uint16_t plvl2_lat;/* Worst case HW latency to enter/exit C2 state */ \ -uint16_t plvl3_lat;/* Worst case HW latency to enter/exit C3 state */ \ -uint16_t flush_size;/* Size of area read to flush caches */ \ -uint16_t flush_stride;/* Stride used in flushing caches */ \ -uint8_t duty_offset;/* Bit location of duty cycle field in p_cnt reg */ \ -uint8_t duty_width;/* Bit width of duty cycle field in p_cnt reg */ \ -uint8_t day_alrm;/* Index to day-of-month alarm in RTC CMOS RAM */ \ -uint8_t mon_alrm;/* Index to month-of-year alarm in RTC CMOS RAM */ \ -uint8_t century;/* Index to century in RTC CMOS RAM */ \ -/* IA-PC Boot Architecture Flags (see below for individual flags) */ \ -uint16_t boot_flags; \ -uint8_t reserved;/* Reserved, must be zero */ \ -/* Miscellaneous flag bits (see below for individual flags) */ \ -uint32_t flags; \ -/* 64-bit address of the Reset register */ \ -struct AcpiGenericAddress reset_register; \ -/* Value to write to the reset_register port to reset the system */ \ -uint8_t reset_value; \ -/* ARM-Specific Boot Flags (see below for individual flags) (ACPI 5.1) */ \ -uint16_t arm_boot_flags; \ -uint8_t minor_revision;/* FADT Minor Revision (ACPI 5.1) */ \ -uint64_t x_facs;/* 64-bit physical address of FACS */ \ -uint64_t x_dsdt;/* 64-bit physical address of DSDT */ \ -/* 64-bit Extended Power Mgt 1a Event Reg Blk address */ \ -struct AcpiGenericAddress xpm1a_event_block; \ -/* 64-bit Extended Power Mgt 1b Event Reg Blk address */ \ -struct AcpiGenericAddress xpm1b_event_block; \ -/* 64-bit Extended Power Mgt 1a Control Reg Blk address */ \ -struct AcpiGenericAddress xpm1a_control_block; \ -/* 64-bit Extended Power Mgt 1b Control Reg Blk address */ \ -struct AcpiGenericAddress xpm1b_control_block; \ -/* 64-bit Extended Power Mgt 2 Control Reg Blk address */ \ -struct AcpiGenericAddress xpm2_control_block; \ -/* 64-bit Extended Power Mgt Timer Ctrl Reg Blk address */ \ -struct AcpiGenericAddress xpm_timer_block; \ -/* 64-bit Extended General Purpose Event 0 Reg Blk address */ \ -struct AcpiGenericAddress xgpe0_block; \ -/* 64-bit Extended General Purpose Event 1 Reg Blk address */ \ -struct AcpiGenericAddress xgpe1_block; \ -struct AcpiGenericAddress {uint8_t space_id;/* Address space where struct or register exists */ uint8_t bit_width;/* Size in bits of given register */ @@ -160,11 +84,6 @@ struct AcpiGenericAddress {uint64_t address;/* 64-bit address of struct or register */ }QEMU_PACKED ; -struct AcpiFadtDescriptorRev3 { - ACPI_FADT_COMMON_DEF -}QEMU_PACKED ; -typedef struct AcpiFadtDescriptorRev3 AcpiFadtDescriptorRev3 ; - typedef struct AcpiFadtData { struct AcpiGenericAddress pm1a_cnt; /* PM1a_CNT_BLK */ struct AcpiGenericAddress pm1a_evt; /* PM1a_EVT_BLK */tests/bios-tables-test.c +18
-64@@ -29,7 +29,8 @@ typedef struct {uint32_t rsdp_addr;AcpiRsdpDescriptor rsdp_table;AcpiRsdtDescriptorRev1 rsdt_table; -AcpiFadtDescriptorRev3 fadt_table; +uint32_t dsdt_addr; +uint32_t facs_addr;AcpiFacsDescriptorRev1 facs_table;uint32_t *rsdt_tables_addr;int rsdt_tables_nr;@@ -127,71 +128,18 @@ static void test_acpi_rsdt_table(test_data *data) data->rsdt_tables_nr = tables_nr; } -static void test_acpi_fadt_table (test_data *data) +static void fadt_fetch_facs_and_dsdt_ptrs (test_data *data) { -AcpiFadtDescriptorRev3 *fadt_table = &data->fadt_table;uint32_t addr; +AcpiTableHeader hdr;/* FADT table comes first */ addr =le32_to_cpu (data->rsdt_tables_addr[0 ]); -ACPI_READ_TABLE_HEADER (fadt_table, addr); - -ACPI_READ_FIELD (fadt_table->firmware_ctrl, addr); -ACPI_READ_FIELD (fadt_table->dsdt, addr); -ACPI_READ_FIELD (fadt_table->model, addr); -ACPI_READ_FIELD (fadt_table->reserved1, addr); -ACPI_READ_FIELD (fadt_table->sci_int, addr); -ACPI_READ_FIELD (fadt_table->smi_cmd, addr); -ACPI_READ_FIELD (fadt_table->acpi_enable, addr); -ACPI_READ_FIELD (fadt_table->acpi_disable, addr); -ACPI_READ_FIELD (fadt_table->S4bios_req, addr); -ACPI_READ_FIELD (fadt_table->reserved2, addr); -ACPI_READ_FIELD (fadt_table->pm1a_evt_blk, addr); -ACPI_READ_FIELD (fadt_table->pm1b_evt_blk, addr); -ACPI_READ_FIELD (fadt_table->pm1a_cnt_blk, addr); -ACPI_READ_FIELD (fadt_table->pm1b_cnt_blk, addr); -ACPI_READ_FIELD (fadt_table->pm2_cnt_blk, addr); -ACPI_READ_FIELD (fadt_table->pm_tmr_blk, addr); -ACPI_READ_FIELD (fadt_table->gpe0_blk, addr); -ACPI_READ_FIELD (fadt_table->gpe1_blk, addr); -ACPI_READ_FIELD (fadt_table->pm1_evt_len, addr); -ACPI_READ_FIELD (fadt_table->pm1_cnt_len, addr); -ACPI_READ_FIELD (fadt_table->pm2_cnt_len, addr); -ACPI_READ_FIELD (fadt_table->pm_tmr_len, addr); -ACPI_READ_FIELD (fadt_table->gpe0_blk_len, addr); -ACPI_READ_FIELD (fadt_table->gpe1_blk_len, addr); -ACPI_READ_FIELD (fadt_table->gpe1_base, addr); -ACPI_READ_FIELD (fadt_table->reserved3, addr); -ACPI_READ_FIELD (fadt_table->plvl2_lat, addr); -ACPI_READ_FIELD (fadt_table->plvl3_lat, addr); -ACPI_READ_FIELD (fadt_table->flush_size, addr); -ACPI_READ_FIELD (fadt_table->flush_stride, addr); -ACPI_READ_FIELD (fadt_table->duty_offset, addr); -ACPI_READ_FIELD (fadt_table->duty_width, addr); -ACPI_READ_FIELD (fadt_table->day_alrm, addr); -ACPI_READ_FIELD (fadt_table->mon_alrm, addr); -ACPI_READ_FIELD (fadt_table->century, addr); -ACPI_READ_FIELD (fadt_table->boot_flags, addr); -ACPI_READ_FIELD (fadt_table->reserved, addr); -ACPI_READ_FIELD (fadt_table->flags, addr); -ACPI_READ_GENERIC_ADDRESS (fadt_table->reset_register, addr); -ACPI_READ_FIELD (fadt_table->reset_value, addr); -ACPI_READ_FIELD (fadt_table->arm_boot_flags, addr); -ACPI_READ_FIELD (fadt_table->minor_revision, addr); -ACPI_READ_FIELD (fadt_table->x_facs, addr); -ACPI_READ_FIELD (fadt_table->x_dsdt, addr); -ACPI_READ_GENERIC_ADDRESS (fadt_table->xpm1a_event_block, addr); -ACPI_READ_GENERIC_ADDRESS (fadt_table->xpm1b_event_block, addr); -ACPI_READ_GENERIC_ADDRESS (fadt_table->xpm1a_control_block, addr); -ACPI_READ_GENERIC_ADDRESS (fadt_table->xpm1b_control_block, addr); -ACPI_READ_GENERIC_ADDRESS (fadt_table->xpm2_control_block, addr); -ACPI_READ_GENERIC_ADDRESS (fadt_table->xpm_timer_block, addr); -ACPI_READ_GENERIC_ADDRESS (fadt_table->xgpe0_block, addr); -ACPI_READ_GENERIC_ADDRESS (fadt_table->xgpe1_block, addr); - -ACPI_ASSERT_CMP (fadt_table->signature,"FACP" ); -g_assert (!acpi_calc_checksum ((uint8_t *)fadt_table, -le32_to_cpu (fadt_table->length))); +ACPI_READ_TABLE_HEADER (&hdr, addr); +ACPI_ASSERT_CMP (hdr.signature,"FACP" ); + +ACPI_READ_FIELD (data->facs_addr, addr); +ACPI_READ_FIELD (data->dsdt_addr, addr); }static void sanitize_fadt_ptrs (test_data *data)@@ -206,6 +154,12 @@ static void sanitize_fadt_ptrs(test_data *data)continue ; } +/* check original FADT checksum before sanitizing table */ +g_assert (!(uint8_t )( +acpi_calc_checksum ((uint8_t *)sdt,sizeof (AcpiTableHeader)) + +acpi_calc_checksum ((uint8_t *)sdt->aml, sdt->aml_len) + )); +/* sdt->aml field offset := spec offset - header size */ memset (sdt->aml +0 ,0 ,4 );/* sanitize FIRMWARE_CTRL(36) ptr */ memset (sdt->aml +4 ,0 ,4 );/* sanitize DSDT(40) ptr */ @@ -226,7 +180,7 @@ static void sanitize_fadt_ptrs(test_data *data)static void test_acpi_facs_table (test_data *data) {AcpiFacsDescriptorRev1 *facs_table = &data->facs_table; -uint32_t addr =le32_to_cpu (data->fadt_table.firmware_ctrl); +uint32_t addr =le32_to_cpu (data->facs_addr);ACPI_READ_FIELD (facs_table->signature, addr);ACPI_READ_FIELD (facs_table->length, addr);@@ -265,7 +219,7 @@ static void fetch_table(AcpiSdtTable *sdt_table, uint32_t addr)static void test_acpi_dsdt_table (test_data *data) {AcpiSdtTable dsdt_table; -uint32_t addr =le32_to_cpu (data->fadt_table.dsdt); +uint32_t addr =le32_to_cpu (data->dsdt_addr);fetch_table (&dsdt_table, addr);ACPI_ASSERT_CMP (dsdt_table.header.signature,"DSDT" );@@ -674,7 +628,7 @@ static void test_acpi_one(const char *params, test_data *data)test_acpi_rsdp_address (data);test_acpi_rsdp_table (data);test_acpi_rsdt_table (data); -test_acpi_fadt_table (data); +fadt_fetch_facs_and_dsdt_ptrs (data);test_acpi_facs_table (data);test_acpi_dsdt_table (data);fetch_rsdt_referenced_tables (data);
Hi,
Quoted 22 lines · Igor Mammedov
v2:
* fix typo in "acpi: remove unused acpi-dsdt.aml"
* splitACPI_PORT_SMI_CMDinto separate cleanup patch
* s/pm1_/pm1a_/, s/c2_latency/plvl2_lat/, s/c3_latency/plvl3_lat/ and fix conflicts in followup patches caused by renaming
* conditionalFIRMWARE_CTRL, DSDT patching is introduced in the patch that makesbuild_fadt()generic instead of earlier "pc: acpi: isolate FADT specific data into AcpiFadtData structure"
* update comment to mention thatbuild_fadt()supports 5.1 revisionSeries first cleanups ACPI code around
build_fadt()and then converts current packed structure approach to abuild_append_FOO()API, getting rid of error prone explicit endianness conversions in code and makingbuild_fadt()look more like APCI table declaration from spec, which should be easier to read/maintain. After thatbuild_fadt()becomes generic enough that we could drop ARM specific implementation and reuse genericbuild_fadt(), reducing code duplication.
Quoted 2 lines
PS: tested only x86 which has make check coverage,
ARM was only slightly tested.
on AArch64 with a rhel guest.
Thanks
Eric
Quoted 36 lines
git tree for testing:
https://github.com/imammedo/qemu.gitfadt_refactoring_v2CC "Michael S. Tsirkin" <[email protected]>CC Shannon Zhao <[email protected]>CC Auger Eric <[email protected]>Igor Mammedov (10):
acpi: remove unused acpi-dsdt.aml
pc: replace pm object initialization with one-liner inacpi_get_pm_info()acpi: reuse AcpiGenericAddress instead of Acpi20GenericAddress
acpi: addbuild_append_gas()helper for Generic Address Structure
acpi: moveACPI_PORT_SMI_CMDdefine to header it belongs to
pc: acpi: isolate FADT specific data into AcpiFadtData structure
pc: acpi: usebuild_append_foo()API to construct FADT
acpi: movebuild_fadt()from i386 specific to generic ACPI source
virt_arm: acpi: reuse commonbuild_fadt()
tests: acpi: don't read all fields intest_acpi_fadt_table()include/hw/acpi/acpi-defs.h | 136 ++++++++---------------------- include/hw/acpi/aml-build.h | 23 ++++++ include/hw/isa/apm.h | 3 + Makefile | 1 - hw/acpi/aml-build.c | 140 +++++++++++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 39 ++++----- hw/i386/acpi-build.c | 196 ++++++++++++++------------------------------ hw/isa/apm.c | 1 - pc-bios/acpi-dsdt.aml | Bin 4405 -> 0 bytes tests/bios-tables-test.c | 82 ++++-------------- 10 files changed, 294 insertions(+), 327 deletions(-) delete mode 100644 pc-bios/acpi-dsdt.aml