acpi: refactor error prone build_header() and packed structures usage in ACPI tables
v4 cover acpi: refactor error prone build_header() and packed structures usage in ACPI tables
v4:
1. comments fixups and diing missing comments
2. clean up spurious changes
3. rebase on top of (4be8bfcb4d hw/i386/acpi-build: Fix a typo)
4. convert build_iort:
* keep nb_nodes variable
* encode 'Memory access properties' as separate entries according to Table 13
v3:
1. s/acpi_init_table()|acpi_table_composed()/acpi_table_begin()|acpi_table_end()/
2. arm:madt fix incorrect length
3. various comment improvments
4. rewrite IORT conversion patch due to heavy conflicts with bypass iommu code merged recently
5 pick up Eric's Reviewed-By where there wasn't significant change (1)
v2:
- drop test related patches, they will be sent as a separate series
- fix bios_loader pointer initialization ordering when using TPM1.2
- extend commit message of [1/35] and add extra comment about table length patching
Highlights:
* drop pointer arithmetic in ACPI tables code
* use endian agnostic API
* simplifies review of tables. /in most cases just line by line comparision with spec/
Series replaces build_header() with acpi_table_begin()/acpi_table_end() API that hides pointer/offset arithmetic from user, to prevent errors caused by it [1].
While doing above, it was necessary to split table header from packed structure that was describing the table, which is counter-productive since it still leaves packed structure drawbacks. So that sort of forced me to rewrite tables that were composed with help of packed structures to preferred build_append_int_noprefix() API. In cases where refactoring to build_append_int_noprefix() was small, it was squashed with acpi_table_begin()/acpi_table_end() patch. Conversion reduced code size quite a bit despite me adding doc comments for every table row.
1) commits
bb9feea43179 x86: acpi: use offset instead of pointer when using build_header() 4d027afeb3a9 Virt: ACPI: fix qemu assert due to re-assigned table data address
Link to repo with this series and tests to validate it:
https://gitlab.com/imammedo/qemu/-/commits/acpi_build_header_refactoring_v4
Previous v3 revision can be found at:
https://lore.kernel.org/qemu-devel/[email protected]/T/
Igor Mammedov (35):
acpi: add helper routines to initialize ACPI tables
acpi: build_rsdt: use acpi_table_begin()/acpi_table_end() instead of
build_header()
acpi: build_xsdt: use acpi_table_begin()/acpi_table_end() instead of
build_header()
acpi: build_slit: use acpi_table_begin()/acpi_table_end() instead of
build_header()
acpi: build_fadt: use acpi_table_begin()/acpi_table_end() instead of
build_header()
acpi: build_tpm2: use acpi_table_begin()/acpi_table_end() instead of
build_header()
acpi: acpi_build_hest: use acpi_table_begin()/acpi_table_end() instead
of build_header()
acpi: build_mcfg: use acpi_table_begin()/acpi_table_end() instead of
build_header()
acpi: build_hmat: use acpi_table_begin()/acpi_table_end() instead of
build_header()
acpi: nvdimm_build_nfit: use acpi_table_begin()/acpi_table_end()
instead of build_header()
acpi: nvdimm_build_ssdt: use acpi_table_begin()/acpi_table_end()
instead of build_header()
acpi: vmgenid_build_acpi: use acpi_table_begin()/acpi_table_end()
instead of build_header()
acpi: x86: build_dsdt: use acpi_table_begin()/acpi_table_end() instead
of build_header()
acpi: build_hpet: use acpi_table_begin()/acpi_table_end() instead of
build_header()
acpi: build_tpm_tcpa: use acpi_table_begin()/acpi_table_end() instead
of build_header()
acpi: arm/x86: build_srat: use acpi_table_begin()/acpi_table_end()
instead of build_header()
acpi: use build_append_int_noprefix() API to compose SRAT table
acpi: build_dmar_q35: use acpi_table_begin()/acpi_table_end() instead
of build_header()
acpi: build_waet: use acpi_table_begin()/acpi_table_end() instead of
build_header()
acpi: build_amd_iommu: use acpi_table_begin()/acpi_table_end() instead
of build_header()
acpi: madt: arm/x86: use acpi_table_begin()/acpi_table_end() instead
of build_header()
acpi: x86: remove dead code
acpi: x86: set enabled when composing _MAT entries
acpi: x86: madt: use build_append_int_noprefix() API to compose MADT
table
acpi: arm/virt: madt: use build_append_int_noprefix() API to compose
MADT table
acpi: build_dsdt_microvm: use acpi_table_begin()/acpi_table_end()
instead of build_header()
acpi: arm: virt: build_dsdt: use acpi_table_begin()/acpi_table_end()
instead of build_header()
acpi: arm: virt: build_iort: use acpi_table_begin()/acpi_table_end()
instead of build_header()
acpi: arm/virt: convert build_iort() to endian agnostic
build_append_FOO() API
acpi: arm/virt: build_spcr: fix invalid cast
acpi: arm/virt: build_spcr: use acpi_table_begin()/acpi_table_end()
instead of build_header()
acpi: arm/virt: build_gtdt: use acpi_table_begin()/acpi_table_end()
instead of build_header()
acpi: build_facs: use build_append_int_noprefix() API to compose table
acpi: remove no longer used build_header()
acpi: AcpiGenericAddress no longer used to map/access fields of MMIO,
drop packed attribute
include/hw/acpi/acpi-defs.h | 528 +----------------------- include/hw/acpi/acpi_dev_interface.h | 3 +- include/hw/acpi/aml-build.h | 37 +- include/hw/i386/pc.h | 6 +- hw/acpi/acpi-x86-stub.c | 3 +- hw/acpi/aml-build.c | 203 ++++++---- hw/acpi/cpu.c | 17 +- hw/acpi/ghes.c | 10 +- hw/acpi/hmat.c | 14 +- hw/acpi/nvdimm.c | 64 ++- hw/acpi/pci.c | 18 +- hw/acpi/vmgenid.c | 13 +- hw/arm/virt-acpi-build.c | 577 +++++++++++++++------------ hw/i386/acpi-build.c | 294 ++++++++------ hw/i386/acpi-common.c | 160 ++++---- hw/i386/acpi-microvm.c | 13 +- 16 files changed, 801 insertions(+), 1159 deletions(-)
Signature · 1 line
2.27.0
PATCH v4 1/35 acpi: add helper routines to initialize ACPI tables
Patch introduces acpi_table_begin()/ acpi_table_end() API that hides pointer/offset arithmetic from user as opposed to build_header(), to prevent errors caused by it [1].
acpi_table_begin():
initializes table header and keeps track of table data/offsets
acpi_table_end():
sets actual table length and tells bios loader where table is for the later initialization on guest side.
1) commits
bb9feea43179 x86: acpi: use offset instead of pointer when using build_header() 4d027afeb3a9 Virt: ACPI: fix qemu assert due to re-assigned table data address
---
CC: [email protected]
--- include/hw/acpi/aml-build.h | 31 +++++++++++++++++++ hw/acpi/aml-build.c | 62 +++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+)
include/hw/acpi/aml-build.h +31 -0
@@ -413,6 +413,37 @@ Aml *aml_concatenate(Aml *source1, Aml *source2, Aml *target);Aml *aml_object_type (Aml *object);void build_append_int_noprefix (GArray *table,uint64_t value,int size); + +typedef struct AcpiTable { +const char *sig; +const uint8_t rev; +const char *oem_id; +const char *oem_table_id; +/* private vars tracking table state */ +GArray *array; +unsigned table_offset; +}AcpiTable ; + +/** +* acpi_table_begin: +* initializes table header and keeps track of +* table data/offsets +* @desc: ACPI table descriptor +* @array: blob where the ACPI table will be composed/stored. +*/ +void acpi_table_begin (AcpiTable *desc,GArray *array); + +/** +* acpi_table_end: +* sets actual table length and tells bios loader +* where table is for the later initialization on +* guest side. +* @linker: reference to BIOSLinker object to use for the table +* @table: ACPI table descriptor that was used with @acpi_table_begin +* counterpart +*/ +void acpi_table_end (BIOSLinker *linker,AcpiTable *table); + void build_header(BIOSLinker *linker, GArray *table_data, AcpiTableHeader *h, const char *sig, int len, uint8_t rev,
hw/acpi/aml-build.c +62 -0
74 lines not on this page · raw message
Signature · 1 line
2.27.0
Re: [PATCH v4 01/35] acpi: add helper routines to initialize ACPI tables
Quoted 12 lines · Igor Mammedov
Patch introduces acpi_table_begin()/
acpi_table_end()API that hides pointer/offset arithmetic from user as opposed tobuild_header(), to prevent errors caused by it [1].
acpi_table_begin():
initializes table header and keeps track of table data/offsets
acpi_table_end():
sets actual table length and tells bios loader where table is for the later initialization on guest side.
Quoted 6 lines
1) commits
bb9feea43179x86: acpi: use offset instead of pointer when usingbuild_header()4d027afeb3a9Virt: ACPI: fix qemu assert due to re-assigned table data addressSigned-off-by Igor Mammedov <[email protected]>Reviewed-by Eric Auger <[email protected]>
Quoted 129 lines
---
CC: [email protected]--- include/hw/acpi/aml-build.h | 31 +++++++++++++++++++ hw/acpi/aml-build.c | 62 +++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+)include/hw/acpi/aml-build.h +31
-0@@ -413,6 +413,37 @@ Aml *aml_concatenate(Aml *source1, Aml *source2, Aml *target);Aml *aml_object_type (Aml *object);void build_append_int_noprefix (GArray *table,uint64_t value,int size); + +typedef struct AcpiTable { +const char *sig; +const uint8_t rev; +const char *oem_id; +const char *oem_table_id; +/* private vars tracking table state */ +GArray *array; +unsigned table_offset; +}AcpiTable ; + +/** +* acpi_table_begin: +* initializes table header and keeps track of +* table data/offsets +* @desc: ACPI table descriptor +* @array: blob where the ACPI table will be composed/stored. +*/ +void acpi_table_begin (AcpiTable *desc,GArray *array); + +/** +* acpi_table_end: +* sets actual table length and tells bios loader +* where table is for the later initialization on +* guest side. +* @linker: reference to BIOSLinker object to use for the table +* @table: ACPI table descriptor that was used with @acpi_table_begin +* counterpart +*/ +void acpi_table_end (BIOSLinker *linker,AcpiTable *table); + void build_header(BIOSLinker *linker, GArray *table_data, AcpiTableHeader *h, const char *sig, int len, uint8_t rev,hw/acpi/aml-build.c +62
-0@@ -52,6 +52,19 @@ static void build_append_byte(GArray *array, uint8_t val)g_array_append_val (array, val); } +static void build_append_padded_str (GArray *array,const char *str, +size_t maxlen,char pad) +{ +size_t i; +size_t len =strlen (str); + +g_assert (len <= maxlen); +g_array_append_vals (array, str, len); +for (i = maxlen - len; i >0 ; i--) { +g_array_append_val (array, pad); + } +} +static void build_append_array (GArray *array,GArray *val) {g_array_append_vals (array, val->data, val->len);@@ -1692,6 +1705,55 @@ Aml *aml_object_type(Aml *object)return var; } +void acpi_table_begin (AcpiTable *desc,GArray *array) +{ + + desc->array = array; + desc->table_offset = array->len; + +/* +* ACPI spec 1.0b +* 5.2.3 System Description Table Header +*/ +g_assert (strlen (desc->sig) ==4 ); +g_array_append_vals (array, desc->sig,4 );/* Signature */ +/* +* reserve space for Length field, which will be patched by +* acpi_table_end() when the table creation is finished. +*/ +build_append_int_noprefix (array,0 ,4 );/* Length */ +build_append_int_noprefix (array, desc->rev,1 );/* Revision */ +build_append_int_noprefix (array,0 ,1 );/* Checksum */ +build_append_padded_str (array, desc->oem_id,6 ,' ' );/* OEMID */ +/* OEM Table ID */ +build_append_padded_str (array, desc->oem_table_id,8 ,' ' ); +build_append_int_noprefix (array,1 ,4 );/* OEM Revision */ +g_array_append_vals (array,ACPI_BUILD_APPNAME8 ,4 );/* Creator ID */ +build_append_int_noprefix (array,1 ,4 );/* Creator Revision */ +} + +void acpi_table_end (BIOSLinker *linker,AcpiTable *desc) +{ +/* +* ACPI spec 1.0b +* 5.2.3 System Description Table Header +* Table 5-2 DESCRIPTION_HEADER Fields +*/ +const unsigned checksum_offset =9 ; +uint32_t table_len = desc->array->len - desc->table_offset; +uint32_t table_len_le =cpu_to_le32 (table_len); +gchar *len_ptr = &desc->array->data[desc->table_offset +4 ]; + +/* patch "Length" field that has been reserved by acpi_table_begin() +* to the actual length, i.e. accumulated table length from +* acpi_table_begin() till acpi_table_end() +*/ +memcpy (len_ptr, &table_len_le,sizeof table_len_le); + +bios_linker_loader_add_checksum (linker,ACPI_BUILD_TABLE_FILE , + desc->table_offset, table_len, desc->table_offset + checksum_offset); +} + void build_header(BIOSLinker *linker, GArray *table_data, AcpiTableHeader *h, const char *sig, int len, uint8_t rev,
Re: [PATCH v4 01/35] acpi: add helper routines to initialize ACPI tables
In reply to Igor MammedovHi,
Quoted 137 lines · Igor Mammedov
Patch introduces acpi_table_begin()/
acpi_table_end()API that hides pointer/offset arithmetic from user as opposed tobuild_header(), to prevent errors caused by it [1].
acpi_table_begin():
initializes table header and keeps track of table data/offsets
acpi_table_end():
sets actual table length and tells bios loader where table is for the later initialization on guest side.1) commits
bb9feea43179x86: acpi: use offset instead of pointer when usingbuild_header()4d027afeb3a9Virt: ACPI: fix qemu assert due to re-assigned table data addressSigned-off-by Igor Mammedov <[email protected]>Reviewed-by Eric Auger <[email protected]>---
CC: [email protected]--- include/hw/acpi/aml-build.h | 31 +++++++++++++++++++ hw/acpi/aml-build.c | 62 +++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+)include/hw/acpi/aml-build.h +31
-0@@ -413,6 +413,37 @@ Aml *aml_concatenate(Aml *source1, Aml *source2, Aml *target);Aml *aml_object_type (Aml *object);void build_append_int_noprefix (GArray *table,uint64_t value,int size); + +typedef struct AcpiTable { +const char *sig; +const uint8_t rev; +const char *oem_id; +const char *oem_table_id; +/* private vars tracking table state */ +GArray *array; +unsigned table_offset; +}AcpiTable ; + +/** +* acpi_table_begin: +* initializes table header and keeps track of +* table data/offsets +* @desc: ACPI table descriptor +* @array: blob where the ACPI table will be composed/stored. +*/ +void acpi_table_begin (AcpiTable *desc,GArray *array); + +/** +* acpi_table_end: +* sets actual table length and tells bios loader +* where table is for the later initialization on +* guest side. +* @linker: reference to BIOSLinker object to use for the table +* @table: ACPI table descriptor that was used with @acpi_table_begin +* counterpart +*/ +void acpi_table_end (BIOSLinker *linker,AcpiTable *table); + void build_header(BIOSLinker *linker, GArray *table_data, AcpiTableHeader *h, const char *sig, int len, uint8_t rev,hw/acpi/aml-build.c +55
-0@@ -52,6 +52,19 @@ static void build_append_byte(GArray *array, uint8_t val)g_array_append_val (array, val); } +static void build_append_padded_str (GArray *array,const char *str, +size_t maxlen,char pad) +{ +size_t i; +size_t len =strlen (str); + +g_assert (len <= maxlen); +g_array_append_vals (array, str, len); +for (i = maxlen - len; i >0 ; i--) { +g_array_append_val (array, pad); + } +} +static void build_append_array (GArray *array,GArray *val) {g_array_append_vals (array, val->data, val->len);@@ -1692,6 +1705,55 @@ Aml *aml_object_type(Aml *object)return var; } +void acpi_table_begin (AcpiTable *desc,GArray *array) +{ + + desc->array = array; + desc->table_offset = array->len; + +/* +* ACPI spec 1.0b +* 5.2.3 System Description Table Header +*/ +g_assert (strlen (desc->sig) ==4 ); +g_array_append_vals (array, desc->sig,4 );/* Signature */ +/* +* reserve space for Length field, which will be patched by +* acpi_table_end() when the table creation is finished. +*/ +build_append_int_noprefix (array,0 ,4 );/* Length */ +build_append_int_noprefix (array, desc->rev,1 );/* Revision */ +build_append_int_noprefix (array,0 ,1 );/* Checksum */ +build_append_padded_str (array, desc->oem_id,6 ,' ' );/* OEMID */ +/* OEM Table ID */ +build_append_padded_str (array, desc->oem_table_id,8 ,' ' ); +build_append_int_noprefix (array,1 ,4 );/* OEM Revision */ +g_array_append_vals (array,ACPI_BUILD_APPNAME8 ,4 );/* Creator ID */ +build_append_int_noprefix (array,1 ,4 );/* Creator Revision */ +} + +void acpi_table_end (BIOSLinker *linker,AcpiTable *desc) +{ +/* +* ACPI spec 1.0b +* 5.2.3 System Description Table Header +* Table 5-2 DESCRIPTION_HEADER Fields +*/ +const unsigned checksum_offset =9 ; +uint32_t table_len = desc->array->len - desc->table_offset; +uint32_t table_len_le =cpu_to_le32 (table_len); +gchar *len_ptr = &desc->array->data[desc->table_offset +4 ]; + +/* patch "Length" field that has been reserved by acpi_table_begin() +* to the actual length, i.e. accumulated table length from +* acpi_table_begin() till acpi_table_end()
hw/acpi/aml-build.c Aml *aml_object_type(Aml *object) · line 1759
Quoted 10 lines
hw/acpi/aml-build.c +7
-0+*/ +memcpy (len_ptr, &table_len_le,sizeof table_len_le); + +bios_linker_loader_add_checksum (linker,ACPI_BUILD_TABLE_FILE , + desc->table_offset, table_len, desc->table_offset + checksum_offset); +} + void build_header(BIOSLinker *linker, GArray *table_data, AcpiTableHeader *h, const char *sig, int len, uint8_t rev,
I have rewrote the ACPI PPTT table generation patches based on this series, and the testing output of PPTT was as expected. So for the functionality of the APIs:
Thanks,
Yanan
.
PATCH v4 2/35 acpi: build_rsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offests magic from API user.
While at it switch to build_append_int_noprefix() to build entries to other tables (which also removes some manual offset calculations).
---
v4:
* add expected doc comment above build_rsdt()
(Eric Auger <[email protected]>)
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- include/hw/acpi/acpi-defs.h | 10 ---------- hw/acpi/aml-build.c | 31 +++++++++++++++---------------- 2 files changed, 15 insertions(+), 26 deletions(-)
include/hw/acpi/acpi-defs.h +0 -10
@@ -149,16 +149,6 @@ struct AcpiSerialPortConsoleRedirection {typedef struct AcpiSerialPortConsoleRedirection AcpiSerialPortConsoleRedirection ; -/* -* ACPI 1.0 Root System Description Table (RSDT) -*/ -struct AcpiRsdtDescriptorRev1 { -ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint32_t table_offset_entry[]; /* Array of pointers to other */ -/* ACPI tables */ -}QEMU_PACKED ; -typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1 ; -/* * ACPI 2.0 eXtended System Description Table (XSDT) */
hw/acpi/aml-build.c +15 -16
@@ -1884,33 +1884,32 @@ build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData *rsdp_data) 32); } -/* Build rsdt table */ +/* +* ACPI 1.0 Root System Description Table (RSDT) +*/ void build_rsdt (GArray *table_data,BIOSLinker *linker,GArray *table_offsets,const char *oem_id,const char *oem_table_id) {int i; -unsigned rsdt_entries_offset; -AcpiRsdtDescriptorRev1 *rsdt; -int rsdt_start = table_data->len; -const unsigned table_data_len = (sizeof (uint32_t ) * table_offsets->len); -const unsigned rsdt_entry_size =sizeof (rsdt->table_offset_entry[0 ]); -const size_t rsdt_len =sizeof (*rsdt) + table_data_len; - - rsdt =acpi_data_push (table_data, rsdt_len); - rsdt_entries_offset = (char *)rsdt->table_offset_entry - table_data->data; +AcpiTable table = { .sig ="RSDT" , .rev =1 , + .oem_id = oem_id, .oem_table_id = oem_table_id }; + +acpi_table_begin (&table, table_data);for (i =0 ; i < table_offsets->len; ++i) {uint32_t ref_tbl_offset =g_array_index (table_offsets, uint32_t, i); -uint32_t rsdt_entry_offset = rsdt_entries_offset + rsdt_entry_size * i; +uint32_t rsdt_entry_offset = table.array->len; -/* rsdt->table_offset_entry to be filled by Guest linker */ +/* reserve space for entry */ +build_append_int_noprefix (table.array,0 ,4 ); + +/* mark position of RSDT entry to be filled by Guest linker */ bios_linker_loader_add_pointer (linker, -ACPI_BUILD_TABLE_FILE , rsdt_entry_offset, rsdt_entry_size, +ACPI_BUILD_TABLE_FILE , rsdt_entry_offset,4 ,ACPI_BUILD_TABLE_FILE , ref_tbl_offset); + } -build_header (linker, table_data, - (void *)(table_data->data + rsdt_start), -"RSDT" , rsdt_len,1 , oem_id, oem_table_id); +acpi_table_end (linker, &table); }/* Build xsdt table */
Signature · 1 line
2.27.0
PATCH v4 3/35 acpi: build_xsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
While at it switch to build_append_int_noprefix() to build entries to other tables (which also removes some manual offset calculations).
---
v4:
* add expected doc comment above build_xsdt()
(Eric Auger <[email protected]>)
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- include/hw/acpi/acpi-defs.h | 10 ---------- hw/acpi/aml-build.c | 31 +++++++++++++++---------------- 2 files changed, 15 insertions(+), 26 deletions(-)
include/hw/acpi/acpi-defs.h +0 -10
@@ -149,16 +149,6 @@ struct AcpiSerialPortConsoleRedirection {typedef struct AcpiSerialPortConsoleRedirection AcpiSerialPortConsoleRedirection ; -/* -* ACPI 2.0 eXtended System Description Table (XSDT) -*/ -struct AcpiXsdtDescriptorRev2 { -ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint64_t table_offset_entry[]; /* Array of pointers to other */ -/* ACPI tables */ -}QEMU_PACKED ; -typedef struct AcpiXsdtDescriptorRev2 AcpiXsdtDescriptorRev2 ; -/* * ACPI 1.0 Firmware ACPI Control Structure (FACS) */
hw/acpi/aml-build.c +15 -16
@@ -1912,33 +1912,32 @@ build_rsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets,acpi_table_end (linker, &table); } -/* Build xsdt table */ +/* +* ACPI 2.0 eXtended System Description Table (XSDT) +*/ void build_xsdt (GArray *table_data,BIOSLinker *linker,GArray *table_offsets,const char *oem_id,const char *oem_table_id) {int i; -unsigned xsdt_entries_offset; -AcpiXsdtDescriptorRev2 *xsdt; -int xsdt_start = table_data->len; -const unsigned table_data_len = (sizeof (uint64_t ) * table_offsets->len); -const unsigned xsdt_entry_size =sizeof (xsdt->table_offset_entry[0 ]); -const size_t xsdt_len =sizeof (*xsdt) + table_data_len; - - xsdt =acpi_data_push (table_data, xsdt_len); - xsdt_entries_offset = (char *)xsdt->table_offset_entry - table_data->data; +AcpiTable table = { .sig ="XSDT" , .rev =1 , + .oem_id = oem_id, .oem_table_id = oem_table_id }; + +acpi_table_begin (&table, table_data); +for (i =0 ; i < table_offsets->len; ++i) {uint64_t ref_tbl_offset =g_array_index (table_offsets, uint32_t, i); -uint64_t xsdt_entry_offset = xsdt_entries_offset + xsdt_entry_size * i; +uint64_t xsdt_entry_offset = table.array->len; -/* xsdt->table_offset_entry to be filled by Guest linker */ +/* reserve space for entry */ +build_append_int_noprefix (table.array,0 ,8 ); + +/* mark position of RSDT entry to be filled by Guest linker */ bios_linker_loader_add_pointer (linker, -ACPI_BUILD_TABLE_FILE , xsdt_entry_offset, xsdt_entry_size, +ACPI_BUILD_TABLE_FILE , xsdt_entry_offset,8 ,ACPI_BUILD_TABLE_FILE , ref_tbl_offset); } -build_header (linker, table_data, - (void *)(table_data->data + xsdt_start), -"XSDT" , xsdt_len,1 , oem_id, oem_table_id); +acpi_table_end (linker, &table); } void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base,
Signature · 1 line
2.27.0
PATCH v4 4/35 acpi: build_slit: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/acpi/aml-build.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
hw/acpi/aml-build.c +5 -8
@@ -1958,11 +1958,12 @@ void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base,void build_slit (GArray *table_data,BIOSLinker *linker,MachineState *ms,const char *oem_id,const char *oem_table_id) { -int slit_start, i, j; - slit_start = table_data->len; +int i, j;int nb_numa_nodes = ms->numa_state->num_nodes; +AcpiTable table = { .sig ="SLIT" , .rev =1 , + .oem_id = oem_id, .oem_table_id = oem_table_id }; -acpi_data_push (table_data,sizeof (AcpiTableHeader)); +acpi_table_begin (&table, table_data);build_append_int_noprefix (table_data, nb_numa_nodes,8 );for (i =0 ; i < nb_numa_nodes; i++) {
@@ -1973,11 +1974,7 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms, 1); } } - -build_header (linker, table_data, - (void *)(table_data->data + slit_start), -"SLIT" , - table_data->len - slit_start,1 , oem_id, oem_table_id); +acpi_table_end (linker, &table); }/* build rev1/rev3/rev5.1 FADT */
Signature · 1 line
2.27.0
PATCH v4 5/35 acpi: build_fadt: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/acpi/aml-build.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
hw/acpi/aml-build.c +7 -7
@@ -1982,9 +1982,10 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, const char *oem_id, const char *oem_table_id) { int off; -int fadt_start = tbl->len; +AcpiTable table = { .sig ="FACP" , .rev = f->rev, + .oem_id = oem_id, .oem_table_id = oem_table_id }; -acpi_data_push (tbl,sizeof (AcpiTableHeader)); +acpi_table_begin (&table, tbl);/* FACS address to be filled by Guest linker at runtime */ off = tbl->len;
@@ -2048,7 +2049,7 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,build_append_int_noprefix (tbl, f->flags,4 );/* Flags */ if (f->rev ==1 ) { - goto build_hdr; + goto done; }build_append_gas_from_struct (tbl, &f->reset_reg);/* RESET_REG */
@@ -2085,7 +2086,7 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,build_append_gas (tbl,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,0 );/* X_GPE1_BLK */ if (f->rev <=4 ) { - goto build_hdr; + goto done; }/* SLEEP_CONTROL_REG */
@@ -2096,9 +2097,8 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,/* 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); +done: +acpi_table_end (linker, &table); }#ifdef CONFIG_TPM
Signature · 1 line
2.27.0
PATCH v4 6/35 acpi: build_tpm2: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/acpi/aml-build.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
hw/acpi/aml-build.c +5 -6
@@ -2111,13 +2111,14 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog, const char *oem_id, const char *oem_table_id) { uint8_t start_method_params[12] = {}; -unsigned log_addr_offset, tpm2_start; +unsigned log_addr_offset;uint64_t control_area_start_address;TPMIf *tpmif =tpm_find ();uint32_t start_method; +AcpiTable table = { .sig ="TPM2" , .rev =4 , + .oem_id = oem_id, .oem_table_id = oem_table_id }; - tpm2_start = table_data->len; -acpi_data_push (table_data,sizeof (AcpiTableHeader)); +acpi_table_begin (&table, table_data);/* Platform Class */ build_append_int_noprefix (table_data,TPM2_ACPI_CLASS_CLIENT ,2 );
@@ -2155,9 +2156,7 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog,bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , log_addr_offset,8 ,ACPI_BUILD_TPMLOG_FILE ,0 ); -build_header (linker, table_data, - (void *)(table_data->data + tpm2_start), - "TPM2", table_data->len - tpm2_start, 4, oem_id, oem_table_id); + acpi_table_end(linker, &table); }#endif
Signature · 1 line
2.27.0
PATCH v4 7/35 acpi: acpi_build_hest: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/acpi/ghes.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
hw/acpi/ghes.c +4 -6
@@ -362,18 +362,16 @@ static void build_ghes_v2(GArray *table_data, int source_id, BIOSLinker *linker)void acpi_build_hest (GArray *table_data,BIOSLinker *linker,const char *oem_id,const char *oem_table_id) { -uint64_t hest_start = table_data->len; +AcpiTable table = { .sig ="HEST" , .rev =1 , + .oem_id = oem_id, .oem_table_id = oem_table_id }; -/* Hardware Error Source Table header*/ -acpi_data_push (table_data,sizeof (AcpiTableHeader)); +acpi_table_begin (&table, table_data);/* Error Source Count */ build_append_int_noprefix (table_data,ACPI_GHES_ERROR_SOURCE_COUNT ,4 ); -build_ghes_v2 (table_data,ACPI_HEST_SRC_ID_SEA , linker); -build_header (linker, table_data, (void *)(table_data->data + hest_start), -"HEST" , table_data->len - hest_start,1 , oem_id, oem_table_id); +acpi_table_end (linker, &table); } void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgState *s,
Signature · 1 line
2.27.0
PATCH v4 8/35 acpi: build_mcfg: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/acpi/pci.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
hw/acpi/pci.c +9 -9
@@ -28,19 +28,20 @@#include "hw/acpi/pci.h" #include "hw/pci/pcie_host.h" +/* +* PCI Firmware Specification, Revision 3.0 +* 4.1.2 MCFG Table Description. +*/ void build_mcfg (GArray *table_data,BIOSLinker *linker,AcpiMcfgInfo *info,const char *oem_id,const char *oem_table_id) { -int mcfg_start = table_data->len; +AcpiTable table = { .sig ="MCFG" , .rev =1 , + .oem_id = oem_id, .oem_table_id = oem_table_id }; + +acpi_table_begin (&table, table_data); -/* -* PCI Firmware Specification, Revision 3.0 -* 4.1.2 MCFG Table Description. -*/ -acpi_data_push (table_data,sizeof (AcpiTableHeader));/* Reserved */ build_append_int_noprefix (table_data,0 ,8 ); -/* * Memory Mapped Enhanced Configuration Space Base Address Allocation * Structure
@@ -56,6 +57,5 @@ void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info,/* Reserved */ build_append_int_noprefix (table_data,0 ,4 ); -build_header (linker, table_data, (void *)(table_data->data + mcfg_start), -"MCFG" , table_data->len - mcfg_start,1 , oem_id, oem_table_id); +acpi_table_end (linker, &table); }
Signature · 1 line
2.27.0
PATCH v4 9/35 acpi: build_hmat: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
Also since acpi_table_begin() reserves space only for standard header while previous acpi_data_push() reserved the header + 4 bytes field, add 4 bytes 'Reserved' field into hmat_build_table_structs() which didn have it.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/acpi/hmat.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
hw/acpi/hmat.c +6 -8
@@ -200,6 +200,8 @@ static void hmat_build_table_structs(GArray *table_data, NumaState *numa_state)HMAT_LB_Info *hmat_lb;NumaHmatCacheOptions *hmat_cache; +build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ +for (i =0 ; i < numa_state->num_nodes; i++) { flags =0 ;
@@ -256,14 +258,10 @@ static void hmat_build_table_structs(GArray *table_data, NumaState *numa_state)void build_hmat (GArray *table_data,BIOSLinker *linker,NumaState *numa_state,const char *oem_id,const char *oem_table_id) { -int hmat_start = table_data->len; - -/* reserve space for HMAT header */ -acpi_data_push (table_data,40 ); +AcpiTable table = { .sig ="HMAT" , .rev =2 , + .oem_id = oem_id, .oem_table_id = oem_table_id }; +acpi_table_begin (&table, table_data);hmat_build_table_structs (table_data, numa_state); - -build_header (linker, table_data, - (void *)(table_data->data + hmat_start), -"HMAT" , table_data->len - hmat_start,2 , oem_id, oem_table_id); +acpi_table_end (linker, &table); }
Signature · 1 line
2.27.0
PATCH v4 10/35 acpi: nvdimm_build_nfit: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
Also since acpi_table_begin() reserves space only for standard header while previous acpi_data_push() reserved the header + 4 bytes field, add 4 bytes 'Reserved' field into nvdimm_build_nfit() which didn't have it.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/acpi/nvdimm.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-)
hw/acpi/nvdimm.c +17 -25
@@ -44,22 +44,6 @@ static const uint8_t nvdimm_nfit_spa_uuid[] =UUID_LE (0x66f0d379 ,0xb4f3 ,0x4074 ,0xac ,0x43 ,0x0d ,0x33 ,0x18 ,0xb7 ,0x8c ,0xdb ); -/* -* NVDIMM Firmware Interface Table -* @signature: "NFIT" -* -* It provides information that allows OSPM to enumerate NVDIMM present in -* the platform and associate system physical address ranges created by the -* NVDIMMs. -* -* It is defined in ACPI 6.0: 5.2.25 NVDIMM Firmware Interface Table (NFIT) -*/ -struct NvdimmNfitHeader { -ACPI_TABLE_HEADER_DEF - uint32_t reserved; -}QEMU_PACKED ; -typedef struct NvdimmNfitHeader NvdimmNfitHeader ; -/* * define NFIT structures according to ACPI 6.0: 5.2.25 NVDIMM Firmware * Interface Table (NFIT).
@@ -401,25 +385,33 @@ void nvdimm_plug(NVDIMMState *state)nvdimm_build_fit_buffer (state); } +/* +* NVDIMM Firmware Interface Table +* @signature: "NFIT" +* +* It provides information that allows OSPM to enumerate NVDIMM present in +* the platform and associate system physical address ranges created by the +* NVDIMMs. +* +* It is defined in ACPI 6.0: 5.2.25 NVDIMM Firmware Interface Table (NFIT) +*/ +static void nvdimm_build_nfit (NVDIMMState *state,GArray *table_offsets,GArray *table_data,BIOSLinker *linker,const char *oem_id,const char *oem_table_id) {NvdimmFitBuffer *fit_buf = &state->fit_buf; -unsigned int header; +AcpiTable table = { .sig ="NFIT" , .rev =1 , + .oem_id = oem_id, .oem_table_id = oem_table_id };acpi_add_table (table_offsets, table_data); -/* NFIT header. */ - header = table_data->len; -acpi_data_push (table_data,sizeof (NvdimmNfitHeader)); +acpi_table_begin (&table, table_data); +/* Reserved */ +build_append_int_noprefix (table_data,0 ,4 );/* NVDIMM device structures. */ g_array_append_vals (table_data, fit_buf->fit->data, fit_buf->fit->len); - -build_header (linker, table_data, - (void *)(table_data->data + header),"NFIT" , -sizeof (NvdimmNfitHeader) + fit_buf->fit->len,1 , oem_id, - oem_table_id); +acpi_table_end (linker, &table); }#define NVDIMM_DSM_MEMORY_SIZE 4096
Signature · 1 line
2.27.0
PATCH v4 11/35 acpi: nvdimm_build_ssdt: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v4:
* s/acpi_table_composed/acpi_table_end/
(Reviewed-by: Eric Auger <[email protected]>)
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/acpi/nvdimm.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
hw/acpi/nvdimm.c +10 -8
@@ -1274,14 +1274,15 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,NVDIMMState *nvdimm_state, uint32_t ram_slots, const char *oem_id) { + int mem_addr_offset;Aml *ssdt, *sb_scope, *dev; -int mem_addr_offset, nvdimm_ssdt; +AcpiTable table = { .sig ="SSDT" , .rev =1 , + .oem_id = oem_id, .oem_table_id ="NVDIMM" };acpi_add_table (table_offsets, table_data); +acpi_table_begin (&table, table_data); ssdt =init_aml_allocator (); -acpi_data_push (ssdt->buf,sizeof (AcpiTableHeader)); - sb_scope =aml_scope ("\\_SB" ); dev =aml_device ("NVDR" );
@@ -1310,8 +1311,6 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,aml_append (sb_scope, dev);aml_append (ssdt, sb_scope); - nvdimm_ssdt = table_data->len; -/* copy AML table into ACPI tables blob and patch header there */ g_array_append_vals (table_data, ssdt->buf->data, ssdt->buf->len); mem_addr_offset = build_append_named_dword(table_data,
@@ -1323,10 +1322,13 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , mem_addr_offset,sizeof (uint32_t ),NVDIMM_DSM_MEM_FILE ,0 ); -build_header (linker, table_data, - (void *)(table_data->data + nvdimm_ssdt), -"SSDT" , table_data->len - nvdimm_ssdt,1 , oem_id,"NVDIMM" );free_aml_allocator (); +/* +* must be executed as the last so that pointer patching command above +* would be executed by guest before it recalculated checksum which were +* scheduled by acpi_table_end() +*/ +acpi_table_end (linker, &table); }void nvdimm_build_srat (GArray *table_data)
Signature · 1 line
2.27.0
PATCH v4 12/35 acpi: vmgenid_build_acpi: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v4:
* drop not related "vgia_offset = table_data->len" newline change (Reviewed-by: Eric Auger <[email protected]>)
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/acpi/vmgenid.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
hw/acpi/vmgenid.c +6 -7
@@ -29,6 +29,8 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid,Aml *ssdt, *dev, *scope, *method, *addr, *if_ctx;uint32_t vgia_offset;QemuUUID guid_le; +AcpiTable table = { .sig ="SSDT" , .rev =1 , + .oem_id = oem_id, .oem_table_id ="VMGENID" };/* Fill in the GUID values. These need to be converted to little-endian * first, since that's what the guest expects
@@ -42,12 +44,10 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid,g_array_insert_vals (guid,VMGENID_GUID_OFFSET , guid_le.data,ARRAY_SIZE (guid_le.data)); -/* Put this in a separate SSDT table */ +/* Put VMGNEID into a separate SSDT table */ +acpi_table_begin (&table, table_data); ssdt =init_aml_allocator (); -/* Reserve space for header */ -acpi_data_push (ssdt->buf,sizeof (AcpiTableHeader)); -/* Storage for the GUID address */ vgia_offset = table_data->len +build_append_named_dword (ssdt->buf,"VGIA" );
@@ -116,9 +116,8 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid,ACPI_BUILD_TABLE_FILE , vgia_offset,sizeof (uint32_t ), VMGENID_GUID_FW_CFG_FILE, 0); -build_header (linker, table_data, - (void *)(table_data->data + table_data->len - ssdt->buf->len), -"SSDT" , ssdt->buf->len,1 , oem_id,"VMGENID" ); +/* must be called after above command to ensure correct table checksum */ +acpi_table_end (linker, &table);free_aml_allocator (); }
Signature · 1 line
2.27.0
PATCH v4 13/35 acpi: x86: build_dsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/i386/acpi-build.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
hw/i386/acpi-build.c +4 -6
@@ -1405,12 +1405,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,#endif int i;VMBusBridge *vmbus_bridge =vmbus_bridge_find (); +AcpiTable table = { .sig ="DSDT" , .rev =1 , .oem_id = x86ms->oem_id, + .oem_table_id = x86ms->oem_table_id }; +acpi_table_begin (&table, table_data); dsdt =init_aml_allocator (); -/* Reserve space for header */ -acpi_data_push (dsdt->buf,sizeof (AcpiTableHeader)); -build_dbg_aml (dsdt);if (misc->is_piix4) { sb_scope =aml_scope ("_SB" );
@@ -1845,9 +1845,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,/* copy AML table into ACPI tables blob and patch header there */ g_array_append_vals (table_data, dsdt->buf->data, dsdt->buf->len); -build_header (linker, table_data, - (void *)(table_data->data + table_data->len - dsdt->buf->len), -"DSDT" , dsdt->buf->len,1 , x86ms->oem_id, x86ms->oem_table_id); +acpi_table_end (linker, &table);free_aml_allocator (); }
Signature · 1 line
2.27.0
PATCH v4 14/35 acpi: build_hpet: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
while at it convert build_hpet() to endian agnostic build_append_FOO() API
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- include/hw/acpi/acpi-defs.h | 13 ------------- hw/i386/acpi-build.c | 26 ++++++++++++++++++-------- 2 files changed, 18 insertions(+), 21 deletions(-)
include/hw/acpi/acpi-defs.h +0 -13
@@ -358,19 +358,6 @@ struct AcpiGenericTimerTable { }QEMU_PACKED ;typedef struct AcpiGenericTimerTable AcpiGenericTimerTable ; -/* -* HPET Description Table -*/ -struct Acpi20Hpet { -ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint32_t timer_block_id; -struct AcpiGenericAddress addr; -uint8_t hpet_number; -uint16_t min_tick; -uint8_t page_protect; -}QEMU_PACKED ; -typedef struct Acpi20Hpet Acpi20Hpet ; -/* * SRAT (NUMA topology description) table */
hw/i386/acpi-build.c +18 -8
@@ -1849,22 +1849,32 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,free_aml_allocator (); } +/* +* IA-PC HPET (High Precision Event Timers) Specification (Revision: 1.0a) +* 3.2.4The ACPI 2.0 HPET Description Table (HPET) +*/ static void build_hpet (GArray *table_data,BIOSLinker *linker,const char *oem_id,const char *oem_table_id) { -Acpi20Hpet *hpet; -int hpet_start = table_data->len; +AcpiTable table = { .sig ="HPET" , .rev =1 , + .oem_id = oem_id, .oem_table_id = oem_table_id }; - hpet =acpi_data_push (table_data,sizeof (*hpet)); +acpi_table_begin (&table, table_data);/* Note timer_block_id value must be kept in sync with value advertised by * emulated hpet */ - hpet->timer_block_id =cpu_to_le32 (0x8086a201 ); - hpet->addr.address =cpu_to_le64 (HPET_BASE ); -build_header (linker, table_data, - (void *)(table_data->data + hpet_start), -"HPET" ,sizeof (*hpet),1 , oem_id, oem_table_id); +/* Event Timer Block ID */ +build_append_int_noprefix (table_data,0x8086a201 ,4 ); +/* BASE_ADDRESS */ +build_append_gas (table_data,AML_AS_SYSTEM_MEMORY ,0 ,0 ,0 ,HPET_BASE ); +/* HPET Number */ +build_append_int_noprefix (table_data,0 ,1 ); +/* Main Counter Minimum Clock_tick in Periodic Mode */ +build_append_int_noprefix (table_data,0 ,2 ); +/* Page Protection And OEM Attribute */ +build_append_int_noprefix (table_data,0 ,1 ); +acpi_table_end (linker, &table); }#ifdef CONFIG_TPM
Signature · 1 line
2.27.0
PATCH v4 15/35 acpi: build_tpm_tcpa: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
While at it switch to build_append_int_noprefix() to build table entries (which also removes some manual offset calculations).
---
v2:
* fix assert when starting QEMU with TPM 1.2
Stefan Berger <[email protected]>
v3:
* fix invalid checksum, by putting acpi_table_composed() after pointer patching
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- include/hw/acpi/acpi-defs.h | 14 -------------- hw/i386/acpi-build.c | 38 ++++++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 29 deletions(-)
include/hw/acpi/acpi-defs.h +0 -14
@@ -418,20 +418,6 @@ struct AcpiSratProcessorGiccAffinity {typedef struct AcpiSratProcessorGiccAffinity AcpiSratProcessorGiccAffinity ; -/* -* TCPA Description Table -* -* Following Level 00, Rev 00.37 of specs: -* http://www.trustedcomputinggroup.org/resources/tcg_acpi_specification -*/ -struct Acpi20Tcpa { -ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint16_t platform_class; -uint32_t log_area_minimum_length; -uint64_t log_area_start_address; -}QEMU_PACKED ; -typedef struct Acpi20Tcpa Acpi20Tcpa ; -/* DMAR - DMA Remapping table r2.2 */ struct AcpiTableDmar {ACPI_TABLE_HEADER_DEF
hw/i386/acpi-build.c +23 -15
@@ -1878,31 +1878,39 @@ build_hpet(GArray *table_data, BIOSLinker *linker, const char *oem_id, }#ifdef CONFIG_TPM +/* +* TCPA Description Table +* +* Following Level 00, Rev 00.37 of specs: +* http://www.trustedcomputinggroup.org/resources/tcg_acpi_specification +* 7.1.2 ACPI Table Layout +*/ static void build_tpm_tcpa (GArray *table_data,BIOSLinker *linker,GArray *tcpalog,const char *oem_id,const char *oem_table_id) { -int tcpa_start = table_data->len; -Acpi20Tcpa *tcpa =acpi_data_push (table_data,sizeof *tcpa); -unsigned log_addr_size =sizeof (tcpa->log_area_start_address); -unsigned log_addr_offset = - (char *)&tcpa->log_area_start_address - table_data->data; +unsigned log_addr_offset; +AcpiTable table = { .sig ="TCPA" , .rev =2 , + .oem_id = oem_id, .oem_table_id = oem_table_id }; - tcpa->platform_class =cpu_to_le16 (TPM_TCPA_ACPI_CLASS_CLIENT ); - tcpa->log_area_minimum_length =cpu_to_le32 (TPM_LOG_AREA_MINIMUM_SIZE ); -acpi_data_push (tcpalog,le32_to_cpu (tcpa->log_area_minimum_length)); +acpi_table_begin (&table, table_data); +/* Platform Class */ +build_append_int_noprefix (table_data,TPM_TCPA_ACPI_CLASS_CLIENT ,2 ); +/* Log Area Minimum Length (LAML) */ +build_append_int_noprefix (table_data,TPM_LOG_AREA_MINIMUM_SIZE ,4 ); +/* Log Area Start Address (LASA) */ + log_addr_offset = table_data->len; +build_append_int_noprefix (table_data,0 ,8 ); +/* allocate/reserve space for TPM log area */ +acpi_data_push (tcpalog,TPM_LOG_AREA_MINIMUM_SIZE );bios_linker_loader_alloc (linker,ACPI_BUILD_TPMLOG_FILE , tcpalog,1 , false/* high memory */ ); -/* log area start address to be filled by Guest linker */ -bios_linker_loader_add_pointer (linker, -ACPI_BUILD_TABLE_FILE , log_addr_offset, log_addr_size, -ACPI_BUILD_TPMLOG_FILE ,0 ); +bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , + log_addr_offset,8 ,ACPI_BUILD_TPMLOG_FILE ,0 ); -build_header (linker, table_data, - (void *)(table_data->data + tcpa_start), -"TCPA" ,sizeof (*tcpa),2 , oem_id, oem_table_id); +acpi_table_end (linker, &table); }#endif
Signature · 1 line
2.27.0
Re: [PATCH v4 15/35] acpi: build_tpm_tcpa: use acpi_table_begin()/acpi_table_end() instead of build_header()
Quoted 10 lines · Igor Mammedov
it replaces error-prone pointer arithmetic for
build_header()API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.While at it switch to
build_append_int_noprefix()to build table entries (which also removes some manual offset calculations).Signed-off-by Igor Mammedov <[email protected]>Reviewed-by Eric Auger <[email protected]>
Quoted 99 lines
---
v2:
* fix assert when starting QEMU with TPM 1.2
Stefan Berger <[email protected]>
v3:
* fix invalid checksum, by puttingacpi_table_composed()after pointer patching
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/--- include/hw/acpi/acpi-defs.h | 14 -------------- hw/i386/acpi-build.c | 38 ++++++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 29 deletions(-)include/hw/acpi/acpi-defs.h +0
-14@@ -418,20 +418,6 @@ struct AcpiSratProcessorGiccAffinity {typedef struct AcpiSratProcessorGiccAffinity AcpiSratProcessorGiccAffinity ; -/* -* TCPA Description Table -* -* Following Level 00, Rev 00.37 of specs: -* http://www.trustedcomputinggroup.org/resources/tcg_acpi_specification -*/ -struct Acpi20Tcpa { -ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint16_t platform_class; -uint32_t log_area_minimum_length; -uint64_t log_area_start_address; -}QEMU_PACKED ; -typedef struct Acpi20Tcpa Acpi20Tcpa ; -/* DMAR - DMA Remapping table r2.2 */ struct AcpiTableDmar {ACPI_TABLE_HEADER_DEF hw/i386/acpi-build.c +23
-15@@ -1878,31 +1878,39 @@ build_hpet(GArray *table_data, BIOSLinker *linker, const char *oem_id, }#ifdef CONFIG_TPM +/* +* TCPA Description Table +* +* Following Level 00, Rev 00.37 of specs: +* http://www.trustedcomputinggroup.org/resources/tcg_acpi_specification +* 7.1.2 ACPI Table Layout +*/ static void build_tpm_tcpa (GArray *table_data,BIOSLinker *linker,GArray *tcpalog,const char *oem_id,const char *oem_table_id) { -int tcpa_start = table_data->len; -Acpi20Tcpa *tcpa =acpi_data_push (table_data,sizeof *tcpa); -unsigned log_addr_size =sizeof (tcpa->log_area_start_address); -unsigned log_addr_offset = - (char *)&tcpa->log_area_start_address - table_data->data; +unsigned log_addr_offset; +AcpiTable table = { .sig ="TCPA" , .rev =2 , + .oem_id = oem_id, .oem_table_id = oem_table_id }; - tcpa->platform_class =cpu_to_le16 (TPM_TCPA_ACPI_CLASS_CLIENT ); - tcpa->log_area_minimum_length =cpu_to_le32 (TPM_LOG_AREA_MINIMUM_SIZE ); -acpi_data_push (tcpalog,le32_to_cpu (tcpa->log_area_minimum_length)); +acpi_table_begin (&table, table_data); +/* Platform Class */ +build_append_int_noprefix (table_data,TPM_TCPA_ACPI_CLASS_CLIENT ,2 ); +/* Log Area Minimum Length (LAML) */ +build_append_int_noprefix (table_data,TPM_LOG_AREA_MINIMUM_SIZE ,4 ); +/* Log Area Start Address (LASA) */ + log_addr_offset = table_data->len; +build_append_int_noprefix (table_data,0 ,8 ); +/* allocate/reserve space for TPM log area */ +acpi_data_push (tcpalog,TPM_LOG_AREA_MINIMUM_SIZE );bios_linker_loader_alloc (linker,ACPI_BUILD_TPMLOG_FILE , tcpalog,1 , false/* high memory */ ); -/* log area start address to be filled by Guest linker */ -bios_linker_loader_add_pointer (linker, -ACPI_BUILD_TABLE_FILE , log_addr_offset, log_addr_size, -ACPI_BUILD_TPMLOG_FILE ,0 ); +bios_linker_loader_add_pointer (linker,ACPI_BUILD_TABLE_FILE , + log_addr_offset,8 ,ACPI_BUILD_TPMLOG_FILE ,0 ); -build_header (linker, table_data, - (void *)(table_data->data + tcpa_start), -"TCPA" ,sizeof (*tcpa),2 , oem_id, oem_table_id); +acpi_table_end (linker, &table); }#endif
PATCH v4 16/35 acpi: arm/x86: build_srat: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
While at it switch to build_append_int_noprefix() to build table entries (which also removes some manual offset calculations)
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- include/hw/acpi/acpi-defs.h | 11 ----------- hw/arm/virt-acpi-build.c | 15 +++++++-------- hw/i386/acpi-build.c | 18 +++++++----------- 3 files changed, 14 insertions(+), 30 deletions(-)
include/hw/acpi/acpi-defs.h +0 -11
@@ -358,17 +358,6 @@ struct AcpiGenericTimerTable { }QEMU_PACKED ;typedef struct AcpiGenericTimerTable AcpiGenericTimerTable ; -/* -* SRAT (NUMA topology description) table -*/ - -struct AcpiSystemResourceAffinityTable { -ACPI_TABLE_HEADER_DEF - uint32_t reserved1; -uint32_t reserved2[2 ]; -}QEMU_PACKED ; -typedef struct AcpiSystemResourceAffinityTable AcpiSystemResourceAffinityTable ; -#define ACPI_SRAT_PROCESSOR_APIC 0#define ACPI_SRAT_MEMORY 1#define ACPI_SRAT_PROCESSOR_x2APIC 2
hw/arm/virt-acpi-build.c +7 -8
@@ -477,18 +477,19 @@ build_spcr(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)static void build_srat (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms) { -AcpiSystemResourceAffinityTable *srat;AcpiSratProcessorGiccAffinity *core;AcpiSratMemoryAffinity *numamem; -int i, srat_start; +int i;uint64_t mem_base;MachineClass *mc =MACHINE_GET_CLASS (vms);MachineState *ms =MACHINE (vms);const CPUArchIdList *cpu_list = mc->possible_cpu_arch_ids (ms); +AcpiTable table = { .sig ="SRAT" , .rev =3 , .oem_id = vms->oem_id, + .oem_table_id = vms->oem_table_id }; - srat_start = table_data->len; - srat =acpi_data_push (table_data,sizeof (*srat)); - srat->reserved1 =cpu_to_le32 (1 ); +acpi_table_begin (&table, table_data); +build_append_int_noprefix (table_data,1 ,4 );/* Reserved */ +build_append_int_noprefix (table_data,0 ,8 );/* Reserved */ for (i =0 ; i < cpu_list->len; ++i) { core =acpi_data_push (table_data,sizeof (*core));
@@ -522,9 +523,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED); } -build_header (linker, table_data, (void *)(table_data->data + srat_start), -"SRAT" , table_data->len - srat_start,3 , vms->oem_id, - vms->oem_table_id); +acpi_table_end (linker, &table); }/* GTDT */
hw/i386/acpi-build.c +7 -11
@@ -1920,11 +1920,10 @@ build_tpm_tcpa(GArray *table_data, BIOSLinker *linker, GArray *tcpalog,static void build_srat (GArray *table_data,BIOSLinker *linker,MachineState *machine) { -AcpiSystemResourceAffinityTable *srat;AcpiSratMemoryAffinity *numamem;int i; -int srat_start, numa_start, slots; +int numa_start, slots;uint64_t mem_len, mem_base, next_base;MachineClass *mc =MACHINE_GET_CLASS (machine);X86MachineState *x86ms =X86_MACHINE (machine);
@@ -1935,11 +1934,12 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)ram_addr_t hotpluggable_address_space_size =object_property_get_int (OBJECT (pcms),PC_MACHINE_DEVMEM_REGION_SIZE ,NULL ); +AcpiTable table = { .sig ="SRAT" , .rev =1 , .oem_id = x86ms->oem_id, + .oem_table_id = x86ms->oem_table_id }; - srat_start = table_data->len; - - srat =acpi_data_push (table_data,sizeof *srat); - srat->reserved1 =cpu_to_le32 (1 ); +acpi_table_begin (&table, table_data); +build_append_int_noprefix (table_data,1 ,4 );/* Reserved */ +build_append_int_noprefix (table_data,0 ,8 );/* Reserved */ for (i =0 ; i < apic_ids->len; i++) {int node_id = apic_ids->cpus[i].props.node_id;
@@ -2045,11 +2045,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED); } -build_header (linker, table_data, - (void *)(table_data->data + srat_start), -"SRAT" , - table_data->len - srat_start,1 , x86ms->oem_id, - x86ms->oem_table_id); +acpi_table_end (linker, &table); }/*
Signature · 1 line
2.27.0
PATCH v4 17/35 acpi: use build_append_int_noprefix() API to compose SRAT table
In reply to Igor MammedovDrop usage of packed structures and explicit endian conversions when building SRAT tables for arm/x86 and use endian agnostic build_append_int_noprefix() API to build it.
---
v4:
* rebase on top of (4be8bfcb4d hw/i386/acpi-build: Fix a typo)
v3:
* rebase on top of (e77af21a7a2 hw/i386/acpi-build: Get NUMA information from struct NumaState)
--- include/hw/acpi/acpi-defs.h | 49 ----------------------- include/hw/acpi/aml-build.h | 2 +- hw/acpi/aml-build.c | 24 ++++++++---- hw/acpi/nvdimm.c | 4 +- hw/arm/virt-acpi-build.c | 29 ++++++++------ hw/i386/acpi-build.c | 78 +++++++++++++++++++++---------------- 6 files changed, 80 insertions(+), 106 deletions(-)
include/hw/acpi/acpi-defs.h +0 -49
@@ -358,55 +358,6 @@ struct AcpiGenericTimerTable { }QEMU_PACKED ;typedef struct AcpiGenericTimerTable AcpiGenericTimerTable ; -#define ACPI_SRAT_PROCESSOR_APIC 0 -#define ACPI_SRAT_MEMORY 1 -#define ACPI_SRAT_PROCESSOR_x2APIC 2 -#define ACPI_SRAT_PROCESSOR_GICC 3 - -struct AcpiSratProcessorAffinity { -ACPI_SUB_HEADER_DEF - uint8_t proximity_lo; -uint8_t local_apic_id; -uint32_t flags; -uint8_t local_sapic_eid; -uint8_t proximity_hi[3 ]; -uint32_t reserved; -}QEMU_PACKED ; -typedef struct AcpiSratProcessorAffinity AcpiSratProcessorAffinity ; - -struct AcpiSratProcessorX2ApicAffinity { -ACPI_SUB_HEADER_DEF - uint16_t reserved; -uint32_t proximity_domain; -uint32_t x2apic_id; -uint32_t flags; -uint32_t clk_domain; -uint32_t reserved2; -}QEMU_PACKED ; -typedef struct AcpiSratProcessorX2ApicAffinity AcpiSratProcessorX2ApicAffinity ; - -struct AcpiSratMemoryAffinity { -ACPI_SUB_HEADER_DEF - uint32_t proximity; -uint16_t reserved1; -uint64_t base_addr; -uint64_t range_length; -uint32_t reserved2; -uint32_t flags; -uint32_t reserved3[2 ]; -}QEMU_PACKED ; -typedef struct AcpiSratMemoryAffinity AcpiSratMemoryAffinity ; - -struct AcpiSratProcessorGiccAffinity { -ACPI_SUB_HEADER_DEF - uint32_t proximity; -uint32_t acpi_processor_uid; -uint32_t flags; -uint32_t clock_domain; -}QEMU_PACKED ; - -typedef struct AcpiSratProcessorGiccAffinity AcpiSratProcessorGiccAffinity ; -/* DMAR - DMA Remapping table r2.2 */ struct AcpiTableDmar {ACPI_TABLE_HEADER_DEF
include/hw/acpi/aml-build.h +1 -1
@@ -487,7 +487,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_offset, uint32_t mmio32_offset, uint64_t mmio64_offset, uint16_t bus_nr_offset); -void build_srat_memory (AcpiSratMemoryAffinity *numamem,uint64_t base, +void build_srat_memory (GArray *table_data,uint64_t base,uint64_t len,int node,MemoryAffinityFlags flags); void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms,
hw/acpi/aml-build.c +17 -7
@@ -1940,15 +1940,25 @@ build_xsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets,acpi_table_end (linker, &table); } -void build_srat_memory (AcpiSratMemoryAffinity *numamem,uint64_t base, +/* +* ACPI spec, Revision 4.0 +* 5.2.16.2 Memory Affinity Structure +*/ +void build_srat_memory (GArray *table_data,uint64_t base,uint64_t len,int node,MemoryAffinityFlags flags) { - numamem->type =ACPI_SRAT_MEMORY ; - numamem->length =sizeof (*numamem); - numamem->proximity =cpu_to_le32 (node); - numamem->flags =cpu_to_le32 (flags); - numamem->base_addr =cpu_to_le64 (base); - numamem->range_length =cpu_to_le64 (len); +build_append_int_noprefix (table_data,1 ,1 );/* Type */ +build_append_int_noprefix (table_data,40 ,1 );/* Length */ +build_append_int_noprefix (table_data, node,4 );/* Proximity Domain */ +build_append_int_noprefix (table_data,0 ,2 );/* Reserved */ +build_append_int_noprefix (table_data, base,4 );/* Base Address Low */ +/* Base Address High */ +build_append_int_noprefix (table_data, base >>32 ,4 ); +build_append_int_noprefix (table_data, len,4 );/* Length Low */ +build_append_int_noprefix (table_data, len >>32 ,4 );/* Length High */ +build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ +build_append_int_noprefix (table_data, flags,4 );/* Flags */ +build_append_int_noprefix (table_data,0 ,8 );/* Reserved */ }/*
hw/acpi/nvdimm.c +1 -3
@@ -1336,7 +1336,6 @@ void nvdimm_build_srat(GArray *table_data)GSList *device_list =nvdimm_get_device_list ();for (; device_list; device_list = device_list->next) { -AcpiSratMemoryAffinity *numamem =NULL ;DeviceState *dev = device_list->data;Object *obj =OBJECT (dev);uint64_t addr, size;
@@ -1346,8 +1345,7 @@ void nvdimm_build_srat(GArray *table_data) addr =object_property_get_uint (obj,PC_DIMM_ADDR_PROP , &error_abort); size =object_property_get_uint (obj,PC_DIMM_SIZE_PROP , &error_abort); - numamem =acpi_data_push (table_data,sizeof *numamem); -build_srat_memory (numamem, addr, size, node, +build_srat_memory (table_data, addr, size, node,MEM_AFFINITY_ENABLED |MEM_AFFINITY_NON_VOLATILE ); }g_slist_free (device_list);
hw/arm/virt-acpi-build.c +17 -12
@@ -474,11 +474,13 @@ build_spcr(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) vms->oem_table_id); } +/* +* ACPI spec, Revision 5.1 +* 5.2.16 System Resource Affinity Table (SRAT) +*/ static void build_srat (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms) { -AcpiSratProcessorGiccAffinity *core; -AcpiSratMemoryAffinity *numamem;int i;uint64_t mem_base;MachineClass *mc =MACHINE_GET_CLASS (vms);
@@ -492,19 +494,23 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_append_int_noprefix (table_data,0 ,8 );/* Reserved */ for (i =0 ; i < cpu_list->len; ++i) { - core =acpi_data_push (table_data,sizeof (*core)); - core->type =ACPI_SRAT_PROCESSOR_GICC ; - core->length =sizeof (*core); - core->proximity =cpu_to_le32 (cpu_list->cpus[i].props.node_id); - core->acpi_processor_uid =cpu_to_le32 (i); - core->flags =cpu_to_le32 (1 ); +uint32_t nodeid = cpu_list->cpus[i].props.node_id; +/* +* 5.2.16.4 GICC Affinity Structure +*/ +build_append_int_noprefix (table_data,3 ,1 );/* Type */ +build_append_int_noprefix (table_data,18 ,1 );/* Length */ +build_append_int_noprefix (table_data, nodeid,4 );/* Proximity Domain */ +build_append_int_noprefix (table_data, i,4 );/* ACPI Processor UID */ +/* Flags, Table 5-76 */ +build_append_int_noprefix (table_data,1 /* Enabled */ ,4 ); +build_append_int_noprefix (table_data,0 ,4 );/* Clock Domain */ } mem_base = vms->memmap[VIRT_MEM ].base;for (i =0 ; i < ms->numa_state->num_nodes; ++i) {if (ms->numa_state->nodes[i].node_mem >0 ) { - numamem =acpi_data_push (table_data,sizeof (*numamem)); -build_srat_memory (numamem, mem_base, +build_srat_memory (table_data, mem_base, ms->numa_state->nodes[i].node_mem, i,MEM_AFFINITY_ENABLED ); mem_base += ms->numa_state->nodes[i].node_mem;
@@ -516,8 +522,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }if (ms->device_memory) { - numamem =acpi_data_push (table_data,sizeof *numamem); -build_srat_memory (numamem, ms->device_memory->base, +build_srat_memory (table_data, ms->device_memory->base,memory_region_size (&ms->device_memory->mr), ms->numa_state->num_nodes -1 ,MEM_AFFINITY_HOTPLUGGABLE |MEM_AFFINITY_ENABLED );
hw/i386/acpi-build.c +44 -34
133 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v4 18/35 acpi: build_dmar_q35: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
While at it switch to build_append_int_noprefix() to build table entries tables.
---
v4:
* drop unrelated assert(iommu) move
(Reviewed-by: Eric Auger <[email protected]>)
v3:
- rebase on top 26863366b29 (hw/i386/acpi-build: Add DMAR support to bypass iommu)
- s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- include/hw/acpi/acpi-defs.h | 68 ----------------------------- hw/i386/acpi-build.c | 87 ++++++++++++++++++++----------------- 2 files changed, 48 insertions(+), 107 deletions(-)
include/hw/acpi/acpi-defs.h +0 -68
@@ -358,74 +358,6 @@ struct AcpiGenericTimerTable { }QEMU_PACKED ;typedef struct AcpiGenericTimerTable AcpiGenericTimerTable ; -/* DMAR - DMA Remapping table r2.2 */ -struct AcpiTableDmar { -ACPI_TABLE_HEADER_DEF - uint8_t host_address_width; /* Maximum DMA physical addressability */ -uint8_t flags; -uint8_t reserved[10 ]; -}QEMU_PACKED ; -typedef struct AcpiTableDmar AcpiTableDmar ; - -/* Masks for Flags field above */ -#define ACPI_DMAR_INTR_REMAP 1 -#define ACPI_DMAR_X2APIC_OPT_OUT (1 << 1) - -/* Values for sub-structure type for DMAR */ -enum { -ACPI_DMAR_TYPE_HARDWARE_UNIT =0 ,/* DRHD */ -ACPI_DMAR_TYPE_RESERVED_MEMORY =1 ,/* RMRR */ -ACPI_DMAR_TYPE_ATSR =2 ,/* ATSR */ -ACPI_DMAR_TYPE_HARDWARE_AFFINITY =3 ,/* RHSR */ -ACPI_DMAR_TYPE_ANDD =4 ,/* ANDD */ -ACPI_DMAR_TYPE_RESERVED =5 /* Reserved for furture use */ -}; - -/* -* Sub-structures for DMAR -*/ - -/* Device scope structure for DRHD. */ -struct AcpiDmarDeviceScope { -uint8_t entry_type; -uint8_t length; -uint16_t reserved; -uint8_t enumeration_id; -uint8_t bus; -struct { -uint8_t device; -uint8_t function; - } path[]; -}QEMU_PACKED ; -typedef struct AcpiDmarDeviceScope AcpiDmarDeviceScope ; - -/* Type 0: Hardware Unit Definition */ -struct AcpiDmarHardwareUnit { -uint16_t type; -uint16_t length; -uint8_t flags; -uint8_t reserved; -uint16_t pci_segment;/* The PCI Segment associated with this unit */ -uint64_t address;/* Base address of remapping hardware register-set */ -AcpiDmarDeviceScope scope[]; -}QEMU_PACKED ; -typedef struct AcpiDmarHardwareUnit AcpiDmarHardwareUnit ; - -/* Type 2: Root Port ATS Capability Reporting Structure */ -struct AcpiDmarRootPortATS { -uint16_t type; -uint16_t length; -uint8_t flags; -uint8_t reserved; -uint16_t pci_segment; -AcpiDmarDeviceScope scope[]; -}QEMU_PACKED ; -typedef struct AcpiDmarRootPortATS AcpiDmarRootPortATS ; - -/* Masks for Flags field above */ -#define ACPI_DMAR_INCLUDE_PCI_ALL 1 -#define ACPI_DMAR_ATSR_ALL_PORTS 1 -/* * Input Output Remapping Table (IORT) * Conforms to "IO Remapping Table System Software on ARM Platforms",
hw/i386/acpi-build.c +48 -39
133 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v4 19/35 acpi: build_waet: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/i386/acpi-build.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
hw/i386/acpi-build.c +4 -6
@@ -2201,10 +2201,10 @@ static void build_waet(GArray *table_data, BIOSLinker *linker, const char *oem_id, const char *oem_table_id) { -int waet_start = table_data->len; +AcpiTable table = { .sig ="WAET" , .rev =1 , .oem_id = oem_id, + .oem_table_id = oem_table_id }; -/* WAET header */ -acpi_data_push (table_data,sizeof (AcpiTableHeader)); +acpi_table_begin (&table, table_data);/* * Set "ACPI PM timer good" flag. *
@@ -2213,9 +2213,7 @@ build_waet(GArray *table_data, BIOSLinker *linker, const char *oem_id,* Which avoids costly VMExits caused by guest re-reading it unnecessarily. */ build_append_int_noprefix (table_data,1 <<1 /* ACPI PM timer good */ ,4 ); - -build_header (linker, table_data, (void *)(table_data->data + waet_start), -"WAET" , table_data->len - waet_start,1 , oem_id, oem_table_id); +acpi_table_end (linker, &table); }/*
Signature · 1 line
2.27.0
PATCH v4 20/35 acpi: build_amd_iommu: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/i386/acpi-build.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
hw/i386/acpi-build.c +4 -7
@@ -2319,12 +2319,12 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, const char *oem_table_id) {int ivhd_table_len =24 ; -int iommu_start = table_data->len;AMDVIState *s =AMD_IOMMU_DEVICE (x86_iommu_get_default ());GArray *ivhd_blob =g_array_new (false, true,1 ); +AcpiTable table = { .sig ="IVRS" , .rev =1 , .oem_id = oem_id, + .oem_table_id = oem_table_id }; -/* IVRS header */ -acpi_data_push (table_data,sizeof (AcpiTableHeader)); +acpi_table_begin (&table, table_data);/* IVinfo - IO virtualization information common to all * IOMMU units in a system */
@@ -2409,10 +2409,7 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,0x48 ,/* special device */ 8); } - -build_header (linker, table_data, (void *)(table_data->data + iommu_start), -"IVRS" , table_data->len - iommu_start,1 , oem_id, - oem_table_id); +acpi_table_end (linker, &table); } typedef
Signature · 1 line
2.27.0
PATCH v4 21/35 acpi: madt: arm/x86: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- include/hw/acpi/acpi-defs.h | 9 --------- hw/arm/virt-acpi-build.c | 19 +++++++++++-------- hw/i386/acpi-common.c | 19 +++++++++++-------- 3 files changed, 22 insertions(+), 25 deletions(-)
include/hw/acpi/acpi-defs.h +0 -9
@@ -176,15 +176,6 @@ typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1;#define ACPI_DUAL_PIC 0#define ACPI_MULTIPLE_APIC 1 -/* Master MADT */ - -struct AcpiMultipleApicTable { -ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint32_t local_apic_address; /* Physical address of local APIC */ -uint32_t flags; -}QEMU_PACKED ; -typedef struct AcpiMultipleApicTable AcpiMultipleApicTable ; -/* Values for Type in APIC sub-headers */ #define ACPI_APIC_PROCESSOR 0
hw/arm/virt-acpi-build.c +11 -8
@@ -567,19 +567,26 @@ build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) vms->oem_table_id); } -/* MADT */ +/* +* ACPI spec, Revision 5.0 +* 5.2.12 Multiple APIC Description Table (MADT) +*/ static void build_madt (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms) {VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms); -int madt_start = table_data->len;const MemMapEntry *memmap = vms->memmap;const int *irqmap = vms->irqmap;AcpiMadtGenericDistributor *gicd;AcpiMadtGenericMsiFrame *gic_msi;int i; +AcpiTable table = { .sig ="APIC" , .rev =3 , .oem_id = vms->oem_id, + .oem_table_id = vms->oem_table_id }; -acpi_data_push (table_data,sizeof (AcpiMultipleApicTable)); +acpi_table_begin (&table, table_data); +/* Local Interrupt Controller Address */ +build_append_int_noprefix (table_data,0 ,4 ); +build_append_int_noprefix (table_data,0 ,4 );/* Flags */ gicd =acpi_data_push (table_data,sizeof *gicd); gicd->type =ACPI_APIC_GENERIC_DISTRIBUTOR ;
@@ -650,11 +657,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) gic_msi->spi_count =cpu_to_le16 (NUM_GICV2M_SPIS ); gic_msi->spi_base =cpu_to_le16 (irqmap[VIRT_GIC_V2M ] +ARM_SPI_BASE ); } - -build_header (linker, table_data, - (void *)(table_data->data + madt_start),"APIC" , - table_data->len - madt_start,3 , vms->oem_id, - vms->oem_table_id); +acpi_table_end (linker, &table); }/* FADT */
hw/i386/acpi-common.c +11 -8
@@ -71,24 +71,29 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, } } +/* +* ACPI spec, Revision 1.0b +* 5.2.8 Multiple APIC Description Table +*/ void acpi_build_madt (GArray *table_data,BIOSLinker *linker,X86MachineState *x86ms,AcpiDeviceIf *adev,const char *oem_id,const char *oem_table_id) {MachineClass *mc =MACHINE_GET_CLASS (x86ms);const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids (MACHINE (x86ms)); -int madt_start = table_data->len;AcpiDeviceIfClass *adevc =ACPI_DEVICE_IF_GET_CLASS (adev);bool x2apic_mode = false; -AcpiMultipleApicTable *madt;AcpiMadtIoApic *io_apic;AcpiMadtIntsrcovr *intsrcovr;int i; +AcpiTable table = { .sig ="APIC" , .rev =1 , .oem_id = oem_id, + .oem_table_id = oem_table_id }; - madt =acpi_data_push (table_data,sizeof *madt); - madt->local_apic_address =cpu_to_le32 (APIC_DEFAULT_ADDRESS ); - madt->flags =cpu_to_le32 (1 ); +acpi_table_begin (&table, table_data); +/* Local APIC Address */ +build_append_int_noprefix (table_data,APIC_DEFAULT_ADDRESS ,4 ); +build_append_int_noprefix (table_data,1 /* PCAT_COMPAT */ ,4 );/* Flags */ for (i =0 ; i < apic_ids->len; i++) { adevc->madt_cpu (adev, i, apic_ids, table_data);
@@ -156,8 +161,6 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker, local_nmi->lint =1 ;/* ACPI_LINT1 */ } -build_header (linker, table_data, - (void *)(table_data->data + madt_start),"APIC" , - table_data->len - madt_start,1 , oem_id, oem_table_id); +acpi_table_end (linker, &table); }
Signature · 1 line
2.27.0
PATCH v4 22/35 acpi: x86: remove dead code
In reply to Igor Mammedov--- include/hw/acpi/acpi-defs.h | 13 ------------- 1 file changed, 13 deletions(-)
include/hw/acpi/acpi-defs.h +0 -13
@@ -163,19 +163,6 @@ struct AcpiFacsDescriptorRev1 { }QEMU_PACKED ;typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1 ; -/* -* Differentiated System Description Table (DSDT) -*/ - -/* -* MADT values and structures -*/ - -/* Values for MADT PCATCompat */ - -#define ACPI_DUAL_PIC 0 -#define ACPI_MULTIPLE_APIC 1 -/* Values for Type in APIC sub-headers */ #define ACPI_APIC_PROCESSOR 0
Signature · 1 line
2.27.0
PATCH v4 23/35 acpi: x86: set enabled when composing _MAT entries
In reply to Igor MammedovInstead of composing disabled _MAT entry and then later on patching it to enabled for hotpluggbale CPUs in DSDT, set it to enabled at the time _MAT entry is built.
It will allow to drop usage of packed structures in following patches when build_madt() is switched to use build_append_int_noprefix() API.
---
CC: [email protected]
--- include/hw/acpi/acpi_dev_interface.h | 3 ++- include/hw/i386/pc.h | 6 +++--- hw/acpi/acpi-x86-stub.c | 3 ++- hw/acpi/cpu.c | 17 ++--------------- hw/i386/acpi-common.c | 18 ++++++------------ 5 files changed, 15 insertions(+), 32 deletions(-)
include/hw/acpi/acpi_dev_interface.h +2 -1
@@ -53,6 +53,7 @@ struct AcpiDeviceIfClass {void (*ospm_status)(AcpiDeviceIf *adev,ACPIOSTInfoList ***list);void (*send_event)(AcpiDeviceIf *adev,AcpiEventStatusBits ev);void (*madt_cpu)(AcpiDeviceIf *adev,int uid, - const CPUArchIdList *apic_ids, GArray *entry); +const CPUArchIdList *apic_ids,GArray *entry, + bool force_enabled); };#endif
include/hw/i386/pc.h +3 -3
@@ -187,10 +187,10 @@ bool pc_system_ovmf_table_find(const char *entry, uint8_t **data, int *data_len);void pc_system_parse_ovmf_flash (uint8_t *flash_ptr,size_t flash_size); - -/* acpi-build.c */ +/* hw/i386/acpi-common.c */ void pc_madt_cpu_entry (AcpiDeviceIf *adev,int uid, -const CPUArchIdList *apic_ids,GArray *entry); +const CPUArchIdList *apic_ids,GArray *entry, +bool force_enabled);extern GlobalProperty pc_compat_6_1[];extern const size_t pc_compat_6_1_len;
hw/acpi/acpi-x86-stub.c +2 -1
@@ -3,7 +3,8 @@#include "hw/i386/acpi-build.h" void pc_madt_cpu_entry (AcpiDeviceIf *adev,int uid, -const CPUArchIdList *apic_ids,GArray *entry) +const CPUArchIdList *apic_ids,GArray *entry, +bool force_enabled) { }
hw/acpi/cpu.c +2 -15
@@ -669,21 +669,8 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,/* build _MAT object */ assert (adevc && adevc->madt_cpu); - adevc->madt_cpu (adev, i, arch_ids, madt_buf); -switch (madt_buf->data[0 ]) { -case ACPI_APIC_PROCESSOR : { -AcpiMadtProcessorApic *apic = (void *)madt_buf->data; - apic->flags =cpu_to_le32 (1 ); -break ; - } -case ACPI_APIC_LOCAL_X2APIC : { -AcpiMadtProcessorX2Apic *apic = (void *)madt_buf->data; - apic->flags =cpu_to_le32 (1 ); -break ; - } -default : -assert (0 ); - } + adevc->madt_cpu (adev, i, arch_ids, madt_buf, + true);/* set enabled flag */ aml_append (dev,aml_name_decl ("_MAT" ,aml_buffer (madt_buf->len, (uint8_t *)madt_buf->data)));g_array_free (madt_buf, true);
hw/i386/acpi-common.c +6 -12
@@ -34,9 +34,11 @@#include "acpi-common.h" void pc_madt_cpu_entry (AcpiDeviceIf *adev,int uid, -const CPUArchIdList *apic_ids,GArray *entry) +const CPUArchIdList *apic_ids,GArray *entry, +bool force_enabled) {uint32_t apic_id = apic_ids->cpus[uid].arch_id; +uint32_t flags = apic_ids->cpus[uid].cpu !=NULL || force_enabled ?1 :0 ;/* ACPI spec says that LAPIC entry for non present * CPU may be omitted from MADT or it must be marked
@@ -51,11 +53,7 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, apic->length =sizeof (*apic); apic->processor_id = uid; apic->local_apic_id = apic_id; -if (apic_ids->cpus[uid].cpu !=NULL ) { - apic->flags =cpu_to_le32 (1 ); - }else { - apic->flags =cpu_to_le32 (0 ); - } + apic->flags =cpu_to_le32 (flags); }else {AcpiMadtProcessorX2Apic *apic =acpi_data_push (entry,sizeof *apic);
@@ -63,11 +61,7 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, apic->length =sizeof (*apic); apic->uid =cpu_to_le32 (uid); apic->x2apic_id =cpu_to_le32 (apic_id); -if (apic_ids->cpus[uid].cpu !=NULL ) { - apic->flags =cpu_to_le32 (1 ); - }else { - apic->flags =cpu_to_le32 (0 ); - } + apic->flags =cpu_to_le32 (flags); } }
@@ -96,7 +90,7 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,build_append_int_noprefix (table_data,1 /* PCAT_COMPAT */ ,4 );/* Flags */ for (i =0 ; i < apic_ids->len; i++) { - adevc->madt_cpu (adev, i, apic_ids, table_data); + adevc->madt_cpu (adev, i, apic_ids, table_data, false);if (apic_ids->cpus[i].arch_id >254 ) { x2apic_mode = true; }
Signature · 1 line
2.27.0
PATCH v4 24/35 acpi: x86: madt: use build_append_int_noprefix() API to compose MADT table
In reply to Igor MammedovDrop usage of packed structures and explicit endian conversions when building MADT table for arm/x86 and use endian agnostic build_append_int_noprefix() API to build it.
---
v4:
* fixup doc comments
(Eric Auger <[email protected]>)
--- include/hw/acpi/acpi-defs.h | 64 ------------------ hw/i386/acpi-common.c | 129 +++++++++++++++++++----------------- 2 files changed, 67 insertions(+), 126 deletions(-)
include/hw/acpi/acpi-defs.h +0 -64
@@ -165,17 +165,6 @@ typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1;/* Values for Type in APIC sub-headers */ -#define ACPI_APIC_PROCESSOR 0 -#define ACPI_APIC_IO 1 -#define ACPI_APIC_XRUPT_OVERRIDE 2 -#define ACPI_APIC_NMI 3 -#define ACPI_APIC_LOCAL_NMI 4 -#define ACPI_APIC_ADDRESS_OVERRIDE 5 -#define ACPI_APIC_IO_SAPIC 6 -#define ACPI_APIC_LOCAL_SAPIC 7 -#define ACPI_APIC_XRUPT_SOURCE 8 -#define ACPI_APIC_LOCAL_X2APIC 9 -#define ACPI_APIC_LOCAL_X2APIC_NMI 10#define ACPI_APIC_GENERIC_CPU_INTERFACE 11#define ACPI_APIC_GENERIC_DISTRIBUTOR 12#define ACPI_APIC_GENERIC_MSI_FRAME 13
@@ -192,59 +181,6 @@ typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1;/* Sub-structures for MADT */ -struct AcpiMadtProcessorApic { -ACPI_SUB_HEADER_DEF - uint8_t processor_id; /* ACPI processor id */ -uint8_t local_apic_id;/* Processor's local APIC id */ -uint32_t flags; -}QEMU_PACKED ; -typedef struct AcpiMadtProcessorApic AcpiMadtProcessorApic ; - -struct AcpiMadtIoApic { -ACPI_SUB_HEADER_DEF - uint8_t io_apic_id; /* I/O APIC ID */ -uint8_t reserved;/* Reserved - must be zero */ -uint32_t address;/* APIC physical address */ -uint32_t interrupt;/* Global system interrupt where INTI -* lines start */ -}QEMU_PACKED ; -typedef struct AcpiMadtIoApic AcpiMadtIoApic ; - -struct AcpiMadtIntsrcovr { -ACPI_SUB_HEADER_DEF - uint8_t bus; -uint8_t source; -uint32_t gsi; -uint16_t flags; -}QEMU_PACKED ; -typedef struct AcpiMadtIntsrcovr AcpiMadtIntsrcovr ; - -struct AcpiMadtLocalNmi { -ACPI_SUB_HEADER_DEF - uint8_t processor_id; /* ACPI processor id */ -uint16_t flags;/* MPS INTI flags */ -uint8_t lint;/* Local APIC LINT# */ -}QEMU_PACKED ; -typedef struct AcpiMadtLocalNmi AcpiMadtLocalNmi ; - -struct AcpiMadtProcessorX2Apic { -ACPI_SUB_HEADER_DEF - uint16_t reserved; -uint32_t x2apic_id;/* Processor's local x2APIC ID */ -uint32_t flags; -uint32_t uid;/* Processor object _UID */ -}QEMU_PACKED ; -typedef struct AcpiMadtProcessorX2Apic AcpiMadtProcessorX2Apic ; - -struct AcpiMadtLocalX2ApicNmi { -ACPI_SUB_HEADER_DEF - uint16_t flags; /* MPS INTI flags */ -uint32_t uid;/* Processor object _UID */ -uint8_t lint;/* Local APIC LINT# */ -uint8_t reserved[3 ];/* Local APIC LINT# */ -}QEMU_PACKED ; -typedef struct AcpiMadtLocalX2ApicNmi AcpiMadtLocalX2ApicNmi ; -struct AcpiMadtGenericCpuInterface {ACPI_SUB_HEADER_DEF uint16_t reserved;
hw/i386/acpi-common.c +67 -62
174 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v4 25/35 acpi: arm/virt: madt: use build_append_int_noprefix() API to compose MADT table
In reply to Igor MammedovDrop usage of packed structures and explicit endian conversions when building MADT table for arm/x86 and use endian agnostic build_append_int_noprefix() API to build it.
---
v2:
* fix invalid ITS length (use v6.0 Errata instead of v60 definition)
--- include/hw/acpi/acpi-defs.h | 84 -------------------- hw/arm/virt-acpi-build.c | 150 +++++++++++++++++++++--------------- 2 files changed, 90 insertions(+), 144 deletions(-)
include/hw/acpi/acpi-defs.h +0 -84
@@ -163,90 +163,6 @@ struct AcpiFacsDescriptorRev1 { }QEMU_PACKED ;typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1 ; -/* Values for Type in APIC sub-headers */ - -#define ACPI_APIC_GENERIC_CPU_INTERFACE 11 -#define ACPI_APIC_GENERIC_DISTRIBUTOR 12 -#define ACPI_APIC_GENERIC_MSI_FRAME 13 -#define ACPI_APIC_GENERIC_REDISTRIBUTOR 14 -#define ACPI_APIC_GENERIC_TRANSLATOR 15 -#define ACPI_APIC_RESERVED 16/* 16 and greater are reserved */ - -/* -* MADT sub-structures (Follow MULTIPLE_APIC_DESCRIPTION_TABLE) -*/ -#define ACPI_SUB_HEADER_DEF /* Common ACPI sub-structure header */ \ - uint8_t type; \ - uint8_t length; - -/* Sub-structures for MADT */ - -struct AcpiMadtGenericCpuInterface { -ACPI_SUB_HEADER_DEF - uint16_t reserved; -uint32_t cpu_interface_number; -uint32_t uid; -uint32_t flags; -uint32_t parking_version; -uint32_t performance_interrupt; -uint64_t parked_address; -uint64_t base_address; -uint64_t gicv_base_address; -uint64_t gich_base_address; -uint32_t vgic_interrupt; -uint64_t gicr_base_address; -uint64_t arm_mpidr; -}QEMU_PACKED ; - -typedef struct AcpiMadtGenericCpuInterface AcpiMadtGenericCpuInterface ; - -/* GICC CPU Interface Flags */ -#define ACPI_MADT_GICC_ENABLED 1 - -struct AcpiMadtGenericDistributor { -ACPI_SUB_HEADER_DEF - uint16_t reserved; -uint32_t gic_id; -uint64_t base_address; -uint32_t global_irq_base; -/* ACPI 5.1 Errata 1228 Present GIC version in MADT table */ -uint8_t version; -uint8_t reserved2[3 ]; -}QEMU_PACKED ; - -typedef struct AcpiMadtGenericDistributor AcpiMadtGenericDistributor ; - -struct AcpiMadtGenericMsiFrame { -ACPI_SUB_HEADER_DEF - uint16_t reserved; -uint32_t gic_msi_frame_id; -uint64_t base_address; -uint32_t flags; -uint16_t spi_count; -uint16_t spi_base; -}QEMU_PACKED ; - -typedef struct AcpiMadtGenericMsiFrame AcpiMadtGenericMsiFrame ; - -struct AcpiMadtGenericRedistributor { -ACPI_SUB_HEADER_DEF - uint16_t reserved; -uint64_t base_address; -uint32_t range_length; -}QEMU_PACKED ; - -typedef struct AcpiMadtGenericRedistributor AcpiMadtGenericRedistributor ; - -struct AcpiMadtGenericTranslator { -ACPI_SUB_HEADER_DEF - uint16_t reserved; -uint32_t translation_id; -uint64_t base_address; -uint32_t reserved2; -}QEMU_PACKED ; - -typedef struct AcpiMadtGenericTranslator AcpiMadtGenericTranslator ; -/* * Generic Timer Description Table (GTDT) */
hw/arm/virt-acpi-build.c +90 -60
184 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v4 26/35 acpi: build_dsdt_microvm: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/i386/acpi-microvm.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
hw/i386/acpi-microvm.c +6 -7
@@ -113,16 +113,16 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker,Aml *dsdt, *sb_scope, *scope, *pkg;bool ambiguous;Object *isabus; +AcpiTable table = { .sig ="DSDT" , .rev =2 , .oem_id = x86ms->oem_id, + .oem_table_id = x86ms->oem_table_id }; isabus =object_resolve_path_type ("" ,TYPE_ISA_BUS , &ambiguous);assert (isabus);assert (!ambiguous); +acpi_table_begin (&table, table_data); dsdt =init_aml_allocator (); -/* Reserve space for header */ -acpi_data_push (dsdt->buf,sizeof (AcpiTableHeader)); - sb_scope =aml_scope ("_SB" );fw_cfg_add_acpi_dsdt (sb_scope, x86ms->fw_cfg);isa_build_aml (ISA_BUS (isabus), sb_scope);
@@ -144,11 +144,10 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker,aml_append (scope,aml_name_decl ("_S5" , pkg));aml_append (dsdt, scope); -/* copy AML table into ACPI tables blob and patch header there */ +/* copy AML bytecode into ACPI tables blob */ g_array_append_vals (table_data, dsdt->buf->data, dsdt->buf->len); -build_header (linker, table_data, - (void *)(table_data->data + table_data->len - dsdt->buf->len), -"DSDT" , dsdt->buf->len,2 , x86ms->oem_id, x86ms->oem_table_id); + +acpi_table_end (linker, &table);free_aml_allocator (); }
Signature · 1 line
2.27.0
PATCH v4 27/35 acpi: arm: virt: build_dsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- hw/arm/virt-acpi-build.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
hw/arm/virt-acpi-build.c +6 -7
@@ -729,10 +729,11 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)MachineState *ms =MACHINE (vms);const MemMapEntry *memmap = vms->memmap;const int *irqmap = vms->irqmap; +AcpiTable table = { .sig ="DSDT" , .rev =2 , .oem_id = vms->oem_id, + .oem_table_id = vms->oem_table_id }; +acpi_table_begin (&table, table_data); dsdt =init_aml_allocator (); -/* Reserve space for header */ -acpi_data_push (dsdt->buf,sizeof (AcpiTableHeader));/* When booting the VM with UEFI, UEFI takes ownership of the RTC hardware. * While UEFI can use libfdt to disable the RTC device node in the DTB that
@@ -779,12 +780,10 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)aml_append (dsdt, scope); -/* copy AML table into ACPI tables blob and patch header there */ +/* copy AML table into ACPI tables blob */ g_array_append_vals (table_data, dsdt->buf->data, dsdt->buf->len); -build_header (linker, table_data, - (void *)(table_data->data + table_data->len - dsdt->buf->len), -"DSDT" , dsdt->buf->len,2 , vms->oem_id, - vms->oem_table_id); + +acpi_table_end (linker, &table);free_aml_allocator (); }
Signature · 1 line
2.27.0
PATCH v4 28/35 acpi: arm: virt: build_iort: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
---
v4:
* drop not related change
(Eric Auger <[email protected]>)
v3:
* fix conflicts due to
42e0f050e3a51 'hw/arm/virt-acpi-build: Add IORT support to bypass SMMUv3'
* * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- include/hw/acpi/acpi-defs.h | 14 ------------ hw/arm/virt-acpi-build.c | 44 +++++++++++++++---------------------- 2 files changed, 18 insertions(+), 40 deletions(-)
include/hw/acpi/acpi-defs.h +0 -14
@@ -188,20 +188,6 @@ struct AcpiGenericTimerTable { }QEMU_PACKED ;typedef struct AcpiGenericTimerTable AcpiGenericTimerTable ; -/* -* Input Output Remapping Table (IORT) -* Conforms to "IO Remapping Table System Software on ARM Platforms", -* Document number: ARM DEN 0049B, October 2015 -*/ - -struct AcpiIortTable { -ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint32_t node_count; -uint32_t node_offset; -uint32_t reserved; -}QEMU_PACKED ; -typedef struct AcpiIortTable AcpiIortTable ; -/* * IORT node types */
hw/arm/virt-acpi-build.c +18 -26
89 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v4 29/35 acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API
In reply to Igor MammedovDrop usage of packed structures and explicit endian conversions when building IORT table use endian agnostic build_append_int_noprefix() API to build it.
---
CC: Eric Auger <[email protected]>
v4:
- (Eric Auger <[email protected]>)
* keep nb_nodes
* encode 'Memory access properties' as separate entries according to Table 13
* keep some comments
v3:
* practically rewritten, due to conflicts wiht bypass iommu feature
--- include/hw/acpi/acpi-defs.h | 71 ---------------- hw/arm/virt-acpi-build.c | 164 ++++++++++++++++++++---------------- 2 files changed, 93 insertions(+), 142 deletions(-)
include/hw/acpi/acpi-defs.h +0 -71
@@ -188,75 +188,4 @@ struct AcpiGenericTimerTable { } QEMU_PACKED;typedef struct AcpiGenericTimerTable AcpiGenericTimerTable ; -/* -* IORT node types -*/ - -#define ACPI_IORT_NODE_HEADER_DEF /* Node format common fields */ \ - uint8_t type; \ - uint16_t length; \ - uint8_t revision; \ - uint32_t reserved; \ - uint32_t mapping_count; \ - uint32_t mapping_offset; - -/* Values for node Type above */ -enum { -ACPI_IORT_NODE_ITS_GROUP =0x00 , -ACPI_IORT_NODE_NAMED_COMPONENT =0x01 , -ACPI_IORT_NODE_PCI_ROOT_COMPLEX =0x02 , -ACPI_IORT_NODE_SMMU =0x03 , -ACPI_IORT_NODE_SMMU_V3 =0x04 -}; - -struct AcpiIortIdMapping { -uint32_t input_base; -uint32_t id_count; -uint32_t output_base; -uint32_t output_reference; -uint32_t flags; -}QEMU_PACKED ; -typedef struct AcpiIortIdMapping AcpiIortIdMapping ; - -struct AcpiIortMemoryAccess { -uint32_t cache_coherency; -uint8_t hints; -uint16_t reserved; -uint8_t memory_flags; -}QEMU_PACKED ; -typedef struct AcpiIortMemoryAccess AcpiIortMemoryAccess ; - -struct AcpiIortItsGroup { -ACPI_IORT_NODE_HEADER_DEF - uint32_t its_count; -uint32_t identifiers[]; -}QEMU_PACKED ; -typedef struct AcpiIortItsGroup AcpiIortItsGroup ; - -#define ACPI_IORT_SMMU_V3_COHACC_OVERRIDE 1 - -struct AcpiIortSmmu3 { -ACPI_IORT_NODE_HEADER_DEF - uint64_t base_address; -uint32_t flags; -uint32_t reserved2; -uint64_t vatos_address; -uint32_t model; -uint32_t event_gsiv; -uint32_t pri_gsiv; -uint32_t gerr_gsiv; -uint32_t sync_gsiv; -AcpiIortIdMapping id_mapping_array[]; -}QEMU_PACKED ; -typedef struct AcpiIortSmmu3 AcpiIortSmmu3 ; - -struct AcpiIortRC { -ACPI_IORT_NODE_HEADER_DEF - AcpiIortMemoryAccess memory_properties; -uint32_t ats_attribute; -uint32_t pci_segment_number; -AcpiIortIdMapping id_mapping_array[]; -}QEMU_PACKED ; -typedef struct AcpiIortRC AcpiIortRC ; -#endif
hw/arm/virt-acpi-build.c +93 -71
216 lines not on this page · raw message
Signature · 1 line
2.27.0
Re: [PATCH v4 29/35] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API
Quoted 273 lines · Igor Mammedov
Drop usage of packed structures and explicit endian conversions when building IORT table use endian agnostic
build_append_int_noprefix()API to build it.Signed-off-by Igor Mammedov <[email protected]>---
CC: Eric Auger <[email protected]>v4:
- (Eric Auger <[email protected]>)
* keepnb_nodes
* encode 'Memory access properties' as separate entries according to Table 13
* keep some comments
v3:
* practically rewritten, due to conflicts wiht bypass iommu featureCC Eric Auger <[email protected]>--- include/hw/acpi/acpi-defs.h | 71 ---------------- hw/arm/virt-acpi-build.c | 164 ++++++++++++++++++++---------------- 2 files changed, 93 insertions(+), 142 deletions(-)include/hw/acpi/acpi-defs.h +0
-71@@ -188,75 +188,4 @@ struct AcpiGenericTimerTable { } QEMU_PACKED;typedef struct AcpiGenericTimerTable AcpiGenericTimerTable ; -/* -* IORT node types -*/ - -#define ACPI_IORT_NODE_HEADER_DEF /* Node format common fields */ \ - uint8_t type; \ - uint16_t length; \ - uint8_t revision; \ - uint32_t reserved; \ - uint32_t mapping_count; \ - uint32_t mapping_offset; - -/* Values for node Type above */ -enum { -ACPI_IORT_NODE_ITS_GROUP =0x00 , -ACPI_IORT_NODE_NAMED_COMPONENT =0x01 , -ACPI_IORT_NODE_PCI_ROOT_COMPLEX =0x02 , -ACPI_IORT_NODE_SMMU =0x03 , -ACPI_IORT_NODE_SMMU_V3 =0x04 -}; - -struct AcpiIortIdMapping { -uint32_t input_base; -uint32_t id_count; -uint32_t output_base; -uint32_t output_reference; -uint32_t flags; -}QEMU_PACKED ; -typedef struct AcpiIortIdMapping AcpiIortIdMapping ; - -struct AcpiIortMemoryAccess { -uint32_t cache_coherency; -uint8_t hints; -uint16_t reserved; -uint8_t memory_flags; -}QEMU_PACKED ; -typedef struct AcpiIortMemoryAccess AcpiIortMemoryAccess ; - -struct AcpiIortItsGroup { -ACPI_IORT_NODE_HEADER_DEF - uint32_t its_count; -uint32_t identifiers[]; -}QEMU_PACKED ; -typedef struct AcpiIortItsGroup AcpiIortItsGroup ; - -#define ACPI_IORT_SMMU_V3_COHACC_OVERRIDE 1 - -struct AcpiIortSmmu3 { -ACPI_IORT_NODE_HEADER_DEF - uint64_t base_address; -uint32_t flags; -uint32_t reserved2; -uint64_t vatos_address; -uint32_t model; -uint32_t event_gsiv; -uint32_t pri_gsiv; -uint32_t gerr_gsiv; -uint32_t sync_gsiv; -AcpiIortIdMapping id_mapping_array[]; -}QEMU_PACKED ; -typedef struct AcpiIortSmmu3 AcpiIortSmmu3 ; - -struct AcpiIortRC { -ACPI_IORT_NODE_HEADER_DEF - AcpiIortMemoryAccess memory_properties; -uint32_t ats_attribute; -uint32_t pci_segment_number; -AcpiIortIdMapping id_mapping_array[]; -}QEMU_PACKED ; -typedef struct AcpiIortRC AcpiIortRC ; -#endif hw/arm/virt-acpi-build.c +72
-53@@ -240,6 +240,28 @@ static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineState *vms) }#endif +#define ID_MAPPING_ENTRY_SIZE 20 +#define SMMU_V3_ENTRY_SIZE 60 +#define ROOT_COMPLEX_ENTRY_SIZE 32 +#define IORT_NODE_OFFSET 48 + +static void build_iort_id_mapping (GArray *table_data,uint32_t input_base, +uint32_t id_count,uint32_t out_ref) +{ +/* Identity RID mapping covering the whole input RID range */ +build_append_int_noprefix (table_data, input_base,4 );/* Input base */ +build_append_int_noprefix (table_data, id_count,4 );/* Number of IDs */ +build_append_int_noprefix (table_data, input_base,4 );/* Output base */ +build_append_int_noprefix (table_data, out_ref,4 );/* Output Reference */ +build_append_int_noprefix (table_data,0 ,4 );/* Flags */ +} + +struct AcpiIortIdMapping { +uint32_t input_base; +uint32_t id_count; +}; +typedef struct AcpiIortIdMapping AcpiIortIdMapping ; +/* Build the iort ID mapping to SMMUv3 for a given PCI host bridge */ static int iort_host_bridges (Object *obj,void *opaque)@@ -282,17 +304,16 @@ static void build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) {int i, nb_nodes, rc_mapping_count; -AcpiIortIdMapping *idmap; -AcpiIortItsGroup *its; -AcpiIortSmmu3 *smmu; -AcpiIortRC *rc; -const uint32_t iort_node_offset =48 ; +const uint32_t iort_node_offset =IORT_NODE_OFFSET ;size_t node_size, smmu_offset =0 ; +AcpiIortIdMapping *idmap;GArray *smmu_idmaps =g_array_new (false, true,sizeof (AcpiIortIdMapping));GArray *its_idmaps =g_array_new (false, true,sizeof (AcpiIortIdMapping));AcpiTable table = { .sig ="IORT" , .rev =0 , .oem_id = vms->oem_id, .oem_table_id = vms->oem_table_id }; +/* Table 2 The IORT */ +acpi_table_begin (&table, table_data);if (vms->iommu ==VIRT_IOMMU_SMMUV3 ) {AcpiIortIdMapping next_range = {0 };@@ -330,100 +351,101 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) nb_nodes =2 ;/* RC, ITS */ rc_mapping_count =1 ; } - -/* Table 2 The IORT */ -acpi_table_begin (&table, table_data);/* Number of IORT Nodes */ build_append_int_noprefix (table_data, nb_nodes,4 ); +/* Offset to Array of IORT Nodes */ -build_append_int_noprefix (table_data, iort_node_offset,4 ); +build_append_int_noprefix (table_data,IORT_NODE_OFFSET ,4 );build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ -/* ITS group node */ - node_size =sizeof (*its) +sizeof (uint32_t ); - its =acpi_data_push (table_data, node_size); - - its->type =ACPI_IORT_NODE_ITS_GROUP ; - its->length =cpu_to_le16 (node_size); - its->its_count =cpu_to_le32 (1 ); - its->identifiers[0 ] =0 ;/* MADT translation_id */ +/* 3.1.1.3 ITS group node */ +build_append_int_noprefix (table_data,0 /* ITS Group */ ,1 );/* Type */ + node_size =20 /* fixed header size */ +4 /* 1 GIC ITS Identifier */ ; +build_append_int_noprefix (table_data, node_size,2 );/* Length */ +build_append_int_noprefix (table_data,0 ,1 );/* Revision */ +build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ +build_append_int_noprefix (table_data,0 ,4 );/* Number of ID mappings */ +build_append_int_noprefix (table_data,0 ,4 );/* Reference to ID Array */ +build_append_int_noprefix (table_data,1 ,4 );/* Number of ITSs */ +/* GIC ITS Identifier Array */ +build_append_int_noprefix (table_data,0 /* MADT translation_id */ ,4 );if (vms->iommu ==VIRT_IOMMU_SMMUV3 ) {int irq = vms->irqmap[VIRT_SMMU ] +ARM_SPI_BASE ; -/* SMMUv3 node */ - smmu_offset = iort_node_offset + node_size; - node_size =sizeof (*smmu) +sizeof (*idmap); - smmu =acpi_data_push (table_data, node_size); - - smmu->type =ACPI_IORT_NODE_SMMU_V3 ; - smmu->length =cpu_to_le16 (node_size); - smmu->mapping_count =cpu_to_le32 (1 ); - smmu->mapping_offset =cpu_to_le32 (sizeof (*smmu)); - smmu->base_address =cpu_to_le64 (vms->memmap[VIRT_SMMU ].base); - smmu->flags =cpu_to_le32 (ACPI_IORT_SMMU_V3_COHACC_OVERRIDE ); - smmu->event_gsiv =cpu_to_le32 (irq); - smmu->pri_gsiv =cpu_to_le32 (irq +1 ); - smmu->sync_gsiv =cpu_to_le32 (irq +2 ); - smmu->gerr_gsiv =cpu_to_le32 (irq +3 ); - -/* Identity RID mapping covering the whole input RID range */ - idmap = &smmu->id_mapping_array[0 ]; - idmap->input_base =0 ; - idmap->id_count =cpu_to_le32 (0xFFFF ); - idmap->output_base =0 ; + smmu_offset = table_data->len - table.table_offset; +/* 3.1.1.2 SMMUv3 */ +build_append_int_noprefix (table_data,4 /* SMMUv3 */ ,1 );/* Type */ + node_size =SMMU_V3_ENTRY_SIZE +ID_MAPPING_ENTRY_SIZE ; +build_append_int_noprefix (table_data, node_size,2 );/* Length */ +build_append_int_noprefix (table_data,0 ,1 );/* Revision */ +build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ +build_append_int_noprefix (table_data,1 ,4 );/* Number of ID mappings */ +/* Reference to ID Array */ +build_append_int_noprefix (table_data,SMMU_V3_ENTRY_SIZE ,4 ); +/* Base address */ +build_append_int_noprefix (table_data, vms->memmap[VIRT_SMMU ].base,8 ); +/* Flags */ +build_append_int_noprefix (table_data,1 /* COHACC OverrideNote */ ,4 ); +build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ +build_append_int_noprefix (table_data,0 ,8 );/* VATOS address */ +/* Model */ +build_append_int_noprefix (table_data,0 /* Generic SMMU-v3 */ ,4 ); +build_append_int_noprefix (table_data, irq,4 );/* Event */ +build_append_int_noprefix (table_data, irq +1 ,4 );/* PRI */ +build_append_int_noprefix (table_data, irq +3 ,4 );/* GERR */ +build_append_int_noprefix (table_data, irq +2 ,4 );/* Sync */ +/* output IORT node is the ITS group node (the first node) */ - idmap->output_reference =cpu_to_le32 (iort_node_offset); +build_iort_id_mapping (table_data,0 ,0xFFFF ,IORT_NODE_OFFSET ); } -/* Root Complex Node */ - node_size =sizeof (*rc) +sizeof (*idmap) * rc_mapping_count; - rc =acpi_data_push (table_data, node_size); - - rc->type =ACPI_IORT_NODE_PCI_ROOT_COMPLEX ; - rc->length =cpu_to_le16 (node_size); - rc->mapping_count =cpu_to_le32 (rc_mapping_count); - rc->mapping_offset =cpu_to_le32 (sizeof (*rc)); - -/* fully coherent device */ - rc->memory_properties.cache_coherency =cpu_to_le32 (1 ); - rc->memory_properties.memory_flags =0x3 ;/* CCA = CPM = DCAS = 1 */ - rc->pci_segment_number =0 ;/* MCFG pci_segment */ - +/* Table 16 Root Complex Node */ +build_append_int_noprefix (table_data,2 /* Root complex */ ,1 );/* Type */ + node_size =ROOT_COMPLEX_ENTRY_SIZE + +ID_MAPPING_ENTRY_SIZE * rc_mapping_count; +build_append_int_noprefix (table_data, node_size,2 );/* Length */ +build_append_int_noprefix (table_data,0 ,1 );/* Revision */ +build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ +/* Number of ID mappings */ +build_append_int_noprefix (table_data, rc_mapping_count,4 );
hw/arm/virt-acpi-build.c build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) · line 421
Quoted 10 lines
hw/arm/virt-acpi-build.c +10
-0+/* Reference to ID Array */ +build_append_int_noprefix (table_data,ROOT_COMPLEX_ENTRY_SIZE ,4 ); + +/* Table 13 Memory access properties */ +/* CCA: Cache Coherent Attribute */ +build_append_int_noprefix (table_data,1 /* fully coherent */ ,4 ); +build_append_int_noprefix (table_data,0 ,1 );/* AH: Note Allocation Hints */ +build_append_int_noprefix (table_data,0 ,2 );/* Reserved */ +/* MAF: Note Memory Access Flags */ +build_append_int_noprefix (table_data,0x3 /* CCA = CPM = DCAS = 1 */ ,1 );
This is DACS and not DCAS but that's not your fault.
we can send a separate trivial patch afterwards to fix the typo.
Sanity checking with GICv3 and GICv2 and SMMUv3.
Thank you for the huge refactoring effort
Eric
Quoted 48 lines
hw/arm/virt-acpi-build.c +11
-18+ +build_append_int_noprefix (table_data,0 ,4 );/* ATS Attribute */ +/* MCFG pci_segment */ +build_append_int_noprefix (table_data,0 ,4 );/* PCI Segment number */ + +/* Output Reference */ if (vms->iommu ==VIRT_IOMMU_SMMUV3 ) {AcpiIortIdMapping *range;/* translated RIDs connect to SMMUv3 node: RC -> SMMUv3 -> ITS */ for (i =0 ; i < smmu_idmaps->len; i++) { - idmap = &rc->id_mapping_array[i]; range = &g_array_index (smmu_idmaps, AcpiIortIdMapping, i); - - idmap->input_base =cpu_to_le32 (range->input_base); - idmap->id_count =cpu_to_le32 (range->id_count); - idmap->output_base =cpu_to_le32 (range->input_base);/* output IORT node is the smmuv3 node */ - idmap->output_reference =cpu_to_le32 (smmu_offset); +build_iort_id_mapping (table_data, range->input_base, + range->id_count, smmu_offset); }/* bypassed RIDs connect to ITS group node directly: RC -> ITS */ for (i =0 ; i < its_idmaps->len; i++) { - idmap = &rc->id_mapping_array[smmu_idmaps->len + i]; range = &g_array_index (its_idmaps, AcpiIortIdMapping, i); - - idmap->input_base =cpu_to_le32 (range->input_base); - idmap->id_count =cpu_to_le32 (range->id_count); - idmap->output_base =cpu_to_le32 (range->input_base);/* output IORT node is the ITS group node (the first node) */ - idmap->output_reference =cpu_to_le32 (iort_node_offset); +build_iort_id_mapping (table_data, range->input_base, + range->id_count, iort_node_offset); } }else { -/* Identity RID mapping covering the whole input RID range */ - idmap = &rc->id_mapping_array[0 ]; - idmap->input_base =cpu_to_le32 (0 ); - idmap->id_count =cpu_to_le32 (0xFFFF ); - idmap->output_base =cpu_to_le32 (0 );/* output IORT node is the ITS group node (the first node) */ - idmap->output_reference =cpu_to_le32 (iort_node_offset); +build_iort_id_mapping (table_data,0 ,0xFFFF ,IORT_NODE_OFFSET ); }acpi_table_end (linker, &table);
PATCH v4 30/35 acpi: arm/virt: build_spcr: fix invalid cast
In reply to Igor Mammedovimplicit cast to structure uint8_t member didn't raise error when assigning value from incorrect enum, but when using build_append_gas() (next patch) it will error out with (clang):
implicit conversion from enumeration type 'AmlRegionSpace' to different enumeration type 'AmlAddressSpace'
fix cast error by using correct AML_AS_SYSTEM_MEMORY enum
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- hw/arm/virt-acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/arm/virt-acpi-build.c +1 -1
@@ -465,7 +465,7 @@ build_spcr(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) spcr->interface_type =0x3 ;/* ARM PL011 UART */ - spcr->base_address.space_id =AML_SYSTEM_MEMORY ; + spcr->base_address.space_id =AML_AS_SYSTEM_MEMORY ; spcr->base_address.bit_width =8 ; spcr->base_address.bit_offset =0 ; spcr->base_address.access_width =1 ;
Signature · 1 line
2.27.0
PATCH v4 31/35 acpi: arm/virt: build_spcr: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
while at it, replace packed structure with endian agnostic build_append_FOO() API.
PS:
Spec is Microsoft hosted, however 1.02 is no where to be found (MS lists only the current revision) and the current revision is 1.07, so bring comments in line with 1.07 as this is the only available spec. There is no content change between originally implemented 1.02 (using QEMU code as reference) and 1.07. The only change is renaming 'Reserved2' field to 'Language', with the same 0 value.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
PS:
perhaps we should cache MS hosted specs in QEMU tree, given they do not maintain old revisions.
--- include/hw/acpi/acpi-defs.h | 32 ----------------- hw/arm/virt-acpi-build.c | 68 ++++++++++++++++++++++--------------- 2 files changed, 41 insertions(+), 59 deletions(-)
include/hw/acpi/acpi-defs.h +0 -32
@@ -117,38 +117,6 @@ typedef struct AcpiFadtData {#define ACPI_FADT_ARM_PSCI_COMPLIANT (1 << 0)#define ACPI_FADT_ARM_PSCI_USE_HVC (1 << 1) -/* -* Serial Port Console Redirection Table (SPCR), Rev. 1.02 -* -* For .interface_type see Debug Port Table 2 (DBG2) serial port -* subtypes in Table 3, Rev. May 22, 2012 -*/ -struct AcpiSerialPortConsoleRedirection { -ACPI_TABLE_HEADER_DEF - uint8_t interface_type; -uint8_t reserved1[3 ]; -struct AcpiGenericAddress base_address; -uint8_t interrupt_types; -uint8_t irq; -uint32_t gsi; -uint8_t baud; -uint8_t parity; -uint8_t stopbits; -uint8_t flowctrl; -uint8_t term_type; -uint8_t reserved2; -uint16_t pci_device_id; -uint16_t pci_vendor_id; -uint8_t pci_bus; -uint8_t pci_slot; -uint8_t pci_func; -uint32_t pci_flags; -uint8_t pci_seg; -uint32_t reserved3; -}QEMU_PACKED ; -typedef struct AcpiSerialPortConsoleRedirection -AcpiSerialPortConsoleRedirection ; -/* * ACPI 1.0 Firmware ACPI Control Structure (FACS) */
hw/arm/virt-acpi-build.c +41 -27
80 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v4 32/35 acpi: arm/virt: build_gtdt: use acpi_table_begin()/acpi_table_end() instead of build_header()
In reply to Igor Mammedovit replaces error-prone pointer arithmetic for build_header() API, with 2 calls to start and finish table creation,
which hides offsets magic from API user.
while at it, replace packed structure with endian agnostic build_append_FOO() API.
---
v3:
* s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
--- include/hw/acpi/acpi-defs.h | 25 ------------- hw/arm/virt-acpi-build.c | 75 ++++++++++++++++++++++++------------- 2 files changed, 48 insertions(+), 52 deletions(-)
include/hw/acpi/acpi-defs.h +0 -25
@@ -131,29 +131,4 @@ struct AcpiFacsDescriptorRev1 { } QEMU_PACKED;typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1 ; -/* -* Generic Timer Description Table (GTDT) -*/ -#define ACPI_GTDT_INTERRUPT_MODE_LEVEL (0 << 0) -#define ACPI_GTDT_INTERRUPT_MODE_EDGE (1 << 0) -#define ACPI_GTDT_CAP_ALWAYS_ON (1 << 2) - -struct AcpiGenericTimerTable { -ACPI_TABLE_HEADER_DEF - uint64_t counter_block_addresss; -uint32_t reserved; -uint32_t secure_el1_interrupt; -uint32_t secure_el1_flags; -uint32_t non_secure_el1_interrupt; -uint32_t non_secure_el1_flags; -uint32_t virtual_timer_interrupt; -uint32_t virtual_timer_flags; -uint32_t non_secure_el2_interrupt; -uint32_t non_secure_el2_flags; -uint64_t counter_read_block_address; -uint32_t platform_timer_count; -uint32_t platform_timer_offset; -}QEMU_PACKED ; -typedef struct AcpiGenericTimerTable AcpiGenericTimerTable ; -#endif
hw/arm/virt-acpi-build.c +48 -27
88 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v4 33/35 acpi: build_facs: use build_append_int_noprefix() API to compose table
In reply to Igor MammedovDrop usage of packed structures and explicit endian conversions when building table and use endian agnostic build_append_int_noprefix() API to build it.
---
CC: [email protected]
--- include/hw/acpi/acpi-defs.h | 14 -------------- hw/i386/acpi-build.c | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 18 deletions(-)
include/hw/acpi/acpi-defs.h +0 -14
@@ -117,18 +117,4 @@ typedef struct AcpiFadtData {#define ACPI_FADT_ARM_PSCI_COMPLIANT (1 << 0)#define ACPI_FADT_ARM_PSCI_USE_HVC (1 << 1) -/* -* ACPI 1.0 Firmware ACPI Control Structure (FACS) -*/ -struct AcpiFacsDescriptorRev1 { -uint32_t signature;/* ACPI Signature */ -uint32_t length;/* Length of structure, in bytes */ -uint32_t hardware_signature;/* Hardware configuration signature */ -uint32_t firmware_waking_vector;/* ACPI OS waking vector */ -uint32_t global_lock;/* Global Lock */ -uint32_t flags; -uint8_t resverved3 [40 ];/* Reserved - must be zero */ -}QEMU_PACKED ; -typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1 ; -#endif
hw/i386/acpi-build.c +14 -4
@@ -345,13 +345,23 @@ static void acpi_align_size(GArray *blob, unsigned align)g_array_set_size (blob,ROUND_UP (acpi_data_len (blob), align)); } -/* FACS */ +/* +* ACPI spec 1.0b, +* 5.2.6 Firmware ACPI Control Structure +*/ static void build_facs (GArray *table_data) { -AcpiFacsDescriptorRev1 *facs =acpi_data_push (table_data,sizeof *facs); -memcpy (&facs->signature,"FACS" ,4 ); - facs->length =cpu_to_le32 (sizeof (*facs)); +const char *sig ="FACS" ; +const uint8_t reserved[40 ] = {}; + +g_array_append_vals (table_data, sig,4 );/* Signature */ +build_append_int_noprefix (table_data,64 ,4 );/* Length */ +build_append_int_noprefix (table_data,0 ,4 );/* Hardware Signature */ +build_append_int_noprefix (table_data,0 ,4 );/* Firmware Waking Vector */ +build_append_int_noprefix (table_data,0 ,4 );/* Global Lock */ +build_append_int_noprefix (table_data,0 ,4 );/* Flags */ +g_array_append_vals (table_data, reserved,40 );/* Reserved */ }static void build_append_pcihp_notify_entry (Aml *method,int slot)
Signature · 1 line
2.27.0
PATCH v4 34/35 acpi: remove no longer used build_header()
In reply to Igor Mammedov--- include/hw/acpi/acpi-defs.h | 25 ------------------------- include/hw/acpi/aml-build.h | 4 ---- hw/acpi/aml-build.c | 23 ----------------------- 3 files changed, 52 deletions(-)
include/hw/acpi/acpi-defs.h +0 -25
@@ -48,31 +48,6 @@ typedef struct AcpiRsdpData {unsigned *xsdt_tbl_offset; } AcpiRsdpData; -/* Table structure from Linux kernel (the ACPI tables are under the -BSD license) */ - - -#define ACPI_TABLE_HEADER_DEF /* ACPI common table header */ \ - uint32_t signature;/* ACPI signature (4 ASCII characters) */ \ -uint32_t length;/* Length of table, in bytes, including header */ \ -uint8_t revision;/* ACPI Specification minor version # */ \ -uint8_t checksum;/* To make sum of entire table == 0 */ \ - uint8_t oem_id[6] \ -QEMU_NONSTRING ;/* OEM identification */ \ - uint8_t oem_table_id[8] \ -QEMU_NONSTRING ;/* OEM table identification */ \ -uint32_t oem_revision;/* OEM revision number */ \ - uint8_t asl_compiler_id[4] \ -QEMU_NONSTRING ;/* ASL compiler vendor ID */ \ -uint32_t asl_compiler_revision;/* ASL compiler revision number */ - - -/* ACPI common table header */ -struct AcpiTableHeader { - ACPI_TABLE_HEADER_DEF -}QEMU_PACKED ; -typedef struct AcpiTableHeader AcpiTableHeader ; -struct AcpiGenericAddress {uint8_t space_id;/* Address space where struct or register exists */ uint8_t bit_width;/* Size in bits of given register */
include/hw/acpi/aml-build.h +0 -4
@@ -444,10 +444,6 @@ void acpi_table_begin(AcpiTable *desc, GArray *array);*/ void acpi_table_end (BIOSLinker *linker,AcpiTable *table); -void -build_header (BIOSLinker *linker,GArray *table_data, -AcpiTableHeader *h,const char *sig,int len,uint8_t rev, -const char *oem_id,const char *oem_table_id);void *acpi_data_push (GArray *table_data,unsigned size);unsigned acpi_data_len (GArray *table);void acpi_add_table (GArray *table_offsets,GArray *table_data);
hw/acpi/aml-build.c +0 -23
@@ -1754,29 +1754,6 @@ void acpi_table_end(BIOSLinker *linker, AcpiTable *desc) desc->table_offset, table_len, desc->table_offset + checksum_offset); } -void -build_header (BIOSLinker *linker,GArray *table_data, -AcpiTableHeader *h,const char *sig,int len,uint8_t rev, -const char *oem_id,const char *oem_table_id) -{ -unsigned tbl_offset = (char *)h - table_data->data; -unsigned checksum_offset = (char *)&h->checksum - table_data->data; -memcpy (&h->signature, sig,4 ); - h->length =cpu_to_le32 (len); - h->revision = rev; - -strpadcpy ((char *)h->oem_id,sizeof h->oem_id, oem_id,' ' ); -strpadcpy ((char *)h->oem_table_id,sizeof h->oem_table_id, - oem_table_id,' ' ); - - h->oem_revision =cpu_to_le32 (1 ); -memcpy (h->asl_compiler_id,ACPI_BUILD_APPNAME8 ,4 ); - h->asl_compiler_revision =cpu_to_le32 (1 ); -/* Checksum to be filled in by Guest linker */ -bios_linker_loader_add_checksum (linker,ACPI_BUILD_TABLE_FILE , - tbl_offset, len, checksum_offset); -} -void *acpi_data_push (GArray *table_data,unsigned size) {unsigned off = table_data->len;
Signature · 1 line
2.27.0
PATCH v4 35/35 acpi: AcpiGenericAddress no longer used to map/access fields of MMIO, drop packed attribute
In reply to Igor Mammedov--- include/hw/acpi/acpi-defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/hw/acpi/acpi-defs.h +1 -1
@@ -55,7 +55,7 @@ struct AcpiGenericAddress {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 ; +}; typedef struct AcpiFadtData { struct AcpiGenericAddress pm1a_cnt; /* PM1a_CNT_BLK */
Signature · 1 line
2.27.0