[PATCH v3 00/35] acpi: refactor error prone build_header() and packed structures usage in ACPI tables

[PATCH v3 00/35] acpi: refactor error prone build_header() and packed structures usage in ACPI tables

[Igor Mammedov]

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_v3

Previous v2 revision can be found at:
   https://www.mail-archive.com/qemu-devel@nongnu.org/msg822151.html


CC: mst@redhat.com

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          |  38 +-
 include/hw/i386/pc.h                 |   6 +-
 hw/acpi/acpi-x86-stub.c              |   3 +-
 hw/acpi/aml-build.c                  | 197 +++++----
 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                    |  16 +-
 hw/arm/virt-acpi-build.c             | 577 +++++++++++++++------------
 hw/i386/acpi-build.c                 | 304 +++++++-------
 hw/i386/acpi-common.c                | 158 ++++----
 hw/i386/acpi-microvm.c               |  13 +-
 16 files changed, 798 insertions(+), 1168 deletions(-)

-- 
2.27.0

[PATCH v3 01/35] acpi: add helper routines to initialize ACPI tables

[Igor Mammedov]

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

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
CC: eric.auger@redhat.com
CC: wangyanan55@huawei.com
---
 include/hw/acpi/aml-build.h | 31 +++++++++++++++++++
 hw/acpi/aml-build.c         | 62 +++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index 471266d739..4242382399 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -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,
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index d5103e6d7b..229a3eb654 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -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,
-- 
2.27.0

[PATCH v3 02/35] acpi: build_rsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Igor Mammedov]

it 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).

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
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         | 27 ++++++++++++---------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index cf9f44299c..ccfa3382aa 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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)
  */
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 229a3eb654..32f14d4a78 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1890,27 +1890,24 @@ 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;
+
+        /* reserve space for entry */
+        build_append_int_noprefix(table.array, 0, 4);
 
-        /* rsdt->table_offset_entry to be filled by Guest linker */
+        /* 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 */
-- 
2.27.0

[PATCH v3 03/35] acpi: build_xsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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
entries to other tables (which also removes some manual offset
calculations).

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
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         | 27 ++++++++++++---------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index ccfa3382aa..f6d2ca172b 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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)
  */
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 32f14d4a78..daefc132f3 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1916,27 +1916,24 @@ 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,
-- 
2.27.0

[PATCH v3 04/35] acpi: build_slit: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
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(-)

diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index daefc132f3..e54face23d 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1954,11 +1954,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++) {
@@ -1969,11 +1970,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 */
-- 
2.27.0

[PATCH v3 05/35] acpi: build_fadt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
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(-)

diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index e54face23d..dbf3ffe889 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1978,9 +1978,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;
@@ -2044,7 +2045,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 */
@@ -2081,7 +2082,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 */
@@ -2092,9 +2093,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
-- 
2.27.0

[PATCH v3 06/35] acpi: build_tpm2: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: stefanb@linux.vnet.ibm.com
---
 hw/acpi/aml-build.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index dbf3ffe889..5e8bfb631c 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -2107,13 +2107,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);
@@ -2151,9 +2152,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
 
-- 
2.27.0

[PATCH v3 07/35] acpi: acpi_build_hest: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Dongjiu Geng <gengdongjiu1@gmail.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: qemu-arm@nongnu.org
CC: drjones@redhat.com
CC: gengdongjiu1@gmail.com
CC: eauger@redhat.com
---
 hw/acpi/ghes.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c
index a749b84d62..45d9a809cc 100644
--- a/hw/acpi/ghes.c
+++ b/hw/acpi/ghes.c
@@ -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,
-- 
2.27.0

[PATCH v3 08/35] acpi: build_mcfg: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
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(-)

diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c
index 75b1103ec4..20b70dcd81 100644
--- a/hw/acpi/pci.c
+++ b/hw/acpi/pci.c
@@ -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);
 }
-- 
2.27.0

[PATCH v3 09/35] acpi: build_hmat: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
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(-)

diff --git a/hw/acpi/hmat.c b/hw/acpi/hmat.c
index edb3fd91b2..6913ebf730 100644
--- a/hw/acpi/hmat.c
+++ b/hw/acpi/hmat.c
@@ -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);
 }
-- 
2.27.0

[PATCH v3 10/35] acpi: nvdimm_build_nfit: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: xiaoguangrong.eric@gmail.com
---
 hw/acpi/nvdimm.c | 42 +++++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index e3d5fe1939..15f6ca82ca 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -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
-- 
2.27.0

[PATCH v3 11/35] acpi: nvdimm_build_ssdt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: xiaoguangrong.eric@gmail.com
---
 hw/acpi/nvdimm.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 15f6ca82ca..e050b47c2b 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -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 recalculates checksum which were
+     * scheduled by acpi_table_composed()
+     */
+    acpi_table_end(linker, &table);
 }
 
 void nvdimm_build_srat(GArray *table_data)
-- 
2.27.0

[PATCH v3 12/35] acpi: vmgenid_build_acpi: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
---
 hw/acpi/vmgenid.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c
index 4f41a13ea0..95f94a2510 100644
--- a/hw/acpi/vmgenid.c
+++ b/hw/acpi/vmgenid.c
@@ -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,15 +44,12 @@ 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");
+    vgia_offset = table_data->len + build_append_named_dword(ssdt->buf, "VGIA");
     scope = aml_scope("\\_SB");
     dev = aml_device("VGEN");
     aml_append(dev, aml_name_decl("_HID", aml_string("QEMUVGID")));
@@ -116,9 +115,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();
 }
 
-- 
2.27.0

[PATCH v3 13/35] acpi: x86: build_dsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: marcel.apfelbaum@gmail.com
---
 hw/i386/acpi-build.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index d1f5fa3b5a..9cefb814c2 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -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();
 }
 
-- 
2.27.0

[PATCH v3 14/35] acpi: build_hpet: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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 convert build_hpet() to endian agnostic
build_append_FOO() API

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: marcel.apfelbaum@gmail.com
---
 include/hw/acpi/acpi-defs.h | 13 -------------
 hw/i386/acpi-build.c        | 26 ++++++++++++++++++--------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index f6d2ca172b..4d8f8b34b0 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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
  */
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 9cefb814c2..7cfa0cf825 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -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
-- 
2.27.0

[PATCH v3 15/35] acpi: build_tpm_tcpa: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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 <imammedo@redhat.com>
---
v2:
  * fix assert when starting QEMU with TPM 1.2
      Stefan Berger <stefanb@linux.ibm.com>
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/

CC: stefanb@linux.vnet.ibm.com
---
 include/hw/acpi/acpi-defs.h | 14 --------------
 hw/i386/acpi-build.c        | 38 ++++++++++++++++++++++---------------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 4d8f8b34b0..3b42b138f0 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 7cfa0cf825..c329580cff 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -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
 
-- 
2.27.0

[PATCH v3 16/35] acpi: arm/x86: build_srat: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: shannon.zhaosl@gmail.com
CC: peter.maydell@linaro.org
CC: marcel.apfelbaum@gmail.com
CC: qemu-arm@nongnu.org
CC: drjones@redhat.com
CC: eauger@redhat.com
---
 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(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 3b42b138f0..5826ee04b6 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 037cc1fd82..21efe7fe34 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -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 */
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index c329580cff..41c0a63b30 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -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 hotplugabble_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);
 }
 
 /*
-- 
2.27.0

[PATCH v3 17/35] acpi: use build_append_int_noprefix() API to compose SRAT table

[Igor Mammedov]

Drop 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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v3:
 * rebase on top of (e77af21a7a2 hw/i386/acpi-build: Get NUMA information from struct NumaState)
CC: xiaoguangrong.eric@gmail.com
CC: shannon.zhaosl@gmail.com
CC: peter.maydell@linaro.org
CC: marcel.apfelbaum@gmail.com
CC: qemu-arm@nongnu.org
CC: drjones@redhat.com
CC: eauger@redhat.com
---
 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(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 5826ee04b6..d293304f9c 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index 4242382399..6e1f42e119 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -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,
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 5e8bfb631c..050fdb3f37 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1936,15 +1936,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 */
 }
 
 /*
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index e050b47c2b..baab81f7a6 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -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);
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 21efe7fe34..6ba02cf281 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -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);
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 41c0a63b30..51e0ba07b6 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1917,13 +1917,15 @@ build_tpm_tcpa(GArray *table_data, BIOSLinker *linker, GArray *tcpalog,
 #define HOLE_640K_START  (640 * KiB)
 #define HOLE_640K_END   (1 * MiB)
 
+/*
+ * ACPI spec, Revision 3.0
+ * 5.2.15 System Resource Affinity Table (SRAT)
+ */
 static void
 build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
 {
-    AcpiSratMemoryAffinity *numamem;
-
     int i;
-    int numa_start, slots;
+    int numa_mem_start, slots;
     uint64_t mem_len, mem_base, next_base;
     MachineClass *mc = MACHINE_GET_CLASS(machine);
     X86MachineState *x86ms = X86_MACHINE(machine);
@@ -1946,34 +1948,41 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
         uint32_t apic_id = apic_ids->cpus[i].arch_id;
 
         if (apic_id < 255) {
-            AcpiSratProcessorAffinity *core;
-
-            core = acpi_data_push(table_data, sizeof *core);
-            core->type = ACPI_SRAT_PROCESSOR_APIC;
-            core->length = sizeof(*core);
-            core->local_apic_id = apic_id;
-            core->proximity_lo = node_id;
-            memset(core->proximity_hi, 0, 3);
-            core->local_sapic_eid = 0;
-            core->flags = cpu_to_le32(1);
+            /* 5.2.15.1 Processor Local APIC/SAPIC Affinity Structure */
+            build_append_int_noprefix(table_data, 0, 1);  /* Type  */
+            build_append_int_noprefix(table_data, 16, 1); /* Length */
+            /* Proximity Domain [7:0] */
+            build_append_int_noprefix(table_data, node_id, 1);
+            build_append_int_noprefix(table_data, apic_id, 1); /* APIC ID */
+            /* Flags, Table 5-36 */
+            build_append_int_noprefix(table_data, 1, 4);
+            build_append_int_noprefix(table_data, 0, 1); /* Local SAPIC EID */
+            /* Proximity Domain [31:8] */
+            build_append_int_noprefix(table_data, 0, 3);
+            build_append_int_noprefix(table_data, 0, 4); /* Reserved */
         } else {
-            AcpiSratProcessorX2ApicAffinity *core;
-
-            core = acpi_data_push(table_data, sizeof *core);
-            core->type = ACPI_SRAT_PROCESSOR_x2APIC;
-            core->length = sizeof(*core);
-            core->x2apic_id = cpu_to_le32(apic_id);
-            core->proximity_domain = cpu_to_le32(node_id);
-            core->flags = cpu_to_le32(1);
+            /*
+             * ACPI spec, Revision 4.0
+             * 5.2.16.3 Processor Local x2APIC Affinity Structure
+             */
+            build_append_int_noprefix(table_data, 2, 1);  /* Type  */
+            build_append_int_noprefix(table_data, 24, 1); /* Length */
+            build_append_int_noprefix(table_data, 0, 2); /* Reserved */
+            /* Proximity Domain */
+            build_append_int_noprefix(table_data, node_id, 4);
+            build_append_int_noprefix(table_data, apic_id, 4); /* X2APIC ID */
+            /* Flags, Table 5-39 */
+            build_append_int_noprefix(table_data, 1 /* Enabled */, 4);
+            build_append_int_noprefix(table_data, 0, 4); /* Clock Domain */
+            build_append_int_noprefix(table_data, 0, 4); /* Reserved */
         }
     }
 
-
     /* the memory map is a bit tricky, it contains at least one hole
      * from 640k-1M and possibly another one from 3.5G-4G.
      */
     next_base = 0;
-    numa_start = table_data->len;
+    numa_mem_start = table_data->len;
 
     for (i = 1; i < nb_numa_nodes + 1; ++i) {
         mem_base = next_base;
@@ -1985,8 +1994,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
             next_base > HOLE_640K_START) {
             mem_len -= next_base - HOLE_640K_START;
             if (mem_len > 0) {
-                numamem = acpi_data_push(table_data, sizeof *numamem);
-                build_srat_memory(numamem, mem_base, mem_len, i - 1,
+                build_srat_memory(table_data, mem_base, mem_len, i - 1,
                                   MEM_AFFINITY_ENABLED);
             }
 
@@ -2004,8 +2012,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
             next_base > x86ms->below_4g_mem_size) {
             mem_len -= next_base - x86ms->below_4g_mem_size;
             if (mem_len > 0) {
-                numamem = acpi_data_push(table_data, sizeof *numamem);
-                build_srat_memory(numamem, mem_base, mem_len, i - 1,
+                build_srat_memory(table_data, mem_base, mem_len, i - 1,
                                   MEM_AFFINITY_ENABLED);
             }
             mem_base = 1ULL << 32;
@@ -2014,8 +2021,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
         }
 
         if (mem_len > 0) {
-            numamem = acpi_data_push(table_data, sizeof *numamem);
-            build_srat_memory(numamem, mem_base, mem_len, i - 1,
+            build_srat_memory(table_data, mem_base, mem_len, i - 1,
                               MEM_AFFINITY_ENABLED);
         }
     }
@@ -2024,10 +2030,15 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
         nvdimm_build_srat(table_data);
     }
 
-    slots = (table_data->len - numa_start) / sizeof *numamem;
+    /*
+     * TODO: this part is not in ACPI spec and current linux kernel boots fine
+     * without these entries. But I recall there were issues the last time I
+     * tried to remove it with some ancient guest OS, however I can't remember
+     * what that was so keep this around for now
+     */
+    slots = (table_data->len - numa_mem_start) / 40 /* mem affinity len */;
     for (; slots < nb_numa_nodes + 2; slots++) {
-        numamem = acpi_data_push(table_data, sizeof *numamem);
-        build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
+        build_srat_memory(table_data, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
     }
 
     /*
@@ -2039,8 +2050,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
      * providing _PXM method if necessary.
      */
     if (hotplugabble_address_space_size) {
-        numamem = acpi_data_push(table_data, sizeof *numamem);
-        build_srat_memory(numamem, machine->device_memory->base,
+        build_srat_memory(table_data, machine->device_memory->base,
                           hotplugabble_address_space_size, nb_numa_nodes - 1,
                           MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
     }
-- 
2.27.0

[PATCH v3 18/35] acpi: build_dmar_q35: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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 tables.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
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/

CC: wangxingang5@huawei.com
CC: marcel.apfelbaum@gmail.com
---
 include/hw/acpi/acpi-defs.h | 68 --------------------------
 hw/i386/acpi-build.c        | 97 ++++++++++++++++++++-----------------
 2 files changed, 53 insertions(+), 112 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index d293304f9c..c4f0a202e8 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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",
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 51e0ba07b6..2875c4f393 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2064,8 +2064,9 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
 static void
 insert_scope(PCIBus *bus, PCIDevice *dev, void *opaque)
 {
+    const size_t device_scope_size = 6 /* device scope structure */ +
+                                     2 /* 1 path entry */;
     GArray *scope_blob = opaque;
-    AcpiDmarDeviceScope *scope = NULL;
 
     if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {
         /* Dmar Scope Type: 0x02 for PCI Bridge */
@@ -2076,8 +2077,7 @@ insert_scope(PCIBus *bus, PCIDevice *dev, void *opaque)
     }
 
     /* length */
-    build_append_int_noprefix(scope_blob,
-                              sizeof(*scope) + sizeof(scope->path[0]), 1);
+    build_append_int_noprefix(scope_blob, device_scope_size, 1);
     /* reserved */
     build_append_int_noprefix(scope_blob, 0, 2);
     /* enumeration_id */
@@ -2109,26 +2109,31 @@ dmar_host_bridges(Object *obj, void *opaque)
 }
 
 /*
- * VT-d spec 8.1 DMA Remapping Reporting Structure
- * (version Oct. 2014 or later)
+ * Intel ® Virtualization Technology for Directed I/O
+ * Architecture Specification. Revision 3.3
+ * 8.1 DMA Remapping Reporting Structure
  */
 static void
 build_dmar_q35(GArray *table_data, BIOSLinker *linker, const char *oem_id,
                const char *oem_table_id)
 {
-    int dmar_start = table_data->len;
-
-    AcpiTableDmar *dmar;
-    AcpiDmarHardwareUnit *drhd;
-    AcpiDmarRootPortATS *atsr;
     uint8_t dmar_flags = 0;
+    uint8_t rsvd10[10] = {};
+    /* Root complex IOAPIC uses one path only */
+    const size_t ioapic_scope_size = 6 /* device scope structure */ +
+                                     2 /* 1 path entry */;
     X86IOMMUState *iommu = x86_iommu_get_default();
-    AcpiDmarDeviceScope *scope = NULL;
-    /* Root complex IOAPIC use one path[0] only */
-    size_t ioapic_scope_size = sizeof(*scope) + sizeof(scope->path[0]);
     IntelIOMMUState *intel_iommu = INTEL_IOMMU_DEVICE(iommu);
     GArray *scope_blob = g_array_new(false, true, 1);
 
+    AcpiTable table = { .sig = "DMAR", .rev = 1, .oem_id = oem_id,
+                        .oem_table_id = oem_table_id };
+
+    assert(iommu);
+    if (x86_iommu_ir_supported(iommu)) {
+        dmar_flags |= 0x1;      /* Flags: 0x1: INT_REMAP */
+    }
+
     /*
      * A PCI bus walk, for each PCI host bridge.
      * Insert scope for each PCI bridge and endpoint device which
@@ -2137,48 +2142,52 @@ build_dmar_q35(GArray *table_data, BIOSLinker *linker, const char *oem_id,
     object_child_foreach_recursive(object_get_root(),
                                    dmar_host_bridges, scope_blob);
 
-    assert(iommu);
-    if (x86_iommu_ir_supported(iommu)) {
-        dmar_flags |= 0x1;      /* Flags: 0x1: INT_REMAP */
-    }
-
-    dmar = acpi_data_push(table_data, sizeof(*dmar));
-    dmar->host_address_width = intel_iommu->aw_bits - 1;
-    dmar->flags = dmar_flags;
-
-    /* DMAR Remapping Hardware Unit Definition structure */
-    drhd = acpi_data_push(table_data, sizeof(*drhd) + ioapic_scope_size);
-    drhd->type = cpu_to_le16(ACPI_DMAR_TYPE_HARDWARE_UNIT);
-    drhd->length =
-        cpu_to_le16(sizeof(*drhd) + ioapic_scope_size + scope_blob->len);
-    drhd->flags = 0;            /* Don't include all pci device */
-    drhd->pci_segment = cpu_to_le16(0);
-    drhd->address = cpu_to_le64(Q35_HOST_BRIDGE_IOMMU_ADDR);
+    acpi_table_begin(&table, table_data);
+    /* Host Address Width */
+    build_append_int_noprefix(table_data, intel_iommu->aw_bits - 1, 1);
+    build_append_int_noprefix(table_data, dmar_flags, 1); /* Flags */
+    g_array_append_vals(table_data, rsvd10, sizeof(rsvd10)); /* Reserved */
+
+    /* 8.3 DMAR Remapping Hardware Unit Definition structure */
+    build_append_int_noprefix(table_data, 0, 2); /* Type */
+    /* Length */
+    build_append_int_noprefix(table_data,
+                              16 + ioapic_scope_size + scope_blob->len, 2);
+    /* Flags */
+    build_append_int_noprefix(table_data, 0 /* Don't include all pci device */ ,
+                              1);
+    build_append_int_noprefix(table_data, 0 , 1); /* Reserved */
+    build_append_int_noprefix(table_data, 0 , 2); /* Segment Number */
+    /* Register Base Address */
+    build_append_int_noprefix(table_data, Q35_HOST_BRIDGE_IOMMU_ADDR , 8);
 
     /* Scope definition for the root-complex IOAPIC. See VT-d spec
      * 8.3.1 (version Oct. 2014 or later). */
-    scope = &drhd->scope[0];
-    scope->entry_type = 0x03;   /* Type: 0x03 for IOAPIC */
-    scope->length = ioapic_scope_size;
-    scope->enumeration_id = ACPI_BUILD_IOAPIC_ID;
-    scope->bus = Q35_PSEUDO_BUS_PLATFORM;
-    scope->path[0].device = PCI_SLOT(Q35_PSEUDO_DEVFN_IOAPIC);
-    scope->path[0].function = PCI_FUNC(Q35_PSEUDO_DEVFN_IOAPIC);
+    build_append_int_noprefix(table_data, 0x03 /* IOAPIC */, 1); /* Type */
+    build_append_int_noprefix(table_data, ioapic_scope_size, 1); /* Length */
+    build_append_int_noprefix(table_data, 0, 2); /* Reserved */
+    /* Enumeration ID */
+    build_append_int_noprefix(table_data, ACPI_BUILD_IOAPIC_ID, 1);
+    /* Start Bus Number */
+    build_append_int_noprefix(table_data, Q35_PSEUDO_BUS_PLATFORM, 1);
+    /* Path, {Device, Function} pair */
+    build_append_int_noprefix(table_data, PCI_SLOT(Q35_PSEUDO_DEVFN_IOAPIC), 1);
+    build_append_int_noprefix(table_data, PCI_FUNC(Q35_PSEUDO_DEVFN_IOAPIC), 1);
 
     /* Add scope found above */
     g_array_append_vals(table_data, scope_blob->data, scope_blob->len);
     g_array_free(scope_blob, true);
 
     if (iommu->dt_supported) {
-        atsr = acpi_data_push(table_data, sizeof(*atsr));
-        atsr->type = cpu_to_le16(ACPI_DMAR_TYPE_ATSR);
-        atsr->length = cpu_to_le16(sizeof(*atsr));
-        atsr->flags = ACPI_DMAR_ATSR_ALL_PORTS;
-        atsr->pci_segment = cpu_to_le16(0);
+        /* 8.5 Root Port ATS Capability Reporting Structure */
+        build_append_int_noprefix(table_data, 2, 2); /* Type */
+        build_append_int_noprefix(table_data, 8, 2); /* Length */
+        build_append_int_noprefix(table_data, 1 /* ALL_PORTS */, 1); /* Flags */
+        build_append_int_noprefix(table_data, 0, 1); /* Reserved */
+        build_append_int_noprefix(table_data, 0, 2); /* Segment Number */
     }
 
-    build_header(linker, table_data, (void *)(table_data->data + dmar_start),
-                 "DMAR", table_data->len - dmar_start, 1, oem_id, oem_table_id);
+    acpi_table_end(linker, &table);
 }
 
 /*
-- 
2.27.0

[PATCH v3 19/35] acpi: build_waet: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: marcel.apfelbaum@gmail.com
---
 hw/i386/acpi-build.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 2875c4f393..45724469b0 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -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);
 }
 
 /*
-- 
2.27.0

[PATCH v3 20/35] acpi: build_amd_iommu: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: marcel.apfelbaum@gmail.com
---
 hw/i386/acpi-build.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 45724469b0..9f888d5a2c 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -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
-- 
2.27.0

[PATCH v3 21/35] acpi: madt: arm/x86: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: marcel.apfelbaum@gmail.com
CC: shannon.zhaosl@gmail.com
CC: peter.maydell@linaro.org
CC: qemu-arm@nongnu.org
CC: drjones@redhat.com
CC: eauger@redhat.com
---
 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(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index c4f0a202e8..c7fa5caa06 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 6ba02cf281..e3bdcd44e8 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -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 */
diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
index 1f5947fcf9..a0cde1d874 100644
--- a/hw/i386/acpi-common.c
+++ b/hw/i386/acpi-common.c
@@ -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);
 }
 
-- 
2.27.0

[PATCH v3 22/35] acpi: x86: remove dead code

[Igor Mammedov]

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 include/hw/acpi/acpi-defs.h | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index c7fa5caa06..af4fa412a5 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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
-- 
2.27.0

[PATCH v3 23/35] acpi: x86: set enabled when composing _MAT entries

[Igor Mammedov]

Instead 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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
CC: marcel.apfelbaum@gmail.com
---
 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(-)

diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h
index 769ff55c7e..ea6056ab92 100644
--- a/include/hw/acpi/acpi_dev_interface.h
+++ b/include/hw/acpi/acpi_dev_interface.h
@@ -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
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 4d2e35a152..82cf7b7e30 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -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;
diff --git a/hw/acpi/acpi-x86-stub.c b/hw/acpi/acpi-x86-stub.c
index e9e46c5c5f..3df1e090f4 100644
--- a/hw/acpi/acpi-x86-stub.c
+++ b/hw/acpi/acpi-x86-stub.c
@@ -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)
 {
 }
 
diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
index f82e9512fd..b20903ea30 100644
--- a/hw/acpi/cpu.c
+++ b/hw/acpi/cpu.c
@@ -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);
diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
index a0cde1d874..7983a13a93 100644
--- a/hw/i386/acpi-common.c
+++ b/hw/i386/acpi-common.c
@@ -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;
         }
-- 
2.27.0

[PATCH v3 24/35] acpi: x86: madt: use build_append_int_noprefix() API to compose MADT table

[Igor Mammedov]

Drop 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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
CC: marcel.apfelbaum@gmail.com
CC: eauger@redhat.com
---
 include/hw/acpi/acpi-defs.h |  64 ------------------
 hw/i386/acpi-common.c       | 127 ++++++++++++++++++------------------
 2 files changed, 65 insertions(+), 126 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index af4fa412a5..3f174ba208 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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;
diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
index 7983a13a93..aa7b5c357e 100644
--- a/hw/i386/acpi-common.c
+++ b/hw/i386/acpi-common.c
@@ -38,7 +38,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
                        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;
+    /* Flags – Local APIC Flags */
+    uint32_t flags = apic_ids->cpus[uid].cpu != NULL || force_enabled ?
+                     1 /* Enabled */ : 0;
 
     /* ACPI spec says that LAPIC entry for non present
      * CPU may be omitted from MADT or it must be marked
@@ -47,24 +49,47 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
      * should be put in MADT but kept disabled.
      */
     if (apic_id < 255) {
-        AcpiMadtProcessorApic *apic = acpi_data_push(entry, sizeof *apic);
-
-        apic->type = ACPI_APIC_PROCESSOR;
-        apic->length = sizeof(*apic);
-        apic->processor_id = uid;
-        apic->local_apic_id = apic_id;
-        apic->flags = cpu_to_le32(flags);
+        /* Rev 1.0b, Table 5-13 Processor Local APIC Structure */
+        build_append_int_noprefix(entry, 0, 1);       /* Type */
+        build_append_int_noprefix(entry, 8, 1);       /* Length */
+        build_append_int_noprefix(entry, uid, 1);     /* ACPI Processor ID */
+        build_append_int_noprefix(entry, apic_id, 1); /* APIC ID */
+        build_append_int_noprefix(entry, flags, 4); /* Flags */
     } else {
-        AcpiMadtProcessorX2Apic *apic = acpi_data_push(entry, sizeof *apic);
-
-        apic->type = ACPI_APIC_LOCAL_X2APIC;
-        apic->length = sizeof(*apic);
-        apic->uid = cpu_to_le32(uid);
-        apic->x2apic_id = cpu_to_le32(apic_id);
-        apic->flags = cpu_to_le32(flags);
+        /* Rev 4.0, 5.2.12.12 Processor Local x2APIC Structure */
+        build_append_int_noprefix(entry, 9, 1);       /* Type */
+        build_append_int_noprefix(entry, 16, 1);      /* Length */
+        build_append_int_noprefix(entry, 0, 2);       /* Reserved */
+        build_append_int_noprefix(entry, apic_id, 4); /* X2APIC ID */
+        build_append_int_noprefix(entry, flags, 4);   /* Flags */
+        build_append_int_noprefix(entry, uid, 4);     /* ACPI Processor UID */
     }
 }
 
+static void build_ioapic(GArray *entry, uint8_t id, uint32_t addr, uint32_t irq)
+{
+    /* Rev 1.0b, 5.2.8.2 IO APIC */
+    build_append_int_noprefix(entry, 1, 1);    /* Type */
+    build_append_int_noprefix(entry, 12, 1);   /* Length */
+    build_append_int_noprefix(entry, id, 1);   /* IO APIC ID */
+    build_append_int_noprefix(entry, 0, 1);    /* Reserved */
+    build_append_int_noprefix(entry, addr, 4); /* IO APIC Address */
+    build_append_int_noprefix(entry, irq, 4);  /* System Vector Base */
+}
+
+static void
+build_xrupt_override(GArray *entry, uint8_t src, uint32_t gsi, uint16_t flags)
+{
+    /* Rev 1.0b, 5.2.8.3.1 Interrupt Source Overrides */
+    build_append_int_noprefix(entry, 2, 1);  /* Type */
+    build_append_int_noprefix(entry, 10, 1); /* Length */
+    build_append_int_noprefix(entry, 0, 1);  /* Bus */
+    build_append_int_noprefix(entry, src, 1);  /* Source */
+    /* Global System Interrupt Vector */
+    build_append_int_noprefix(entry, gsi, 4);
+    build_append_int_noprefix(entry, flags, 2);  /* Flags */
+}
+
 /*
  * ACPI spec, Revision 1.0b
  * 5.2.8 Multiple APIC Description Table
@@ -73,14 +98,11 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
                      X86MachineState *x86ms, AcpiDeviceIf *adev,
                      const char *oem_id, const char *oem_table_id)
 {
+    int i;
+    bool x2apic_mode = false;
     MachineClass *mc = MACHINE_GET_CLASS(x86ms);
     const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(x86ms));
     AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(adev);
-    bool x2apic_mode = false;
-
-    AcpiMadtIoApic *io_apic;
-    AcpiMadtIntsrcovr *intsrcovr;
-    int i;
     AcpiTable table = { .sig = "APIC", .rev = 1, .oem_id = oem_id,
                         .oem_table_id = oem_table_id };
 
@@ -96,30 +118,14 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
         }
     }
 
-    io_apic = acpi_data_push(table_data, sizeof *io_apic);
-    io_apic->type = ACPI_APIC_IO;
-    io_apic->length = sizeof(*io_apic);
-    io_apic->io_apic_id = ACPI_BUILD_IOAPIC_ID;
-    io_apic->address = cpu_to_le32(IO_APIC_DEFAULT_ADDRESS);
-    io_apic->interrupt = cpu_to_le32(0);
-
+    build_ioapic(table_data, ACPI_BUILD_IOAPIC_ID, IO_APIC_DEFAULT_ADDRESS, 0);
     if (x86ms->ioapic2) {
-        AcpiMadtIoApic *io_apic2;
-        io_apic2 = acpi_data_push(table_data, sizeof *io_apic);
-        io_apic2->type = ACPI_APIC_IO;
-        io_apic2->length = sizeof(*io_apic);
-        io_apic2->io_apic_id = ACPI_BUILD_IOAPIC_ID + 1;
-        io_apic2->address = cpu_to_le32(IO_APIC_SECONDARY_ADDRESS);
-        io_apic2->interrupt = cpu_to_le32(IO_APIC_SECONDARY_IRQBASE);
+        build_ioapic(table_data, ACPI_BUILD_IOAPIC_ID + 1,
+                     IO_APIC_SECONDARY_ADDRESS, IO_APIC_SECONDARY_IRQBASE);
     }
 
     if (x86ms->apic_xrupt_override) {
-        intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
-        intsrcovr->type   = ACPI_APIC_XRUPT_OVERRIDE;
-        intsrcovr->length = sizeof(*intsrcovr);
-        intsrcovr->source = 0;
-        intsrcovr->gsi    = cpu_to_le32(2);
-        intsrcovr->flags  = cpu_to_le16(0); /* conforms to bus specifications */
+        build_xrupt_override(table_data, 0, 2, 0);
     }
 
     for (i = 1; i < 16; i++) {
@@ -127,32 +133,29 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
             /* No need for a INT source override structure. */
             continue;
         }
-        intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
-        intsrcovr->type   = ACPI_APIC_XRUPT_OVERRIDE;
-        intsrcovr->length = sizeof(*intsrcovr);
-        intsrcovr->source = i;
-        intsrcovr->gsi    = cpu_to_le32(i);
-        intsrcovr->flags  = cpu_to_le16(0xd); /* active high, level triggered */
+        build_xrupt_override(table_data, i, i, 0xd);
     }
 
     if (x2apic_mode) {
-        AcpiMadtLocalX2ApicNmi *local_nmi;
-
-        local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
-        local_nmi->type   = ACPI_APIC_LOCAL_X2APIC_NMI;
-        local_nmi->length = sizeof(*local_nmi);
-        local_nmi->uid    = 0xFFFFFFFF; /* all processors */
-        local_nmi->flags  = cpu_to_le16(0);
-        local_nmi->lint   = 1; /* ACPI_LINT1 */
+        /* Rev 4.0, 5.2.12.13 Local x2APIC NMI Structure*/
+        build_append_int_noprefix(table_data, 0xA, 1); /* Type */
+        build_append_int_noprefix(table_data, 12, 1);  /* Length */
+        build_append_int_noprefix(table_data, 0, 2);   /* Flags */
+        /* ACPI Processor UID */
+        build_append_int_noprefix(table_data, 0xFFFFFFFF /* all processors */,
+                                  4);
+        /* Local x2APIC INTI# */
+        build_append_int_noprefix(table_data, 1 /* ACPI_LINT1 */, 1);
+        build_append_int_noprefix(table_data, 0, 3);
     } else {
-        AcpiMadtLocalNmi *local_nmi;
-
-        local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
-        local_nmi->type         = ACPI_APIC_LOCAL_NMI;
-        local_nmi->length       = sizeof(*local_nmi);
-        local_nmi->processor_id = 0xff; /* all processors */
-        local_nmi->flags        = cpu_to_le16(0);
-        local_nmi->lint         = 1; /* ACPI_LINT1 */
+        /* Rev 1.0b, 5.2.8.3.3 Local APIC NMI */
+        build_append_int_noprefix(table_data, 4, 1);  /* Type */
+        build_append_int_noprefix(table_data, 6, 1);  /* Length */
+        /* ACPI Processor ID */
+        build_append_int_noprefix(table_data, 0xff /* all processors */, 1);
+        build_append_int_noprefix(table_data, 0, 2);  /* Flags */
+        /* Local APIC INTI# */
+        build_append_int_noprefix(table_data, 1 /* ACPI_LINT1 */, 1);
     }
 
     acpi_table_end(linker, &table);
-- 
2.27.0

[PATCH v3 25/35] acpi: arm/virt: madt: use build_append_int_noprefix() API to compose MADT table

[Igor Mammedov]

Drop 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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
---
v2:
  * fix invalid ITS length (use v6.0 Errata instead of v60 definition)

CC: drjones@redhat.com
CC: peter.maydell@linaro.org
CC: shannon.zhaosl@gmail.com
CC: qemu-arm@nongnu.org
CC: eauger@redhat.com
---
 include/hw/acpi/acpi-defs.h |  84 --------------------
 hw/arm/virt-acpi-build.c    | 150 +++++++++++++++++++++---------------
 2 files changed, 90 insertions(+), 144 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 3f174ba208..bcada37601 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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)
  */
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index e3bdcd44e8..a9a78d904a 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -568,94 +568,124 @@ build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
 }
 
 /*
- * ACPI spec, Revision 5.0
+ * ACPI spec, Revision 5.1 Errata A
  * 5.2.12 Multiple APIC Description Table (MADT)
  */
+static void build_append_gicr(GArray *table_data, uint64_t base, uint32_t size)
+{
+    build_append_int_noprefix(table_data, 0xE, 1);  /* Type */
+    build_append_int_noprefix(table_data, 16, 1);   /* Length */
+    build_append_int_noprefix(table_data, 0, 2);    /* Reserved */
+    /* Discovery Range Base Addres */
+    build_append_int_noprefix(table_data, base, 8);
+    build_append_int_noprefix(table_data, size, 4); /* Discovery Range Length */
+}
+
 static void
 build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
 {
+    int i;
     VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
     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_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;
-    gicd->length = sizeof(*gicd);
-    gicd->base_address = cpu_to_le64(memmap[VIRT_GIC_DIST].base);
-    gicd->version = vms->gic_version;
+    build_append_int_noprefix(table_data, 0, 4);   /* Flags */
+
+    /* 5.2.12.15 GIC Distributor Structure */
+    build_append_int_noprefix(table_data, 0xC, 1); /* Type */
+    build_append_int_noprefix(table_data, 24, 1);  /* Length */
+    build_append_int_noprefix(table_data, 0, 2);   /* Reserved */
+    build_append_int_noprefix(table_data, 0, 4);   /* GIC ID */
+    /* Physical Base Address */
+    build_append_int_noprefix(table_data, memmap[VIRT_GIC_DIST].base, 8);
+    build_append_int_noprefix(table_data, 0, 4);   /* System Vector Base */
+    /* GIC version */
+    build_append_int_noprefix(table_data, vms->gic_version, 1);
+    build_append_int_noprefix(table_data, 0, 3);   /* Reserved */
 
     for (i = 0; i < MACHINE(vms)->smp.cpus; i++) {
-        AcpiMadtGenericCpuInterface *gicc = acpi_data_push(table_data,
-                                                           sizeof(*gicc));
         ARMCPU *armcpu = ARM_CPU(qemu_get_cpu(i));
+        uint64_t physical_base_address = 0, gich = 0, gicv = 0;
+        uint32_t vgic_interrupt = vms->virt ? PPI(ARCH_GIC_MAINT_IRQ) : 0;
+        uint32_t pmu_interrupt = arm_feature(&armcpu->env, ARM_FEATURE_PMU) ?
+                                             PPI(VIRTUAL_PMU_IRQ) : 0;
 
-        gicc->type = ACPI_APIC_GENERIC_CPU_INTERFACE;
-        gicc->length = sizeof(*gicc);
         if (vms->gic_version == 2) {
-            gicc->base_address = cpu_to_le64(memmap[VIRT_GIC_CPU].base);
-            gicc->gich_base_address = cpu_to_le64(memmap[VIRT_GIC_HYP].base);
-            gicc->gicv_base_address = cpu_to_le64(memmap[VIRT_GIC_VCPU].base);
+            physical_base_address = memmap[VIRT_GIC_CPU].base;
+            gicv = memmap[VIRT_GIC_VCPU].base;
+            gich = memmap[VIRT_GIC_HYP].base;
         }
-        gicc->cpu_interface_number = cpu_to_le32(i);
-        gicc->arm_mpidr = cpu_to_le64(armcpu->mp_affinity);
-        gicc->uid = cpu_to_le32(i);
-        gicc->flags = cpu_to_le32(ACPI_MADT_GICC_ENABLED);
 
-        if (arm_feature(&armcpu->env, ARM_FEATURE_PMU)) {
-            gicc->performance_interrupt = cpu_to_le32(PPI(VIRTUAL_PMU_IRQ));
-        }
-        if (vms->virt) {
-            gicc->vgic_interrupt = cpu_to_le32(PPI(ARCH_GIC_MAINT_IRQ));
-        }
+        /* 5.2.12.14 GIC Structure */
+        build_append_int_noprefix(table_data, 0xB, 1);  /* Type */
+        build_append_int_noprefix(table_data, 76, 1);   /* Length */
+        build_append_int_noprefix(table_data, 0, 2);    /* Reserved */
+        build_append_int_noprefix(table_data, i, 4);    /* GIC ID */
+        build_append_int_noprefix(table_data, i, 4);    /* ACPI Processor UID */
+        /* Flags */
+        build_append_int_noprefix(table_data, 1, 4);    /* Enabled */
+        /* Parking Protocol Version */
+        build_append_int_noprefix(table_data, 0, 4);
+        /* Performance Interrupt GSIV */
+        build_append_int_noprefix(table_data, pmu_interrupt, 4);
+        build_append_int_noprefix(table_data, 0, 8); /* Parked Address */
+        /* Physical Base Address */
+        build_append_int_noprefix(table_data, physical_base_address, 8);
+        build_append_int_noprefix(table_data, gicv, 8); /* GICV */
+        build_append_int_noprefix(table_data, gich, 8); /* GICH */
+        /* VGIC Maintenance interrupt */
+        build_append_int_noprefix(table_data, vgic_interrupt, 4);
+        build_append_int_noprefix(table_data, 0, 8);    /* GICR Base Address*/
+        /* MPIDR */
+        build_append_int_noprefix(table_data, armcpu->mp_affinity, 8);
     }
 
     if (vms->gic_version == 3) {
-        AcpiMadtGenericTranslator *gic_its;
-        int nb_redist_regions = virt_gicv3_redist_region_count(vms);
-        AcpiMadtGenericRedistributor *gicr = acpi_data_push(table_data,
-                                                         sizeof *gicr);
-
-        gicr->type = ACPI_APIC_GENERIC_REDISTRIBUTOR;
-        gicr->length = sizeof(*gicr);
-        gicr->base_address = cpu_to_le64(memmap[VIRT_GIC_REDIST].base);
-        gicr->range_length = cpu_to_le32(memmap[VIRT_GIC_REDIST].size);
-
-        if (nb_redist_regions == 2) {
-            gicr = acpi_data_push(table_data, sizeof(*gicr));
-            gicr->type = ACPI_APIC_GENERIC_REDISTRIBUTOR;
-            gicr->length = sizeof(*gicr);
-            gicr->base_address =
-                cpu_to_le64(memmap[VIRT_HIGH_GIC_REDIST2].base);
-            gicr->range_length =
-                cpu_to_le32(memmap[VIRT_HIGH_GIC_REDIST2].size);
+        build_append_gicr(table_data, memmap[VIRT_GIC_REDIST].base,
+                                      memmap[VIRT_GIC_REDIST].size);
+        if (virt_gicv3_redist_region_count(vms) == 2) {
+            build_append_gicr(table_data, memmap[VIRT_HIGH_GIC_REDIST2].base,
+                                          memmap[VIRT_HIGH_GIC_REDIST2].size);
         }
 
         if (its_class_name() && !vmc->no_its) {
-            gic_its = acpi_data_push(table_data, sizeof *gic_its);
-            gic_its->type = ACPI_APIC_GENERIC_TRANSLATOR;
-            gic_its->length = sizeof(*gic_its);
-            gic_its->translation_id = 0;
-            gic_its->base_address = cpu_to_le64(memmap[VIRT_GIC_ITS].base);
+            /*
+             * FIXME: Structure is from Revision 6.0 where 'GIC Structure'
+             * has additional fields on top of implemented 5.1 Errata A,
+             * to make it consistent with v6.0 we need to bump everything
+             * to v6.0
+             */
+            /*
+             * ACPI spec, Revision 6.0 Errata A
+             * (original 6.0 definition has invalid Length)
+             * 5.2.12.18 GIC ITS Structure
+             */
+            build_append_int_noprefix(table_data, 0xF, 1);  /* Type */
+            build_append_int_noprefix(table_data, 20, 1);   /* Length */
+            build_append_int_noprefix(table_data, 0, 2);    /* Reserved */
+            build_append_int_noprefix(table_data, 0, 4);    /* GIC ITS ID */
+            /* Physical Base Address */
+            build_append_int_noprefix(table_data, memmap[VIRT_GIC_ITS].base, 8);
+            build_append_int_noprefix(table_data, 0, 4);    /* Reserved */
         }
     } else {
-        gic_msi = acpi_data_push(table_data, sizeof *gic_msi);
-        gic_msi->type = ACPI_APIC_GENERIC_MSI_FRAME;
-        gic_msi->length = sizeof(*gic_msi);
-        gic_msi->gic_msi_frame_id = 0;
-        gic_msi->base_address = cpu_to_le64(memmap[VIRT_GIC_V2M].base);
-        gic_msi->flags = cpu_to_le32(1);
-        gic_msi->spi_count = cpu_to_le16(NUM_GICV2M_SPIS);
-        gic_msi->spi_base = cpu_to_le16(irqmap[VIRT_GIC_V2M] + ARM_SPI_BASE);
+        const uint16_t spi_base = vms->irqmap[VIRT_GIC_V2M] + ARM_SPI_BASE;
+
+        /* 5.2.12.16 GIC MSI Frame Structure */
+        build_append_int_noprefix(table_data, 0xD, 1);  /* Type */
+        build_append_int_noprefix(table_data, 24, 1);   /* Length */
+        build_append_int_noprefix(table_data, 0, 2);    /* Reserved */
+        build_append_int_noprefix(table_data, 0, 4);    /* GIC MSI Frame ID */
+        /* Physical Base Address */
+        build_append_int_noprefix(table_data, memmap[VIRT_GIC_V2M].base, 8);
+        build_append_int_noprefix(table_data, 1, 4);    /* Flags */
+        /* SPI Count */
+        build_append_int_noprefix(table_data, NUM_GICV2M_SPIS, 2);
+        build_append_int_noprefix(table_data, spi_base, 2); /* SPI Base */
     }
     acpi_table_end(linker, &table);
 }
-- 
2.27.0

[PATCH v3 26/35] acpi: build_dsdt_microvm: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: marcel.apfelbaum@gmail.com
CC: kraxel@redhat.com
---
 hw/i386/acpi-microvm.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c
index 1a0f77b911..196d318499 100644
--- a/hw/i386/acpi-microvm.c
+++ b/hw/i386/acpi-microvm.c
@@ -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();
 }
 
-- 
2.27.0

[PATCH v3 27/35] acpi: arm: virt: build_dsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: peter.maydell@linaro.org
CC: shannon.zhaosl@gmail.com
CC: qemu-arm@nongnu.org
CC: drjones@redhat.com
---
 hw/arm/virt-acpi-build.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index a9a78d904a..4b9687439d 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -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();
 }
 
-- 
2.27.0

[PATCH v3 28/35] acpi: arm: virt: build_iort: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
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/

CC: drjones@redhat.com
CC: peter.maydell@linaro.org
CC: shannon.zhaosl@gmail.com
CC: qemu-arm@nongnu.org
CC: eauger@redhat.com
---
 include/hw/acpi/acpi-defs.h | 14 ------------
 hw/arm/virt-acpi-build.c    | 45 ++++++++++++++++---------------------
 2 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index bcada37601..195f90caf6 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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
  */
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 4b9687439d..bceb1b3b7e 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -273,22 +273,29 @@ static int iort_idmap_compare(gconstpointer a, gconstpointer b)
     return idmap_a->input_base - idmap_b->input_base;
 }
 
+/*
+ * Input Output Remapping Table (IORT)
+ * Conforms to "IO Remapping Table System Software on ARM Platforms",
+ * Document number: ARM DEN 0049B, October 2015
+ */
 static void
 build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
 {
-    int i, nb_nodes, rc_mapping_count, iort_start = table_data->len;
+    int i, nb_nodes, rc_mapping_count;
     AcpiIortIdMapping *idmap;
     AcpiIortItsGroup *its;
-    AcpiIortTable *iort;
     AcpiIortSmmu3 *smmu;
-    size_t node_size, iort_node_offset, iort_length, smmu_offset = 0;
     AcpiIortRC *rc;
+    const uint32_t iort_node_offset = 48;
+    size_t node_size, smmu_offset = 0;
     GArray *smmu_idmaps = g_array_new(false, true, sizeof(AcpiIortIdMapping));
     GArray *its_idmaps = g_array_new(false, true, sizeof(AcpiIortIdMapping));
 
-    iort = acpi_data_push(table_data, sizeof(*iort));
+    AcpiTable table = { .sig = "IORT", .rev = 0, .oem_id = vms->oem_id,
+                        .oem_table_id = vms->oem_table_id };
 
     if (vms->iommu == VIRT_IOMMU_SMMUV3) {
+
         AcpiIortIdMapping next_range = {0};
 
         object_child_foreach_recursive(object_get_root(),
@@ -325,18 +332,16 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
         rc_mapping_count = 1;
     }
 
-    iort_length = sizeof(*iort);
-    iort->node_count = cpu_to_le32(nb_nodes);
-    /*
-     * Use a copy in case table_data->data moves during acpi_data_push
-     * operations.
-     */
-    iort_node_offset = sizeof(*iort);
-    iort->node_offset = cpu_to_le32(iort_node_offset);
+    /* 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, 0, 4); /* Reserved */
 
     /* ITS group node */
     node_size =  sizeof(*its) + sizeof(uint32_t);
-    iort_length += node_size;
     its = acpi_data_push(table_data, node_size);
 
     its->type = ACPI_IORT_NODE_ITS_GROUP;
@@ -350,7 +355,6 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
         /* SMMUv3 node */
         smmu_offset = iort_node_offset + node_size;
         node_size = sizeof(*smmu) + sizeof(*idmap);
-        iort_length += node_size;
         smmu = acpi_data_push(table_data, node_size);
 
         smmu->type = ACPI_IORT_NODE_SMMU_V3;
@@ -375,7 +379,6 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
 
     /* Root Complex Node */
     node_size = sizeof(*rc) + sizeof(*idmap) * rc_mapping_count;
-    iort_length += node_size;
     rc = acpi_data_push(table_data, node_size);
 
     rc->type = ACPI_IORT_NODE_PCI_ROOT_COMPLEX;
@@ -424,19 +427,9 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
         idmap->output_reference = cpu_to_le32(iort_node_offset);
     }
 
+    acpi_table_end(linker, &table);
     g_array_free(smmu_idmaps, true);
     g_array_free(its_idmaps, true);
-
-    /*
-     * Update the pointer address in case table_data->data moves during above
-     * acpi_data_push operations.
-     */
-    iort = (AcpiIortTable *)(table_data->data + iort_start);
-    iort->length = cpu_to_le32(iort_length);
-
-    build_header(linker, table_data, (void *)(table_data->data + iort_start),
-                 "IORT", table_data->len - iort_start, 0, vms->oem_id,
-                 vms->oem_table_id);
 }
 
 static void
-- 
2.27.0

[PATCH v3 29/35] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API

[Igor Mammedov]

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v3:
  * practically rewritten, due to conflicts wiht bypass iommu feature

CC: drjones@redhat.com
CC: peter.maydell@linaro.org
CC: shannon.zhaosl@gmail.com
CC: qemu-arm@nongnu.org
CC: wangxingang5@huawei.com
CC: Eric Auger <eric.auger@redhat.com>
---
 include/hw/acpi/acpi-defs.h |  71 ---------------
 hw/arm/virt-acpi-build.c    | 167 ++++++++++++++++++++----------------
 2 files changed, 91 insertions(+), 147 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 195f90caf6..6f2f08a9de 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index bceb1b3b7e..4c682e7b09 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -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)
@@ -281,18 +303,17 @@ static int iort_idmap_compare(gconstpointer a, gconstpointer b)
 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;
+    int i, rc_mapping_count;
     const uint32_t iort_node_offset = 48;
     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) {
 
@@ -325,106 +346,100 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
             g_array_append_val(its_idmaps, next_range);
         }
 
-        nb_nodes = 3; /* RC, ITS, SMMUv3 */
         rc_mapping_count = smmu_idmaps->len + its_idmaps->len;
+        /* Number of IORT Nodes */
+        build_append_int_noprefix(table_data, 3 /* RC, ITS, SMMUv3 */, 4);
     } else {
-        nb_nodes = 2; /* RC, ITS */
         rc_mapping_count = 1;
+        /* Number of IORT Nodes */
+        build_append_int_noprefix(table_data, 2 /* RC, ITS */, 4);
     }
 
-    /* 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;
-        /* output IORT node is the ITS group node (the first node) */
-        idmap->output_reference = cpu_to_le32(iort_node_offset);
+        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 */
+
+        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));
-
+    /* 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);
+    /* Reference to ID Array */
+    build_append_int_noprefix(table_data, ROOT_COMPLEX_ENTRY_SIZE, 4);
     /* 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 */
-
+    build_append_int_noprefix(table_data,
+        1 | /* CCA: Cache Coherent Attribute, The device is fully coherent */
+        (3ULL << 7 * 8) /* MAF: Memory Access Flags, CCA = CPM = DCAS = 1 */,
+        8);
+    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);
-- 
2.27.0

[PATCH v3 30/35] acpi: arm/virt: build_spcr: fix invalid cast

[Igor Mammedov]

implicit 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

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
---
CC: drjones@redhat.com
CC: peter.maydell@linaro.org
CC: shannon.zhaosl@gmail.com
CC: qemu-arm@nongnu.org
---
 hw/arm/virt-acpi-build.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 4c682e7b09..50ed73b9d0 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -459,7 +459,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;
-- 
2.27.0

[PATCH v3 31/35] acpi: arm/virt: build_spcr: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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, 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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
---
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.

CC: drjones@redhat.com
CC: peter.maydell@linaro.org
CC: shannon.zhaosl@gmail.com
CC: qemu-arm@nongnu.org
---
 include/hw/acpi/acpi-defs.h | 32 -----------------
 hw/arm/virt-acpi-build.c    | 68 ++++++++++++++++++++++---------------
 2 files changed, 41 insertions(+), 59 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 6f2f08a9de..012c4ffb3a 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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)
  */
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 50ed73b9d0..ea783128a9 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -447,39 +447,53 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
     g_array_free(its_idmaps, true);
 }
 
+/*
+ * Serial Port Console Redirection Table (SPCR)
+ * Rev: 1.07
+ */
 static void
 build_spcr(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
 {
-    AcpiSerialPortConsoleRedirection *spcr;
-    const MemMapEntry *uart_memmap = &vms->memmap[VIRT_UART];
-    int irq = vms->irqmap[VIRT_UART] + ARM_SPI_BASE;
-    int spcr_start = table_data->len;
-
-    spcr = acpi_data_push(table_data, sizeof(*spcr));
-
-    spcr->interface_type = 0x3;    /* ARM PL011 UART */
-
-    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;
-    spcr->base_address.address = cpu_to_le64(uart_memmap->base);
-
-    spcr->interrupt_types = (1 << 3); /* Bit[3] ARMH GIC interrupt */
-    spcr->gsi = cpu_to_le32(irq);  /* Global System Interrupt */
+    AcpiTable table = { .sig = "SPCR", .rev = 2, .oem_id = vms->oem_id,
+                        .oem_table_id = vms->oem_table_id };
 
-    spcr->baud = 3;                /* Baud Rate: 3 = 9600 */
-    spcr->parity = 0;              /* No Parity */
-    spcr->stopbits = 1;            /* 1 Stop bit */
-    spcr->flowctrl = (1 << 1);     /* Bit[1] = RTS/CTS hardware flow control */
-    spcr->term_type = 0;           /* Terminal Type: 0 = VT100 */
+    acpi_table_begin(&table, table_data);
 
-    spcr->pci_device_id = 0xffff;  /* PCI Device ID: not a PCI device */
-    spcr->pci_vendor_id = 0xffff;  /* PCI Vendor ID: not a PCI device */
+    /* Interface Type */
+    build_append_int_noprefix(table_data, 3, 1); /* ARM PL011 UART */
+    build_append_int_noprefix(table_data, 0, 3); /* Reserved */
+    /* Base Address */
+    build_append_gas(table_data, AML_AS_SYSTEM_MEMORY, 8, 0, 1,
+                     vms->memmap[VIRT_UART].base);
+    /* Interrupt Type */
+    build_append_int_noprefix(table_data,
+        (1 << 3) /* Bit[3] ARMH GIC interrupt */, 1);
+    build_append_int_noprefix(table_data, 0, 1); /* IRQ */
+    /* Global System Interrupt */
+    build_append_int_noprefix(table_data,
+                              vms->irqmap[VIRT_UART] + ARM_SPI_BASE, 4);
+    build_append_int_noprefix(table_data, 3 /* 9600 */, 1); /* Baud Rate */
+    build_append_int_noprefix(table_data, 0 /* No Parity */, 1); /* Parity */
+    /* Stop Bits */
+    build_append_int_noprefix(table_data, 1 /* 1 Stop bit */, 1);
+    /* Flow Control */
+    build_append_int_noprefix(table_data,
+        (1 << 1) /* RTS/CTS hardware flow control */, 1);
+    /* Terminal Type */
+    build_append_int_noprefix(table_data, 0 /* VT100 */, 1);
+    build_append_int_noprefix(table_data, 0, 1); /* Language */
+    /* PCI Device ID  */
+    build_append_int_noprefix(table_data, 0xffff /* not a PCI device*/, 2);
+    /* PCI Vendor ID */
+    build_append_int_noprefix(table_data, 0xffff /* not a PCI device*/, 2);
+    build_append_int_noprefix(table_data, 0, 1); /* PCI Bus Number */
+    build_append_int_noprefix(table_data, 0, 1); /* PCI Device Number */
+    build_append_int_noprefix(table_data, 0, 1); /* PCI Function Number */
+    build_append_int_noprefix(table_data, 0, 4); /* PCI Flags */
+    build_append_int_noprefix(table_data, 0, 1); /* PCI Segment */
+    build_append_int_noprefix(table_data, 0, 4); /* Reserved */
 
-    build_header(linker, table_data, (void *)(table_data->data + spcr_start),
-                 "SPCR", table_data->len - spcr_start, 2, vms->oem_id,
-                 vms->oem_table_id);
+    acpi_table_end(linker, &table);
 }
 
 /*
-- 
2.27.0

[PATCH v3 32/35] acpi: arm/virt: build_gtdt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[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, replace packed structure with endian agnostic
build_append_FOO() API.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
---
v3:
  * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/

CC: drjones@redhat.com
CC: peter.maydell@linaro.org
CC: shannon.zhaosl@gmail.com
CC: qemu-arm@nongnu.org
---
 include/hw/acpi/acpi-defs.h | 25 -------------
 hw/arm/virt-acpi-build.c    | 75 ++++++++++++++++++++++++-------------
 2 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 012c4ffb3a..0b375e7589 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index ea783128a9..ebe9d1726f 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -553,40 +553,61 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
     acpi_table_end(linker, &table);
 }
 
-/* GTDT */
+/*
+ * ACPI spec, Revision 5.1
+ * 5.2.24 Generic Timer Description Table (GTDT)
+ */
 static void
 build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
 {
     VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
-    int gtdt_start = table_data->len;
-    AcpiGenericTimerTable *gtdt;
-    uint32_t irqflags;
-
-    if (vmc->claim_edge_triggered_timers) {
-        irqflags = ACPI_GTDT_INTERRUPT_MODE_EDGE;
-    } else {
-        irqflags = ACPI_GTDT_INTERRUPT_MODE_LEVEL;
-    }
-
-    gtdt = acpi_data_push(table_data, sizeof *gtdt);
-    /* The interrupt values are the same with the device tree when adding 16 */
-    gtdt->secure_el1_interrupt = cpu_to_le32(ARCH_TIMER_S_EL1_IRQ + 16);
-    gtdt->secure_el1_flags = cpu_to_le32(irqflags);
-
-    gtdt->non_secure_el1_interrupt = cpu_to_le32(ARCH_TIMER_NS_EL1_IRQ + 16);
-    gtdt->non_secure_el1_flags = cpu_to_le32(irqflags |
-                                             ACPI_GTDT_CAP_ALWAYS_ON);
+    /*
+     * Table 5-117 Flag Definitions
+     * set only "Timer interrupt Mode" and assume "Timer Interrupt
+     * polarity" bit as '0: Interrupt is Active high'
+     */
+    uint32_t irqflags = vmc->claim_edge_triggered_timers ?
+        1 : /* Interrupt is Edge triggered */
+        0;  /* Interrupt is Level triggered  */
+    AcpiTable table = { .sig = "GTDT", .rev = 2, .oem_id = vms->oem_id,
+                        .oem_table_id = vms->oem_table_id };
 
-    gtdt->virtual_timer_interrupt = cpu_to_le32(ARCH_TIMER_VIRT_IRQ + 16);
-    gtdt->virtual_timer_flags = cpu_to_le32(irqflags);
+    acpi_table_begin(&table, table_data);
 
-    gtdt->non_secure_el2_interrupt = cpu_to_le32(ARCH_TIMER_NS_EL2_IRQ + 16);
-    gtdt->non_secure_el2_flags = cpu_to_le32(irqflags);
+    /* CntControlBase Physical Address */
+    /* FIXME: invalid value, should be 0xFFFFFFFFFFFFFFFF if not impl. ? */
+    build_append_int_noprefix(table_data, 0, 8);
+    build_append_int_noprefix(table_data, 0, 4); /* Reserved */
+    /*
+     * FIXME: clarify comment:
+     * The interrupt values are the same with the device tree when adding 16
+     */
+    /* Secure EL1 timer GSIV */
+    build_append_int_noprefix(table_data, ARCH_TIMER_S_EL1_IRQ + 16, 4);
+    /* Secure EL1 timer Flags */
+    build_append_int_noprefix(table_data, irqflags, 4);
+    /* Non-Secure EL1 timer GSIV */
+    build_append_int_noprefix(table_data, ARCH_TIMER_NS_EL1_IRQ + 16, 4);
+    /* Non-Secure EL1 timer Flags */
+    build_append_int_noprefix(table_data, irqflags |
+                              1UL << 2, /* Always-on Capability */
+                              4);
+    /* Virtual timer GSIV */
+    build_append_int_noprefix(table_data, ARCH_TIMER_VIRT_IRQ + 16, 4);
+    /* Virtual Timer Flags */
+    build_append_int_noprefix(table_data, irqflags, 4);
+    /* Non-Secure EL2 timer GSIV */
+    build_append_int_noprefix(table_data, ARCH_TIMER_NS_EL2_IRQ + 16, 4);
+    /* Non-Secure EL2 timer Flags */
+    build_append_int_noprefix(table_data, irqflags, 4);
+    /* CntReadBase Physical address */
+    build_append_int_noprefix(table_data, 0, 8);
+    /* Platform Timer Count */
+    build_append_int_noprefix(table_data, 0, 4);
+    /* Platform Timer Offset */
+    build_append_int_noprefix(table_data, 0, 4);
 
-    build_header(linker, table_data,
-                 (void *)(table_data->data + gtdt_start), "GTDT",
-                 table_data->len - gtdt_start, 2, vms->oem_id,
-                 vms->oem_table_id);
+    acpi_table_end(linker, &table);
 }
 
 /*
-- 
2.27.0

[PATCH v3 33/35] acpi: build_facs: use build_append_int_noprefix() API to compose table

[Igor Mammedov]

Drop usage of packed structures and explicit endian
conversions when building table and use endian agnostic
build_append_int_noprefix() API to build it.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
CC: marcel.apfelbaum@gmail.com
---
 include/hw/acpi/acpi-defs.h | 14 --------------
 include/hw/acpi/aml-build.h |  1 +
 hw/acpi/aml-build.c         |  2 +-
 hw/i386/acpi-build.c        | 18 ++++++++++++++----
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 0b375e7589..1a0774edd6 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index 6e1f42e119..6f3d1de1b1 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -413,6 +413,7 @@ 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);
+void build_append_byte(GArray *array, uint8_t val);
 
 typedef struct AcpiTable {
     const char *sig;
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 050fdb3f37..4135b385e5 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -47,7 +47,7 @@ static void build_prepend_byte(GArray *array, uint8_t val)
     g_array_prepend_val(array, val);
 }
 
-static void build_append_byte(GArray *array, uint8_t val)
+void build_append_byte(GArray *array, uint8_t val)
 {
     g_array_append_val(array, val);
 }
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 9f888d5a2c..547cd4ed9d 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -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)
-- 
2.27.0

[PATCH v3 34/35] acpi: remove no longer used build_header()

[Igor Mammedov]

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 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(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 1a0774edd6..ee733840aa 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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 */
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index 6f3d1de1b1..b8272c239a 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -445,10 +445,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);
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 4135b385e5..b261ecfbc1 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -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;
-- 
2.27.0

[PATCH v3 35/35] acpi: AcpiGenericAddress no longer used to map/access fields of MMIO, drop packed attribute

[Igor Mammedov]

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 include/hw/acpi/acpi-defs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index ee733840aa..c97e8633ad 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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 */
-- 
2.27.0

Re: [PATCH v3 03/35] acpi: build_xsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

Hi,

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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
> entries to other tables (which also removes some manual offset
> calculations).
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>

> ---
> 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         | 27 ++++++++++++---------------
>  2 files changed, 12 insertions(+), 25 deletions(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index ccfa3382aa..f6d2ca172b 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -149,16 +149,6 @@ struct AcpiSerialPortConsoleRedirection {
>  typedef struct AcpiSerialPortConsoleRedirection
>                 AcpiSerialPortConsoleRedirection;
>  
> -/*
> - * ACPI 2.0 eXtended System Description Table (XSDT)
nit: you may move that comment to aml-build.c

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric
> - */
> -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)
>   */
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 32f14d4a78..daefc132f3 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -1916,27 +1916,24 @@ 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,
> 

Re: [PATCH v3 02/35] acpi: build_rsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

Hi,

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> it 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).
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>

> ---
> 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         | 27 ++++++++++++---------------
>  2 files changed, 12 insertions(+), 25 deletions(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index cf9f44299c..ccfa3382aa 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -149,16 +149,6 @@ struct AcpiSerialPortConsoleRedirection {
>  typedef struct AcpiSerialPortConsoleRedirection
>                 AcpiSerialPortConsoleRedirection;
>  
> -/*
> - * ACPI 1.0 Root System Description Table (RSDT)
nit: you may move that comment to aml-build.c

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric
> - */
> -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)
>   */
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 229a3eb654..32f14d4a78 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -1890,27 +1890,24 @@ 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;
> +
> +        /* reserve space for entry */
> +        build_append_int_noprefix(table.array, 0, 4);
>  
> -        /* rsdt->table_offset_entry to be filled by Guest linker */
> +        /* 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 */
> 

Re: [PATCH v3 01/35] acpi: add helper routines to initialize ACPI tables

[Eric Auger]

Hi Igor,

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> CC: eric.auger@redhat.com
> CC: wangyanan55@huawei.com
> ---
>  include/hw/acpi/aml-build.h | 31 +++++++++++++++++++
>  hw/acpi/aml-build.c         | 62 +++++++++++++++++++++++++++++++++++++
>  2 files changed, 93 insertions(+)
>
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index 471266d739..4242382399 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -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,
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index d5103e6d7b..229a3eb654 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -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,
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

Re: [PATCH v3 04/35] acpi: build_slit: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

> ---
> 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(-)
> 
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index daefc132f3..e54face23d 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -1954,11 +1954,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++) {
> @@ -1969,11 +1970,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 */
> 

Re: [PATCH v3 05/35] acpi: build_fadt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric
> ---
> 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(-)
> 
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index e54face23d..dbf3ffe889 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -1978,9 +1978,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;
> @@ -2044,7 +2045,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 */
> @@ -2081,7 +2082,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 */
> @@ -2092,9 +2093,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
> 

Re: [PATCH v3 07/35] acpi: acpi_build_hest: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Dongjiu Geng <gengdongjiu1@gmail.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric
> ---
> v3:
>   * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> 
> CC: qemu-arm@nongnu.org
> CC: drjones@redhat.com
> CC: gengdongjiu1@gmail.com
> CC: eauger@redhat.com
> ---
>  hw/acpi/ghes.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c
> index a749b84d62..45d9a809cc 100644
> --- a/hw/acpi/ghes.c
> +++ b/hw/acpi/ghes.c
> @@ -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,
> 

Re: [PATCH v3 08/35] acpi: build_mcfg: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric
> ---
> 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(-)
> 
> diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c
> index 75b1103ec4..20b70dcd81 100644
> --- a/hw/acpi/pci.c
> +++ b/hw/acpi/pci.c
> @@ -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);
>  }
> 

Re: [PATCH v3 09/35] acpi: build_hmat: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

Hi Igor,

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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.
> 
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eruc
> ---
> 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(-)
> 
> diff --git a/hw/acpi/hmat.c b/hw/acpi/hmat.c
> index edb3fd91b2..6913ebf730 100644
> --- a/hw/acpi/hmat.c
> +++ b/hw/acpi/hmat.c
> @@ -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);
>  }
> 

Re: [PATCH v3 10/35] acpi: nvdimm_build_nfit: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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.
> 
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

> ---
> v3:
>   * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> 
> CC: xiaoguangrong.eric@gmail.com
> ---
>  hw/acpi/nvdimm.c | 42 +++++++++++++++++-------------------------
>  1 file changed, 17 insertions(+), 25 deletions(-)
> 
> diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
> index e3d5fe1939..15f6ca82ca 100644
> --- a/hw/acpi/nvdimm.c
> +++ b/hw/acpi/nvdimm.c
> @@ -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
> 

Re: [PATCH v3 11/35] acpi: nvdimm_build_ssdt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

Hi Igor,

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> v3:
>   * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> 
> CC: xiaoguangrong.eric@gmail.com
> ---
>  hw/acpi/nvdimm.c | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
> index 15f6ca82ca..e050b47c2b 100644
> --- a/hw/acpi/nvdimm.c
> +++ b/hw/acpi/nvdimm.c
> @@ -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 recalculates checksum which were
> +     * scheduled by acpi_table_composed()
s/acpi_table_composed/acpi_table_end.

also the sentence may need some rewording.

Wonder if that kind of comment still is useful. Maybe this should be put
once in the doc comment of acpi_table_end() in [PATCH v3 01/35] acpi:
add helper routines to initialize ACPI tables, for future users to pay
attention that it shall be called at the very end.

Besides

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric


> +     */
> +    acpi_table_end(linker, &table);
>  }
>  
>  void nvdimm_build_srat(GArray *table_data)
> 

Re: [PATCH v3 02/35] acpi: build_rsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Igor Mammedov]

On Mon, 20 Sep 2021 18:21:22 +0200
Eric Auger <eauger@redhat.com> wrote:

> Hi,
> 
> On 9/7/21 4:47 PM, Igor Mammedov wrote:
> > it 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).
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>  
> 
> > ---
> > 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         | 27 ++++++++++++---------------
> >  2 files changed, 12 insertions(+), 25 deletions(-)
> > 
> > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> > index cf9f44299c..ccfa3382aa 100644
> > --- a/include/hw/acpi/acpi-defs.h
> > +++ b/include/hw/acpi/acpi-defs.h
> > @@ -149,16 +149,6 @@ struct AcpiSerialPortConsoleRedirection {
> >  typedef struct AcpiSerialPortConsoleRedirection
> >                 AcpiSerialPortConsoleRedirection;
> >  
> > -/*
> > - * ACPI 1.0 Root System Description Table (RSDT)  
> nit: you may move that comment to aml-build.c

yep, existing build_rsdt/build_xsdt are missing expected spec
reference comment. I'll post an additional patch to fix it.

> 
> Reviewed-by: Eric Auger <eric.auger@redhat.com>

Thanks!

> 
> Eric
> > - */
> > -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)
> >   */
> > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> > index 229a3eb654..32f14d4a78 100644
> > --- a/hw/acpi/aml-build.c
> > +++ b/hw/acpi/aml-build.c
> > @@ -1890,27 +1890,24 @@ 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;
> > +
> > +        /* reserve space for entry */
> > +        build_append_int_noprefix(table.array, 0, 4);
> >  
> > -        /* rsdt->table_offset_entry to be filled by Guest linker */
> > +        /* 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 */
> >   
> 

Re: [PATCH v3 12/35] acpi: vmgenid_build_acpi: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> v3:
>   * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> ---
>  hw/acpi/vmgenid.c | 16 +++++++---------
>  1 file changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c
> index 4f41a13ea0..95f94a2510 100644
> --- a/hw/acpi/vmgenid.c
> +++ b/hw/acpi/vmgenid.c
> @@ -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,15 +44,12 @@ 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");
> +    vgia_offset = table_data->len + build_append_named_dword(ssdt->buf, "VGIA");
not mandated but well

>      scope = aml_scope("\\_SB");
>      dev = aml_device("VGEN");
>      aml_append(dev, aml_name_decl("_HID", aml_string("QEMUVGID")));
> @@ -116,9 +115,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 */
ditto
> +    acpi_table_end(linker, &table);
>      free_aml_allocator();
>  }
>  
> 
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

Re: [PATCH v3 15/35] acpi: build_tpm_tcpa: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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 <imammedo@redhat.com>
> ---
> v2:
>   * fix assert when starting QEMU with TPM 1.2
>       Stefan Berger <stefanb@linux.ibm.com>
> 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/
> 
> CC: stefanb@linux.vnet.ibm.com
> ---
>  include/hw/acpi/acpi-defs.h | 14 --------------
>  hw/i386/acpi-build.c        | 38 ++++++++++++++++++++++---------------
>  2 files changed, 23 insertions(+), 29 deletions(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index 4d8f8b34b0..3b42b138f0 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 7cfa0cf825..c329580cff 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -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
>  
> 
Looks good to me

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

Re: [PATCH v3 16/35] acpi: arm/x86: build_srat: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

Hi Igor,

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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.
nit: also removes AcpiSystemResourceAffinityTable and use
build_append_int_noprefix for reserved fields
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> v3:
>   * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> 
> CC: shannon.zhaosl@gmail.com
> CC: peter.maydell@linaro.org
> CC: marcel.apfelbaum@gmail.com
> CC: qemu-arm@nongnu.org
> CC: drjones@redhat.com
> CC: eauger@redhat.com
> ---
>  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(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index 3b42b138f0..5826ee04b6 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -358,17 +358,6 @@ struct AcpiGenericTimerTable {
>  } QEMU_PACKED;
>  typedef struct AcpiGenericTimerTable AcpiGenericTimerTable;
>  
> -/*
> - * SRAT (NUMA topology description) table
Missing version reference if any
https://uefi.org/specs/ACPI/6.4/05_ACPI_Software_Programming_Model/ACPI_Software_Programming_Model.html#system-resource-affinity-table-srat
5.2.16. System Resource Affinity Table (SRAT)

> - */
> -
> -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
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 037cc1fd82..21efe7fe34 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -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 */
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index c329580cff..41c0a63b30 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -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 hotplugabble_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);
>  }
>  
>  /*
> 
Besides

Reviewed-by: Eric Auger <eric.auger@redhat.com>


Eric

Re: [PATCH v3 17/35] acpi: use build_append_int_noprefix() API to compose SRAT table

[Eric Auger]

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> Drop 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> v3:
>  * rebase on top of (e77af21a7a2 hw/i386/acpi-build: Get NUMA information from struct NumaState)
> CC: xiaoguangrong.eric@gmail.com
> CC: shannon.zhaosl@gmail.com
> CC: peter.maydell@linaro.org
> CC: marcel.apfelbaum@gmail.com
> CC: qemu-arm@nongnu.org
> CC: drjones@redhat.com
> CC: eauger@redhat.com
> ---
>  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(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index 5826ee04b6..d293304f9c 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index 4242382399..6e1f42e119 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -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,
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 5e8bfb631c..050fdb3f37 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -1936,15 +1936,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 */
>  }
>  
>  /*
> diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
> index e050b47c2b..baab81f7a6 100644
> --- a/hw/acpi/nvdimm.c
> +++ b/hw/acpi/nvdimm.c
> @@ -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);
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 21efe7fe34..6ba02cf281 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -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);
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 41c0a63b30..51e0ba07b6 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1917,13 +1917,15 @@ build_tpm_tcpa(GArray *table_data, BIOSLinker *linker, GArray *tcpalog,
>  #define HOLE_640K_START  (640 * KiB)
>  #define HOLE_640K_END   (1 * MiB)
>  
> +/*
> + * ACPI spec, Revision 3.0
> + * 5.2.15 System Resource Affinity Table (SRAT)
> + */
>  static void
>  build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>  {
> -    AcpiSratMemoryAffinity *numamem;
> -
>      int i;
> -    int numa_start, slots;
> +    int numa_mem_start, slots;
>      uint64_t mem_len, mem_base, next_base;
>      MachineClass *mc = MACHINE_GET_CLASS(machine);
>      X86MachineState *x86ms = X86_MACHINE(machine);
> @@ -1946,34 +1948,41 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>          uint32_t apic_id = apic_ids->cpus[i].arch_id;
>  
>          if (apic_id < 255) {
> -            AcpiSratProcessorAffinity *core;
> -
> -            core = acpi_data_push(table_data, sizeof *core);
> -            core->type = ACPI_SRAT_PROCESSOR_APIC;
> -            core->length = sizeof(*core);
> -            core->local_apic_id = apic_id;
> -            core->proximity_lo = node_id;
> -            memset(core->proximity_hi, 0, 3);
> -            core->local_sapic_eid = 0;
> -            core->flags = cpu_to_le32(1);
> +            /* 5.2.15.1 Processor Local APIC/SAPIC Affinity Structure */
> +            build_append_int_noprefix(table_data, 0, 1);  /* Type  */
> +            build_append_int_noprefix(table_data, 16, 1); /* Length */
> +            /* Proximity Domain [7:0] */
> +            build_append_int_noprefix(table_data, node_id, 1);
> +            build_append_int_noprefix(table_data, apic_id, 1); /* APIC ID */
> +            /* Flags, Table 5-36 */
> +            build_append_int_noprefix(table_data, 1, 4);
> +            build_append_int_noprefix(table_data, 0, 1); /* Local SAPIC EID */
> +            /* Proximity Domain [31:8] */
> +            build_append_int_noprefix(table_data, 0, 3);
> +            build_append_int_noprefix(table_data, 0, 4); /* Reserved */
clock domain?
>          } else {
> -            AcpiSratProcessorX2ApicAffinity *core;
> -
> -            core = acpi_data_push(table_data, sizeof *core);
> -            core->type = ACPI_SRAT_PROCESSOR_x2APIC;
> -            core->length = sizeof(*core);
> -            core->x2apic_id = cpu_to_le32(apic_id);
> -            core->proximity_domain = cpu_to_le32(node_id);
> -            core->flags = cpu_to_le32(1);
> +            /*
> +             * ACPI spec, Revision 4.0
> +             * 5.2.16.3 Processor Local x2APIC Affinity Structure
> +             */
> +            build_append_int_noprefix(table_data, 2, 1);  /* Type  */
> +            build_append_int_noprefix(table_data, 24, 1); /* Length */
> +            build_append_int_noprefix(table_data, 0, 2); /* Reserved */
> +            /* Proximity Domain */
> +            build_append_int_noprefix(table_data, node_id, 4);
> +            build_append_int_noprefix(table_data, apic_id, 4); /* X2APIC ID */
> +            /* Flags, Table 5-39 */
> +            build_append_int_noprefix(table_data, 1 /* Enabled */, 4);
> +            build_append_int_noprefix(table_data, 0, 4); /* Clock Domain */
> +            build_append_int_noprefix(table_data, 0, 4); /* Reserved */
>          }
>      }
>  
> -
>      /* the memory map is a bit tricky, it contains at least one hole
>       * from 640k-1M and possibly another one from 3.5G-4G.
>       */
>      next_base = 0;
> -    numa_start = table_data->len;
> +    numa_mem_start = table_data->len;
>  
>      for (i = 1; i < nb_numa_nodes + 1; ++i) {
>          mem_base = next_base;
> @@ -1985,8 +1994,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>              next_base > HOLE_640K_START) {
>              mem_len -= next_base - HOLE_640K_START;
>              if (mem_len > 0) {
> -                numamem = acpi_data_push(table_data, sizeof *numamem);
> -                build_srat_memory(numamem, mem_base, mem_len, i - 1,
> +                build_srat_memory(table_data, mem_base, mem_len, i - 1,
>                                    MEM_AFFINITY_ENABLED);
>              }
>  
> @@ -2004,8 +2012,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>              next_base > x86ms->below_4g_mem_size) {
>              mem_len -= next_base - x86ms->below_4g_mem_size;
>              if (mem_len > 0) {
> -                numamem = acpi_data_push(table_data, sizeof *numamem);
> -                build_srat_memory(numamem, mem_base, mem_len, i - 1,
> +                build_srat_memory(table_data, mem_base, mem_len, i - 1,
>                                    MEM_AFFINITY_ENABLED);
>              }
>              mem_base = 1ULL << 32;
> @@ -2014,8 +2021,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>          }
>  
>          if (mem_len > 0) {
> -            numamem = acpi_data_push(table_data, sizeof *numamem);
> -            build_srat_memory(numamem, mem_base, mem_len, i - 1,
> +            build_srat_memory(table_data, mem_base, mem_len, i - 1,
>                                MEM_AFFINITY_ENABLED);
>          }
>      }
> @@ -2024,10 +2030,15 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>          nvdimm_build_srat(table_data);
>      }
>  
> -    slots = (table_data->len - numa_start) / sizeof *numamem;
> +    /*
> +     * TODO: this part is not in ACPI spec and current linux kernel boots fine
> +     * without these entries. But I recall there were issues the last time I
> +     * tried to remove it with some ancient guest OS, however I can't remember
> +     * what that was so keep this around for now
> +     */
> +    slots = (table_data->len - numa_mem_start) / 40 /* mem affinity len */;
>      for (; slots < nb_numa_nodes + 2; slots++) {
> -        numamem = acpi_data_push(table_data, sizeof *numamem);
> -        build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
> +        build_srat_memory(table_data, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
>      }
>  
>      /*
> @@ -2039,8 +2050,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>       * providing _PXM method if necessary.
>       */
>      if (hotplugabble_address_space_size) {
> -        numamem = acpi_data_push(table_data, sizeof *numamem);
> -        build_srat_memory(numamem, machine->device_memory->base,
> +        build_srat_memory(table_data, machine->device_memory->base,
>                            hotplugabble_address_space_size, nb_numa_nodes - 1,
>                            MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
>      }
> 
Besides
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

Re: [PATCH v3 18/35] acpi: build_dmar_q35: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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 tables.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> 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/
> 
> CC: wangxingang5@huawei.com
> CC: marcel.apfelbaum@gmail.com
> ---
>  include/hw/acpi/acpi-defs.h | 68 --------------------------
>  hw/i386/acpi-build.c        | 97 ++++++++++++++++++++-----------------
>  2 files changed, 53 insertions(+), 112 deletions(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index d293304f9c..c4f0a202e8 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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",
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 51e0ba07b6..2875c4f393 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -2064,8 +2064,9 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>  static void
>  insert_scope(PCIBus *bus, PCIDevice *dev, void *opaque)
>  {
> +    const size_t device_scope_size = 6 /* device scope structure */ +
> +                                     2 /* 1 path entry */;
>      GArray *scope_blob = opaque;
> -    AcpiDmarDeviceScope *scope = NULL;
>  
>      if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {
>          /* Dmar Scope Type: 0x02 for PCI Bridge */
> @@ -2076,8 +2077,7 @@ insert_scope(PCIBus *bus, PCIDevice *dev, void *opaque)
>      }
>  
>      /* length */
> -    build_append_int_noprefix(scope_blob,
> -                              sizeof(*scope) + sizeof(scope->path[0]), 1);
> +    build_append_int_noprefix(scope_blob, device_scope_size, 1);
>      /* reserved */
>      build_append_int_noprefix(scope_blob, 0, 2);
>      /* enumeration_id */
> @@ -2109,26 +2109,31 @@ dmar_host_bridges(Object *obj, void *opaque)
>  }
>  
>  /*
> - * VT-d spec 8.1 DMA Remapping Reporting Structure
> - * (version Oct. 2014 or later)
> + * Intel ® Virtualization Technology for Directed I/O
> + * Architecture Specification. Revision 3.3
> + * 8.1 DMA Remapping Reporting Structure
>   */
>  static void
>  build_dmar_q35(GArray *table_data, BIOSLinker *linker, const char *oem_id,
>                 const char *oem_table_id)
>  {
> -    int dmar_start = table_data->len;
> -
> -    AcpiTableDmar *dmar;
> -    AcpiDmarHardwareUnit *drhd;
> -    AcpiDmarRootPortATS *atsr;
>      uint8_t dmar_flags = 0;
> +    uint8_t rsvd10[10] = {};
> +    /* Root complex IOAPIC uses one path only */
> +    const size_t ioapic_scope_size = 6 /* device scope structure */ +
> +                                     2 /* 1 path entry */;
>      X86IOMMUState *iommu = x86_iommu_get_default();
> -    AcpiDmarDeviceScope *scope = NULL;
> -    /* Root complex IOAPIC use one path[0] only */
> -    size_t ioapic_scope_size = sizeof(*scope) + sizeof(scope->path[0]);
>      IntelIOMMUState *intel_iommu = INTEL_IOMMU_DEVICE(iommu);
>      GArray *scope_blob = g_array_new(false, true, 1);
>  
> +    AcpiTable table = { .sig = "DMAR", .rev = 1, .oem_id = oem_id,
> +                        .oem_table_id = oem_table_id };
> +
> +    assert(iommu);
> +    if (x86_iommu_ir_supported(iommu)) {
> +        dmar_flags |= 0x1;      /* Flags: 0x1: INT_REMAP */
> +    }
> +
>      /*
>       * A PCI bus walk, for each PCI host bridge.
>       * Insert scope for each PCI bridge and endpoint device which
> @@ -2137,48 +2142,52 @@ build_dmar_q35(GArray *table_data, BIOSLinker *linker, const char *oem_id,
>      object_child_foreach_recursive(object_get_root(),
>                                     dmar_host_bridges, scope_blob);
>  
> -    assert(iommu);
> -    if (x86_iommu_ir_supported(iommu)) {
> -        dmar_flags |= 0x1;      /* Flags: 0x1: INT_REMAP */
> -    }
why this move?
> -
> -    dmar = acpi_data_push(table_data, sizeof(*dmar));
> -    dmar->host_address_width = intel_iommu->aw_bits - 1;
> -    dmar->flags = dmar_flags;
> -
> -    /* DMAR Remapping Hardware Unit Definition structure */
> -    drhd = acpi_data_push(table_data, sizeof(*drhd) + ioapic_scope_size);
> -    drhd->type = cpu_to_le16(ACPI_DMAR_TYPE_HARDWARE_UNIT);
> -    drhd->length =
> -        cpu_to_le16(sizeof(*drhd) + ioapic_scope_size + scope_blob->len);
> -    drhd->flags = 0;            /* Don't include all pci device */
> -    drhd->pci_segment = cpu_to_le16(0);
> -    drhd->address = cpu_to_le64(Q35_HOST_BRIDGE_IOMMU_ADDR);
> +    acpi_table_begin(&table, table_data);
> +    /* Host Address Width */
> +    build_append_int_noprefix(table_data, intel_iommu->aw_bits - 1, 1);
> +    build_append_int_noprefix(table_data, dmar_flags, 1); /* Flags */
> +    g_array_append_vals(table_data, rsvd10, sizeof(rsvd10)); /* Reserved */
> +
> +    /* 8.3 DMAR Remapping Hardware Unit Definition structure */
> +    build_append_int_noprefix(table_data, 0, 2); /* Type */
> +    /* Length */
> +    build_append_int_noprefix(table_data,
> +                              16 + ioapic_scope_size + scope_blob->len, 2);
> +    /* Flags */
> +    build_append_int_noprefix(table_data, 0 /* Don't include all pci device */ ,
> +                              1);
> +    build_append_int_noprefix(table_data, 0 , 1); /* Reserved */
> +    build_append_int_noprefix(table_data, 0 , 2); /* Segment Number */
> +    /* Register Base Address */
> +    build_append_int_noprefix(table_data, Q35_HOST_BRIDGE_IOMMU_ADDR , 8);
>  
>      /* Scope definition for the root-complex IOAPIC. See VT-d spec
>       * 8.3.1 (version Oct. 2014 or later). */
> -    scope = &drhd->scope[0];
> -    scope->entry_type = 0x03;   /* Type: 0x03 for IOAPIC */
> -    scope->length = ioapic_scope_size;
> -    scope->enumeration_id = ACPI_BUILD_IOAPIC_ID;
> -    scope->bus = Q35_PSEUDO_BUS_PLATFORM;
> -    scope->path[0].device = PCI_SLOT(Q35_PSEUDO_DEVFN_IOAPIC);
> -    scope->path[0].function = PCI_FUNC(Q35_PSEUDO_DEVFN_IOAPIC);
> +    build_append_int_noprefix(table_data, 0x03 /* IOAPIC */, 1); /* Type */
> +    build_append_int_noprefix(table_data, ioapic_scope_size, 1); /* Length */
> +    build_append_int_noprefix(table_data, 0, 2); /* Reserved */
> +    /* Enumeration ID */
> +    build_append_int_noprefix(table_data, ACPI_BUILD_IOAPIC_ID, 1);
> +    /* Start Bus Number */
> +    build_append_int_noprefix(table_data, Q35_PSEUDO_BUS_PLATFORM, 1);
> +    /* Path, {Device, Function} pair */
> +    build_append_int_noprefix(table_data, PCI_SLOT(Q35_PSEUDO_DEVFN_IOAPIC), 1);
> +    build_append_int_noprefix(table_data, PCI_FUNC(Q35_PSEUDO_DEVFN_IOAPIC), 1);
>  
>      /* Add scope found above */
>      g_array_append_vals(table_data, scope_blob->data, scope_blob->len);
>      g_array_free(scope_blob, true);
>  
>      if (iommu->dt_supported) {
> -        atsr = acpi_data_push(table_data, sizeof(*atsr));
> -        atsr->type = cpu_to_le16(ACPI_DMAR_TYPE_ATSR);
> -        atsr->length = cpu_to_le16(sizeof(*atsr));
> -        atsr->flags = ACPI_DMAR_ATSR_ALL_PORTS;
> -        atsr->pci_segment = cpu_to_le16(0);
> +        /* 8.5 Root Port ATS Capability Reporting Structure */
> +        build_append_int_noprefix(table_data, 2, 2); /* Type */
> +        build_append_int_noprefix(table_data, 8, 2); /* Length */
8 + no device scope
> +        build_append_int_noprefix(table_data, 1 /* ALL_PORTS */, 1); /* Flags */
> +        build_append_int_noprefix(table_data, 0, 1); /* Reserved */
> +        build_append_int_noprefix(table_data, 0, 2); /* Segment Number */
>      }
>  
> -    build_header(linker, table_data, (void *)(table_data->data + dmar_start),
> -                 "DMAR", table_data->len - dmar_start, 1, oem_id, oem_table_id);
> +    acpi_table_end(linker, &table);
>  }
>  
>  /*
> 
Besides
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

Re: [PATCH v3 19/35] acpi: build_waet: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> v3:
>   * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> 
> CC: marcel.apfelbaum@gmail.com
> ---
>  hw/i386/acpi-build.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 2875c4f393..45724469b0 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -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);
>  }
>  
>  /*
> 
an easy one

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

Re: [PATCH v3 20/35] acpi: build_amd_iommu: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:47 PM, Igor Mammedov wrote:
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> v3:
>   * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> 
> CC: marcel.apfelbaum@gmail.com
> ---
>  hw/i386/acpi-build.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 45724469b0..9f888d5a2c 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -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
> 
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

Re: [PATCH v3 21/35] acpi: madt: arm/x86: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:48 PM, Igor Mammedov wrote:
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> v3:
>   * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> 
> CC: marcel.apfelbaum@gmail.com
> CC: shannon.zhaosl@gmail.com
> CC: peter.maydell@linaro.org
> CC: qemu-arm@nongnu.org
> CC: drjones@redhat.com
> CC: eauger@redhat.com
> ---
>  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(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index c4f0a202e8..c7fa5caa06 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 6ba02cf281..e3bdcd44e8 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -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 */
> diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
> index 1f5947fcf9..a0cde1d874 100644
> --- a/hw/i386/acpi-common.c
> +++ b/hw/i386/acpi-common.c
> @@ -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);
>  }
>  
> 
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

Re: [PATCH v3 22/35] acpi: x86: remove dead code

[Eric Auger]

On 9/7/21 4:48 PM, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
>  include/hw/acpi/acpi-defs.h | 13 -------------
>  1 file changed, 13 deletions(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index c7fa5caa06..af4fa412a5 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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
> 

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

Re: [PATCH v3 23/35] acpi: x86: set enabled when composing _MAT entries

[Eric Auger]

On 9/7/21 4:48 PM, Igor Mammedov wrote:
> Instead 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> CC: marcel.apfelbaum@gmail.com
> ---
>  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(-)
> 
> diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h
> index 769ff55c7e..ea6056ab92 100644
> --- a/include/hw/acpi/acpi_dev_interface.h
> +++ b/include/hw/acpi/acpi_dev_interface.h
> @@ -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
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 4d2e35a152..82cf7b7e30 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -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;
> diff --git a/hw/acpi/acpi-x86-stub.c b/hw/acpi/acpi-x86-stub.c
> index e9e46c5c5f..3df1e090f4 100644
> --- a/hw/acpi/acpi-x86-stub.c
> +++ b/hw/acpi/acpi-x86-stub.c
> @@ -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)
>  {
>  }
>  
> diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
> index f82e9512fd..b20903ea30 100644
> --- a/hw/acpi/cpu.c
> +++ b/hw/acpi/cpu.c
> @@ -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);
> diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
> index a0cde1d874..7983a13a93 100644
> --- a/hw/i386/acpi-common.c
> +++ b/hw/i386/acpi-common.c
> @@ -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;
>          }
> 
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

Re: [PATCH v3 26/35] acpi: build_dsdt_microvm: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:48 PM, Igor Mammedov wrote:
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric
> ---
> v3:
>   * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> 
> CC: marcel.apfelbaum@gmail.com
> CC: kraxel@redhat.com
> ---
>  hw/i386/acpi-microvm.c | 13 ++++++-------
>  1 file changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c
> index 1a0f77b911..196d318499 100644
> --- a/hw/i386/acpi-microvm.c
> +++ b/hw/i386/acpi-microvm.c
> @@ -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();
>  }
>  
> 

Re: [PATCH v3 17/35] acpi: use build_append_int_noprefix() API to compose SRAT table

[Igor Mammedov]

On Wed, 22 Sep 2021 10:55:20 +0200
Eric Auger <eauger@redhat.com> wrote:

> On 9/7/21 4:47 PM, Igor Mammedov wrote:
> > Drop 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.
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > v3:
> >  * rebase on top of (e77af21a7a2 hw/i386/acpi-build: Get NUMA information from struct NumaState)
> > CC: xiaoguangrong.eric@gmail.com
> > CC: shannon.zhaosl@gmail.com
> > CC: peter.maydell@linaro.org
> > CC: marcel.apfelbaum@gmail.com
> > CC: qemu-arm@nongnu.org
> > CC: drjones@redhat.com
> > CC: eauger@redhat.com
> > ---
> >  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(-)
> > 
> > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> > index 5826ee04b6..d293304f9c 100644
> > --- a/include/hw/acpi/acpi-defs.h
> > +++ b/include/hw/acpi/acpi-defs.h
> > @@ -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
> > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> > index 4242382399..6e1f42e119 100644
> > --- a/include/hw/acpi/aml-build.h
> > +++ b/include/hw/acpi/aml-build.h
> > @@ -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,
> > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> > index 5e8bfb631c..050fdb3f37 100644
> > --- a/hw/acpi/aml-build.c
> > +++ b/hw/acpi/aml-build.c
> > @@ -1936,15 +1936,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 */
> >  }
> >  
> >  /*
> > diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
> > index e050b47c2b..baab81f7a6 100644
> > --- a/hw/acpi/nvdimm.c
> > +++ b/hw/acpi/nvdimm.c
> > @@ -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);
> > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> > index 21efe7fe34..6ba02cf281 100644
> > --- a/hw/arm/virt-acpi-build.c
> > +++ b/hw/arm/virt-acpi-build.c
> > @@ -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);
> > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > index 41c0a63b30..51e0ba07b6 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -1917,13 +1917,15 @@ build_tpm_tcpa(GArray *table_data, BIOSLinker *linker, GArray *tcpalog,
> >  #define HOLE_640K_START  (640 * KiB)
> >  #define HOLE_640K_END   (1 * MiB)
> >  
> > +/*
> > + * ACPI spec, Revision 3.0
> > + * 5.2.15 System Resource Affinity Table (SRAT)
> > + */
> >  static void
> >  build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
> >  {
> > -    AcpiSratMemoryAffinity *numamem;
> > -
> >      int i;
> > -    int numa_start, slots;
> > +    int numa_mem_start, slots;
> >      uint64_t mem_len, mem_base, next_base;
> >      MachineClass *mc = MACHINE_GET_CLASS(machine);
> >      X86MachineState *x86ms = X86_MACHINE(machine);
> > @@ -1946,34 +1948,41 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
> >          uint32_t apic_id = apic_ids->cpus[i].arch_id;
> >  
> >          if (apic_id < 255) {
> > -            AcpiSratProcessorAffinity *core;
> > -
> > -            core = acpi_data_push(table_data, sizeof *core);
> > -            core->type = ACPI_SRAT_PROCESSOR_APIC;
> > -            core->length = sizeof(*core);
> > -            core->local_apic_id = apic_id;
> > -            core->proximity_lo = node_id;
> > -            memset(core->proximity_hi, 0, 3);
> > -            core->local_sapic_eid = 0;
> > -            core->flags = cpu_to_le32(1);
> > +            /* 5.2.15.1 Processor Local APIC/SAPIC Affinity Structure */
> > +            build_append_int_noprefix(table_data, 0, 1);  /* Type  */
> > +            build_append_int_noprefix(table_data, 16, 1); /* Length */
> > +            /* Proximity Domain [7:0] */
> > +            build_append_int_noprefix(table_data, node_id, 1);
> > +            build_append_int_noprefix(table_data, apic_id, 1); /* APIC ID */
> > +            /* Flags, Table 5-36 */
> > +            build_append_int_noprefix(table_data, 1, 4);
> > +            build_append_int_noprefix(table_data, 0, 1); /* Local SAPIC EID */
> > +            /* Proximity Domain [31:8] */
> > +            build_append_int_noprefix(table_data, 0, 3);
> > +            build_append_int_noprefix(table_data, 0, 4); /* Reserved */  
> clock domain?
not in 3.0,  it was renamed later (4.0)

> >          } else {
> > -            AcpiSratProcessorX2ApicAffinity *core;
> > -
> > -            core = acpi_data_push(table_data, sizeof *core);
> > -            core->type = ACPI_SRAT_PROCESSOR_x2APIC;
> > -            core->length = sizeof(*core);
> > -            core->x2apic_id = cpu_to_le32(apic_id);
> > -            core->proximity_domain = cpu_to_le32(node_id);
> > -            core->flags = cpu_to_le32(1);
> > +            /*
> > +             * ACPI spec, Revision 4.0
> > +             * 5.2.16.3 Processor Local x2APIC Affinity Structure
> > +             */
> > +            build_append_int_noprefix(table_data, 2, 1);  /* Type  */
> > +            build_append_int_noprefix(table_data, 24, 1); /* Length */
> > +            build_append_int_noprefix(table_data, 0, 2); /* Reserved */
> > +            /* Proximity Domain */
> > +            build_append_int_noprefix(table_data, node_id, 4);
> > +            build_append_int_noprefix(table_data, apic_id, 4); /* X2APIC ID */
> > +            /* Flags, Table 5-39 */
> > +            build_append_int_noprefix(table_data, 1 /* Enabled */, 4);
> > +            build_append_int_noprefix(table_data, 0, 4); /* Clock Domain */
> > +            build_append_int_noprefix(table_data, 0, 4); /* Reserved */
> >          }
> >      }
> >  
> > -
> >      /* the memory map is a bit tricky, it contains at least one hole
> >       * from 640k-1M and possibly another one from 3.5G-4G.
> >       */
> >      next_base = 0;
> > -    numa_start = table_data->len;
> > +    numa_mem_start = table_data->len;
> >  
> >      for (i = 1; i < nb_numa_nodes + 1; ++i) {
> >          mem_base = next_base;
> > @@ -1985,8 +1994,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
> >              next_base > HOLE_640K_START) {
> >              mem_len -= next_base - HOLE_640K_START;
> >              if (mem_len > 0) {
> > -                numamem = acpi_data_push(table_data, sizeof *numamem);
> > -                build_srat_memory(numamem, mem_base, mem_len, i - 1,
> > +                build_srat_memory(table_data, mem_base, mem_len, i - 1,
> >                                    MEM_AFFINITY_ENABLED);
> >              }
> >  
> > @@ -2004,8 +2012,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
> >              next_base > x86ms->below_4g_mem_size) {
> >              mem_len -= next_base - x86ms->below_4g_mem_size;
> >              if (mem_len > 0) {
> > -                numamem = acpi_data_push(table_data, sizeof *numamem);
> > -                build_srat_memory(numamem, mem_base, mem_len, i - 1,
> > +                build_srat_memory(table_data, mem_base, mem_len, i - 1,
> >                                    MEM_AFFINITY_ENABLED);
> >              }
> >              mem_base = 1ULL << 32;
> > @@ -2014,8 +2021,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
> >          }
> >  
> >          if (mem_len > 0) {
> > -            numamem = acpi_data_push(table_data, sizeof *numamem);
> > -            build_srat_memory(numamem, mem_base, mem_len, i - 1,
> > +            build_srat_memory(table_data, mem_base, mem_len, i - 1,
> >                                MEM_AFFINITY_ENABLED);
> >          }
> >      }
> > @@ -2024,10 +2030,15 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
> >          nvdimm_build_srat(table_data);
> >      }
> >  
> > -    slots = (table_data->len - numa_start) / sizeof *numamem;
> > +    /*
> > +     * TODO: this part is not in ACPI spec and current linux kernel boots fine
> > +     * without these entries. But I recall there were issues the last time I
> > +     * tried to remove it with some ancient guest OS, however I can't remember
> > +     * what that was so keep this around for now
> > +     */
> > +    slots = (table_data->len - numa_mem_start) / 40 /* mem affinity len */;
> >      for (; slots < nb_numa_nodes + 2; slots++) {
> > -        numamem = acpi_data_push(table_data, sizeof *numamem);
> > -        build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
> > +        build_srat_memory(table_data, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
> >      }
> >  
> >      /*
> > @@ -2039,8 +2050,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
> >       * providing _PXM method if necessary.
> >       */
> >      if (hotplugabble_address_space_size) {
> > -        numamem = acpi_data_push(table_data, sizeof *numamem);
> > -        build_srat_memory(numamem, machine->device_memory->base,
> > +        build_srat_memory(table_data, machine->device_memory->base,
> >                            hotplugabble_address_space_size, nb_numa_nodes - 1,
> >                            MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
> >      }
> >   
> Besides
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> 
> Eric
> 

Re: [PATCH v3 18/35] acpi: build_dmar_q35: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Igor Mammedov]

On Wed, 22 Sep 2021 11:19:05 +0200
Eric Auger <eauger@redhat.com> wrote:

> On 9/7/21 4:47 PM, Igor Mammedov wrote:
> > 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 tables.
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > 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/
> > 
> > CC: wangxingang5@huawei.com
> > CC: marcel.apfelbaum@gmail.com
> > ---
> >  include/hw/acpi/acpi-defs.h | 68 --------------------------
> >  hw/i386/acpi-build.c        | 97 ++++++++++++++++++++-----------------
> >  2 files changed, 53 insertions(+), 112 deletions(-)
> > 
> > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> > index d293304f9c..c4f0a202e8 100644
> > --- a/include/hw/acpi/acpi-defs.h
> > +++ b/include/hw/acpi/acpi-defs.h
> > @@ -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",
> > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > index 51e0ba07b6..2875c4f393 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -2064,8 +2064,9 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
> >  static void
> >  insert_scope(PCIBus *bus, PCIDevice *dev, void *opaque)
> >  {
> > +    const size_t device_scope_size = 6 /* device scope structure */ +
> > +                                     2 /* 1 path entry */;
> >      GArray *scope_blob = opaque;
> > -    AcpiDmarDeviceScope *scope = NULL;
> >  
> >      if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {
> >          /* Dmar Scope Type: 0x02 for PCI Bridge */
> > @@ -2076,8 +2077,7 @@ insert_scope(PCIBus *bus, PCIDevice *dev, void *opaque)
> >      }
> >  
> >      /* length */
> > -    build_append_int_noprefix(scope_blob,
> > -                              sizeof(*scope) + sizeof(scope->path[0]), 1);
> > +    build_append_int_noprefix(scope_blob, device_scope_size, 1);
> >      /* reserved */
> >      build_append_int_noprefix(scope_blob, 0, 2);
> >      /* enumeration_id */
> > @@ -2109,26 +2109,31 @@ dmar_host_bridges(Object *obj, void *opaque)
> >  }
> >  
> >  /*
> > - * VT-d spec 8.1 DMA Remapping Reporting Structure
> > - * (version Oct. 2014 or later)
> > + * Intel ® Virtualization Technology for Directed I/O
> > + * Architecture Specification. Revision 3.3
> > + * 8.1 DMA Remapping Reporting Structure
> >   */
> >  static void
> >  build_dmar_q35(GArray *table_data, BIOSLinker *linker, const char *oem_id,
> >                 const char *oem_table_id)
> >  {
> > -    int dmar_start = table_data->len;
> > -
> > -    AcpiTableDmar *dmar;
> > -    AcpiDmarHardwareUnit *drhd;
> > -    AcpiDmarRootPortATS *atsr;
> >      uint8_t dmar_flags = 0;
> > +    uint8_t rsvd10[10] = {};
> > +    /* Root complex IOAPIC uses one path only */
> > +    const size_t ioapic_scope_size = 6 /* device scope structure */ +
> > +                                     2 /* 1 path entry */;
> >      X86IOMMUState *iommu = x86_iommu_get_default();
> > -    AcpiDmarDeviceScope *scope = NULL;
> > -    /* Root complex IOAPIC use one path[0] only */
> > -    size_t ioapic_scope_size = sizeof(*scope) + sizeof(scope->path[0]);
> >      IntelIOMMUState *intel_iommu = INTEL_IOMMU_DEVICE(iommu);
> >      GArray *scope_blob = g_array_new(false, true, 1);
> >  
> > +    AcpiTable table = { .sig = "DMAR", .rev = 1, .oem_id = oem_id,
> > +                        .oem_table_id = oem_table_id };
> > +
> > +    assert(iommu);
> > +    if (x86_iommu_ir_supported(iommu)) {
> > +        dmar_flags |= 0x1;      /* Flags: 0x1: INT_REMAP */
> > +    }
> > +
> >      /*
> >       * A PCI bus walk, for each PCI host bridge.
> >       * Insert scope for each PCI bridge and endpoint device which
> > @@ -2137,48 +2142,52 @@ build_dmar_q35(GArray *table_data, BIOSLinker *linker, const char *oem_id,
> >      object_child_foreach_recursive(object_get_root(),
> >                                     dmar_host_bridges, scope_blob);
> >  
> > -    assert(iommu);
> > -    if (x86_iommu_ir_supported(iommu)) {
> > -        dmar_flags |= 0x1;      /* Flags: 0x1: INT_REMAP */
> > -    }  

> why this move?

it's not really necessary/related, probably it was moved to be closer
to other variables initialization.


> > -
> > -    dmar = acpi_data_push(table_data, sizeof(*dmar));
> > -    dmar->host_address_width = intel_iommu->aw_bits - 1;
> > -    dmar->flags = dmar_flags;
> > -
> > -    /* DMAR Remapping Hardware Unit Definition structure */
> > -    drhd = acpi_data_push(table_data, sizeof(*drhd) + ioapic_scope_size);
> > -    drhd->type = cpu_to_le16(ACPI_DMAR_TYPE_HARDWARE_UNIT);
> > -    drhd->length =
> > -        cpu_to_le16(sizeof(*drhd) + ioapic_scope_size + scope_blob->len);
> > -    drhd->flags = 0;            /* Don't include all pci device */
> > -    drhd->pci_segment = cpu_to_le16(0);
> > -    drhd->address = cpu_to_le64(Q35_HOST_BRIDGE_IOMMU_ADDR);
> > +    acpi_table_begin(&table, table_data);
> > +    /* Host Address Width */
> > +    build_append_int_noprefix(table_data, intel_iommu->aw_bits - 1, 1);
> > +    build_append_int_noprefix(table_data, dmar_flags, 1); /* Flags */
> > +    g_array_append_vals(table_data, rsvd10, sizeof(rsvd10)); /* Reserved */
> > +
> > +    /* 8.3 DMAR Remapping Hardware Unit Definition structure */
> > +    build_append_int_noprefix(table_data, 0, 2); /* Type */
> > +    /* Length */
> > +    build_append_int_noprefix(table_data,
> > +                              16 + ioapic_scope_size + scope_blob->len, 2);
> > +    /* Flags */
> > +    build_append_int_noprefix(table_data, 0 /* Don't include all pci device */ ,
> > +                              1);
> > +    build_append_int_noprefix(table_data, 0 , 1); /* Reserved */
> > +    build_append_int_noprefix(table_data, 0 , 2); /* Segment Number */
> > +    /* Register Base Address */
> > +    build_append_int_noprefix(table_data, Q35_HOST_BRIDGE_IOMMU_ADDR , 8);
> >  
> >      /* Scope definition for the root-complex IOAPIC. See VT-d spec
> >       * 8.3.1 (version Oct. 2014 or later). */
> > -    scope = &drhd->scope[0];
> > -    scope->entry_type = 0x03;   /* Type: 0x03 for IOAPIC */
> > -    scope->length = ioapic_scope_size;
> > -    scope->enumeration_id = ACPI_BUILD_IOAPIC_ID;
> > -    scope->bus = Q35_PSEUDO_BUS_PLATFORM;
> > -    scope->path[0].device = PCI_SLOT(Q35_PSEUDO_DEVFN_IOAPIC);
> > -    scope->path[0].function = PCI_FUNC(Q35_PSEUDO_DEVFN_IOAPIC);
> > +    build_append_int_noprefix(table_data, 0x03 /* IOAPIC */, 1); /* Type */
> > +    build_append_int_noprefix(table_data, ioapic_scope_size, 1); /* Length */
> > +    build_append_int_noprefix(table_data, 0, 2); /* Reserved */
> > +    /* Enumeration ID */
> > +    build_append_int_noprefix(table_data, ACPI_BUILD_IOAPIC_ID, 1);
> > +    /* Start Bus Number */
> > +    build_append_int_noprefix(table_data, Q35_PSEUDO_BUS_PLATFORM, 1);
> > +    /* Path, {Device, Function} pair */
> > +    build_append_int_noprefix(table_data, PCI_SLOT(Q35_PSEUDO_DEVFN_IOAPIC), 1);
> > +    build_append_int_noprefix(table_data, PCI_FUNC(Q35_PSEUDO_DEVFN_IOAPIC), 1);
> >  
> >      /* Add scope found above */
> >      g_array_append_vals(table_data, scope_blob->data, scope_blob->len);
> >      g_array_free(scope_blob, true);
> >  
> >      if (iommu->dt_supported) {
> > -        atsr = acpi_data_push(table_data, sizeof(*atsr));
> > -        atsr->type = cpu_to_le16(ACPI_DMAR_TYPE_ATSR);
> > -        atsr->length = cpu_to_le16(sizeof(*atsr));
> > -        atsr->flags = ACPI_DMAR_ATSR_ALL_PORTS;
> > -        atsr->pci_segment = cpu_to_le16(0);
> > +        /* 8.5 Root Port ATS Capability Reporting Structure */
> > +        build_append_int_noprefix(table_data, 2, 2); /* Type */
> > +        build_append_int_noprefix(table_data, 8, 2); /* Length */  

> 8 + no device scope
yep, but given no device scope implemented I didn't see a need to mention it
at all.


> > +        build_append_int_noprefix(table_data, 1 /* ALL_PORTS */, 1); /* Flags */
> > +        build_append_int_noprefix(table_data, 0, 1); /* Reserved */
> > +        build_append_int_noprefix(table_data, 0, 2); /* Segment Number */
> >      }
> >  
> > -    build_header(linker, table_data, (void *)(table_data->data + dmar_start),
> > -                 "DMAR", table_data->len - dmar_start, 1, oem_id, oem_table_id);
> > +    acpi_table_end(linker, &table);
> >  }
> >  
> >  /*
> >   
> Besides
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> 
> Eric
> 

Re: [PATCH v3 24/35] acpi: x86: madt: use build_append_int_noprefix() API to compose MADT table

[Eric Auger]

On 9/7/21 4:48 PM, Igor Mammedov wrote:
> Drop 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> CC: marcel.apfelbaum@gmail.com
> CC: eauger@redhat.com
> ---
>  include/hw/acpi/acpi-defs.h |  64 ------------------
>  hw/i386/acpi-common.c       | 127 ++++++++++++++++++------------------
>  2 files changed, 65 insertions(+), 126 deletions(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index af4fa412a5..3f174ba208 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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;
> diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
> index 7983a13a93..aa7b5c357e 100644
> --- a/hw/i386/acpi-common.c
> +++ b/hw/i386/acpi-common.c
> @@ -38,7 +38,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
>                         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;
> +    /* Flags – Local APIC Flags */
nit: move that comment at the place of the build_append_int_noprefix
> +    uint32_t flags = apic_ids->cpus[uid].cpu != NULL || force_enabled ?
> +                     1 /* Enabled */ : 0;
>  
>      /* ACPI spec says that LAPIC entry for non present
>       * CPU may be omitted from MADT or it must be marked
> @@ -47,24 +49,47 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
>       * should be put in MADT but kept disabled.
>       */
>      if (apic_id < 255) {
> -        AcpiMadtProcessorApic *apic = acpi_data_push(entry, sizeof *apic);
> -
> -        apic->type = ACPI_APIC_PROCESSOR;
> -        apic->length = sizeof(*apic);
> -        apic->processor_id = uid;
> -        apic->local_apic_id = apic_id;
> -        apic->flags = cpu_to_le32(flags);
> +        /* Rev 1.0b, Table 5-13 Processor Local APIC Structure */
> +        build_append_int_noprefix(entry, 0, 1);       /* Type */
> +        build_append_int_noprefix(entry, 8, 1);       /* Length */
> +        build_append_int_noprefix(entry, uid, 1);     /* ACPI Processor ID */
nit s/ID/UID
> +        build_append_int_noprefix(entry, apic_id, 1); /* APIC ID */
> +        build_append_int_noprefix(entry, flags, 4); /* Flags */
>      } else {
> -        AcpiMadtProcessorX2Apic *apic = acpi_data_push(entry, sizeof *apic);
> -
> -        apic->type = ACPI_APIC_LOCAL_X2APIC;
> -        apic->length = sizeof(*apic);
> -        apic->uid = cpu_to_le32(uid);
> -        apic->x2apic_id = cpu_to_le32(apic_id);
> -        apic->flags = cpu_to_le32(flags);
> +        /* Rev 4.0, 5.2.12.12 Processor Local x2APIC Structure */
> +        build_append_int_noprefix(entry, 9, 1);       /* Type */
> +        build_append_int_noprefix(entry, 16, 1);      /* Length */
> +        build_append_int_noprefix(entry, 0, 2);       /* Reserved */
> +        build_append_int_noprefix(entry, apic_id, 4); /* X2APIC ID */
> +        build_append_int_noprefix(entry, flags, 4);   /* Flags */
> +        build_append_int_noprefix(entry, uid, 4);     /* ACPI Processor UID */
>      }
>  }
>  
> +static void build_ioapic(GArray *entry, uint8_t id, uint32_t addr, uint32_t irq)
> +{
> +    /* Rev 1.0b, 5.2.8.2 IO APIC */
> +    build_append_int_noprefix(entry, 1, 1);    /* Type */
> +    build_append_int_noprefix(entry, 12, 1);   /* Length */
> +    build_append_int_noprefix(entry, id, 1);   /* IO APIC ID */
> +    build_append_int_noprefix(entry, 0, 1);    /* Reserved */
> +    build_append_int_noprefix(entry, addr, 4); /* IO APIC Address */
> +    build_append_int_noprefix(entry, irq, 4);  /* System Vector Base */
> +}
> +
> +static void
> +build_xrupt_override(GArray *entry, uint8_t src, uint32_t gsi, uint16_t flags)
> +{
> +    /* Rev 1.0b, 5.2.8.3.1 Interrupt Source Overrides */
> +    build_append_int_noprefix(entry, 2, 1);  /* Type */
> +    build_append_int_noprefix(entry, 10, 1); /* Length */
> +    build_append_int_noprefix(entry, 0, 1);  /* Bus */
> +    build_append_int_noprefix(entry, src, 1);  /* Source */
> +    /* Global System Interrupt Vector */
> +    build_append_int_noprefix(entry, gsi, 4);
> +    build_append_int_noprefix(entry, flags, 2);  /* Flags */
> +}
> +
>  /*
>   * ACPI spec, Revision 1.0b
>   * 5.2.8 Multiple APIC Description Table
> @@ -73,14 +98,11 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
>                       X86MachineState *x86ms, AcpiDeviceIf *adev,
>                       const char *oem_id, const char *oem_table_id)
>  {
> +    int i;
> +    bool x2apic_mode = false;
>      MachineClass *mc = MACHINE_GET_CLASS(x86ms);
>      const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(x86ms));
>      AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(adev);
> -    bool x2apic_mode = false;
> -
> -    AcpiMadtIoApic *io_apic;
> -    AcpiMadtIntsrcovr *intsrcovr;
> -    int i;
>      AcpiTable table = { .sig = "APIC", .rev = 1, .oem_id = oem_id,
>                          .oem_table_id = oem_table_id };
>  
> @@ -96,30 +118,14 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
>          }
>      }
>  
> -    io_apic = acpi_data_push(table_data, sizeof *io_apic);
> -    io_apic->type = ACPI_APIC_IO;
> -    io_apic->length = sizeof(*io_apic);
> -    io_apic->io_apic_id = ACPI_BUILD_IOAPIC_ID;
> -    io_apic->address = cpu_to_le32(IO_APIC_DEFAULT_ADDRESS);
> -    io_apic->interrupt = cpu_to_le32(0);
> -
> +    build_ioapic(table_data, ACPI_BUILD_IOAPIC_ID, IO_APIC_DEFAULT_ADDRESS, 0);
>      if (x86ms->ioapic2) {
> -        AcpiMadtIoApic *io_apic2;
> -        io_apic2 = acpi_data_push(table_data, sizeof *io_apic);
> -        io_apic2->type = ACPI_APIC_IO;
> -        io_apic2->length = sizeof(*io_apic);
> -        io_apic2->io_apic_id = ACPI_BUILD_IOAPIC_ID + 1;
> -        io_apic2->address = cpu_to_le32(IO_APIC_SECONDARY_ADDRESS);
> -        io_apic2->interrupt = cpu_to_le32(IO_APIC_SECONDARY_IRQBASE);
> +        build_ioapic(table_data, ACPI_BUILD_IOAPIC_ID + 1,
> +                     IO_APIC_SECONDARY_ADDRESS, IO_APIC_SECONDARY_IRQBASE);
>      }
>  
>      if (x86ms->apic_xrupt_override) {
> -        intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
> -        intsrcovr->type   = ACPI_APIC_XRUPT_OVERRIDE;
> -        intsrcovr->length = sizeof(*intsrcovr);
> -        intsrcovr->source = 0;
> -        intsrcovr->gsi    = cpu_to_le32(2);
> -        intsrcovr->flags  = cpu_to_le16(0); /* conforms to bus specifications */
> +        build_xrupt_override(table_data, 0, 2, 0);
lost /* conforms to bus specifications */ comment for the flag during
the battle/ Don't know if it is useful though
>      }
>  
>      for (i = 1; i < 16; i++) {
> @@ -127,32 +133,29 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
>              /* No need for a INT source override structure. */
>              continue;
>          }
> -        intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
> -        intsrcovr->type   = ACPI_APIC_XRUPT_OVERRIDE;
> -        intsrcovr->length = sizeof(*intsrcovr);
> -        intsrcovr->source = i;
> -        intsrcovr->gsi    = cpu_to_le32(i);
> -        intsrcovr->flags  = cpu_to_le16(0xd); /* active high, level triggered */
> +        build_xrupt_override(table_data, i, i, 0xd);
Lost for the flag /* active high, level triggered */
>      }
>  
>      if (x2apic_mode) {
> -        AcpiMadtLocalX2ApicNmi *local_nmi;
> -
> -        local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
> -        local_nmi->type   = ACPI_APIC_LOCAL_X2APIC_NMI;
> -        local_nmi->length = sizeof(*local_nmi);
> -        local_nmi->uid    = 0xFFFFFFFF; /* all processors */
> -        local_nmi->flags  = cpu_to_le16(0);
> -        local_nmi->lint   = 1; /* ACPI_LINT1 */
> +        /* Rev 4.0, 5.2.12.13 Local x2APIC NMI Structure*/
> +        build_append_int_noprefix(table_data, 0xA, 1); /* Type */
> +        build_append_int_noprefix(table_data, 12, 1);  /* Length */
> +        build_append_int_noprefix(table_data, 0, 2);   /* Flags */
> +        /* ACPI Processor UID */
> +        build_append_int_noprefix(table_data, 0xFFFFFFFF /* all processors */,
> +                                  4);
> +        /* Local x2APIC INTI# */
Local x2APIC LINT#
> +        build_append_int_noprefix(table_data, 1 /* ACPI_LINT1 */, 1);
> +        build_append_int_noprefix(table_data, 0, 3);
/* reserved */
>      } else {
> -        AcpiMadtLocalNmi *local_nmi;
> -
> -        local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
> -        local_nmi->type         = ACPI_APIC_LOCAL_NMI;
> -        local_nmi->length       = sizeof(*local_nmi);
> -        local_nmi->processor_id = 0xff; /* all processors */
> -        local_nmi->flags        = cpu_to_le16(0);
> -        local_nmi->lint         = 1; /* ACPI_LINT1 */
> +        /* Rev 1.0b, 5.2.8.3.3 Local APIC NMI */
> +        build_append_int_noprefix(table_data, 4, 1);  /* Type */
> +        build_append_int_noprefix(table_data, 6, 1);  /* Length */
> +        /* ACPI Processor ID */
> +        build_append_int_noprefix(table_data, 0xff /* all processors */, 1);
0xFF
> +        build_append_int_noprefix(table_data, 0, 2);  /* Flags */
> +        /* Local APIC INTI# */
Local APIC LINT#
> +        build_append_int_noprefix(table_data, 1 /* ACPI_LINT1 */, 1);
>      }
>  
>      acpi_table_end(linker, &table);
> 

Besides
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric

Re: [PATCH v3 28/35] acpi: arm: virt: build_iort: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

On 9/7/21 4:48 PM, Igor Mammedov wrote:
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> 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/
> 
> CC: drjones@redhat.com
> CC: peter.maydell@linaro.org
> CC: shannon.zhaosl@gmail.com
> CC: qemu-arm@nongnu.org
> CC: eauger@redhat.com
> ---
>  include/hw/acpi/acpi-defs.h | 14 ------------
>  hw/arm/virt-acpi-build.c    | 45 ++++++++++++++++---------------------
>  2 files changed, 19 insertions(+), 40 deletions(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index bcada37601..195f90caf6 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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
>   */
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 4b9687439d..bceb1b3b7e 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -273,22 +273,29 @@ static int iort_idmap_compare(gconstpointer a, gconstpointer b)
>      return idmap_a->input_base - idmap_b->input_base;
>  }
>  
> +/*
> + * Input Output Remapping Table (IORT)
> + * Conforms to "IO Remapping Table System Software on ARM Platforms",
> + * Document number: ARM DEN 0049B, October 2015
> + */
>  static void
>  build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>  {
> -    int i, nb_nodes, rc_mapping_count, iort_start = table_data->len;
> +    int i, nb_nodes, rc_mapping_count;
>      AcpiIortIdMapping *idmap;
>      AcpiIortItsGroup *its;
> -    AcpiIortTable *iort;
>      AcpiIortSmmu3 *smmu;
> -    size_t node_size, iort_node_offset, iort_length, smmu_offset = 0;
>      AcpiIortRC *rc;
> +    const uint32_t iort_node_offset = 48;
> +    size_t node_size, smmu_offset = 0;
>      GArray *smmu_idmaps = g_array_new(false, true, sizeof(AcpiIortIdMapping));
>      GArray *its_idmaps = g_array_new(false, true, sizeof(AcpiIortIdMapping));
>  
> -    iort = acpi_data_push(table_data, sizeof(*iort));
> +    AcpiTable table = { .sig = "IORT", .rev = 0, .oem_id = vms->oem_id,
> +                        .oem_table_id = vms->oem_table_id };
>  
>      if (vms->iommu == VIRT_IOMMU_SMMUV3) {
> +
>          AcpiIortIdMapping next_range = {0};
>  
>          object_child_foreach_recursive(object_get_root(),
> @@ -325,18 +332,16 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>          rc_mapping_count = 1;
>      }
>  
> -    iort_length = sizeof(*iort);
> -    iort->node_count = cpu_to_le32(nb_nodes);
> -    /*
> -     * Use a copy in case table_data->data moves during acpi_data_push
> -     * operations.
> -     */
> -    iort_node_offset = sizeof(*iort);
> -    iort->node_offset = cpu_to_le32(iort_node_offset);
> +    /* 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, 0, 4); /* Reserved */
>  
>      /* ITS group node */
>      node_size =  sizeof(*its) + sizeof(uint32_t);
> -    iort_length += node_size;
>      its = acpi_data_push(table_data, node_size);
>  
>      its->type = ACPI_IORT_NODE_ITS_GROUP;
> @@ -350,7 +355,6 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>          /* SMMUv3 node */
>          smmu_offset = iort_node_offset + node_size;
>          node_size = sizeof(*smmu) + sizeof(*idmap);
> -        iort_length += node_size;
>          smmu = acpi_data_push(table_data, node_size);
>  
>          smmu->type = ACPI_IORT_NODE_SMMU_V3;
> @@ -375,7 +379,6 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>  
>      /* Root Complex Node */
>      node_size = sizeof(*rc) + sizeof(*idmap) * rc_mapping_count;
> -    iort_length += node_size;
>      rc = acpi_data_push(table_data, node_size);
>  
>      rc->type = ACPI_IORT_NODE_PCI_ROOT_COMPLEX;
> @@ -424,19 +427,9 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>          idmap->output_reference = cpu_to_le32(iort_node_offset);
>      }
>  
> +    acpi_table_end(linker, &table);
>      g_array_free(smmu_idmaps, true);
>      g_array_free(its_idmaps, true);
> -
> -    /*
> -     * Update the pointer address in case table_data->data moves during above
> -     * acpi_data_push operations.
> -     */
> -    iort = (AcpiIortTable *)(table_data->data + iort_start);
> -    iort->length = cpu_to_le32(iort_length);
> -
> -    build_header(linker, table_data, (void *)(table_data->data + iort_start),
> -                 "IORT", table_data->len - iort_start, 0, vms->oem_id,
> -                 vms->oem_table_id);
>  }
>  
>  static void
> 

Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>

Eric

Re: [PATCH v3 28/35] acpi: arm: virt: build_iort: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Eric Auger]

Hi Igor,

On 9/7/21 4:48 PM, Igor Mammedov wrote:
> 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.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> 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/
> 
> CC: drjones@redhat.com
> CC: peter.maydell@linaro.org
> CC: shannon.zhaosl@gmail.com
> CC: qemu-arm@nongnu.org
> CC: eauger@redhat.com
> ---
>  include/hw/acpi/acpi-defs.h | 14 ------------
>  hw/arm/virt-acpi-build.c    | 45 ++++++++++++++++---------------------
>  2 files changed, 19 insertions(+), 40 deletions(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index bcada37601..195f90caf6 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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
>   */
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 4b9687439d..bceb1b3b7e 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -273,22 +273,29 @@ static int iort_idmap_compare(gconstpointer a, gconstpointer b)
>      return idmap_a->input_base - idmap_b->input_base;
>  }
>  
> +/*
> + * Input Output Remapping Table (IORT)
> + * Conforms to "IO Remapping Table System Software on ARM Platforms",
> + * Document number: ARM DEN 0049B, October 2015
> + */
>  static void
>  build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>  {
> -    int i, nb_nodes, rc_mapping_count, iort_start = table_data->len;
> +    int i, nb_nodes, rc_mapping_count;
>      AcpiIortIdMapping *idmap;
>      AcpiIortItsGroup *its;
> -    AcpiIortTable *iort;
>      AcpiIortSmmu3 *smmu;
> -    size_t node_size, iort_node_offset, iort_length, smmu_offset = 0;
>      AcpiIortRC *rc;
> +    const uint32_t iort_node_offset = 48;
> +    size_t node_size, smmu_offset = 0;
>      GArray *smmu_idmaps = g_array_new(false, true, sizeof(AcpiIortIdMapping));
>      GArray *its_idmaps = g_array_new(false, true, sizeof(AcpiIortIdMapping));
>  
> -    iort = acpi_data_push(table_data, sizeof(*iort));
> +    AcpiTable table = { .sig = "IORT", .rev = 0, .oem_id = vms->oem_id,
> +                        .oem_table_id = vms->oem_table_id };
>  
>      if (vms->iommu == VIRT_IOMMU_SMMUV3) {
> +
forgot this minor comment
nit: spurious change

Eric
>          AcpiIortIdMapping next_range = {0};
>  
>          object_child_foreach_recursive(object_get_root(),
> @@ -325,18 +332,16 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>          rc_mapping_count = 1;
>      }
>  
> -    iort_length = sizeof(*iort);
> -    iort->node_count = cpu_to_le32(nb_nodes);
> -    /*
> -     * Use a copy in case table_data->data moves during acpi_data_push
> -     * operations.
> -     */
> -    iort_node_offset = sizeof(*iort);
> -    iort->node_offset = cpu_to_le32(iort_node_offset);
> +    /* 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, 0, 4); /* Reserved */
>  
>      /* ITS group node */
>      node_size =  sizeof(*its) + sizeof(uint32_t);
> -    iort_length += node_size;
>      its = acpi_data_push(table_data, node_size);
>  
>      its->type = ACPI_IORT_NODE_ITS_GROUP;
> @@ -350,7 +355,6 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>          /* SMMUv3 node */
>          smmu_offset = iort_node_offset + node_size;
>          node_size = sizeof(*smmu) + sizeof(*idmap);
> -        iort_length += node_size;
>          smmu = acpi_data_push(table_data, node_size);
>  
>          smmu->type = ACPI_IORT_NODE_SMMU_V3;
> @@ -375,7 +379,6 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>  
>      /* Root Complex Node */
>      node_size = sizeof(*rc) + sizeof(*idmap) * rc_mapping_count;
> -    iort_length += node_size;
>      rc = acpi_data_push(table_data, node_size);
>  
>      rc->type = ACPI_IORT_NODE_PCI_ROOT_COMPLEX;
> @@ -424,19 +427,9 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>          idmap->output_reference = cpu_to_le32(iort_node_offset);
>      }
>  
> +    acpi_table_end(linker, &table);
>      g_array_free(smmu_idmaps, true);
>      g_array_free(its_idmaps, true);
> -
> -    /*
> -     * Update the pointer address in case table_data->data moves during above
> -     * acpi_data_push operations.
> -     */
> -    iort = (AcpiIortTable *)(table_data->data + iort_start);
> -    iort->length = cpu_to_le32(iort_length);
> -
> -    build_header(linker, table_data, (void *)(table_data->data + iort_start),
> -                 "IORT", table_data->len - iort_start, 0, vms->oem_id,
> -                 vms->oem_table_id);
>  }
>  
>  static void
> 

Re: [PATCH v3 29/35] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API

[Eric Auger]

On 9/7/21 4:48 PM, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> v3:
>   * practically rewritten, due to conflicts wiht bypass iommu feature
>
> CC: drjones@redhat.com
> CC: peter.maydell@linaro.org
> CC: shannon.zhaosl@gmail.com
> CC: qemu-arm@nongnu.org
> CC: wangxingang5@huawei.com
> CC: Eric Auger <eric.auger@redhat.com>
> ---
>  include/hw/acpi/acpi-defs.h |  71 ---------------
>  hw/arm/virt-acpi-build.c    | 167 ++++++++++++++++++++----------------
>  2 files changed, 91 insertions(+), 147 deletions(-)
>
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index 195f90caf6..6f2f08a9de 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index bceb1b3b7e..4c682e7b09 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -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)
> @@ -281,18 +303,17 @@ static int iort_idmap_compare(gconstpointer a, gconstpointer b)
>  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;
> +    int i, rc_mapping_count;
>      const uint32_t iort_node_offset = 48;
can be replaced by IORT_NODE_OFFSET now
>      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);
nit: you could have done this move in previous patch.
>  
>      if (vms->iommu == VIRT_IOMMU_SMMUV3) {
>  
> @@ -325,106 +346,100 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>              g_array_append_val(its_idmaps, next_range);
>          }
>  
> -        nb_nodes = 3; /* RC, ITS, SMMUv3 */
>          rc_mapping_count = smmu_idmaps->len + its_idmaps->len;
> +        /* Number of IORT Nodes */
> +        build_append_int_noprefix(table_data, 3 /* RC, ITS, SMMUv3 */, 4);
>      } else {
> -        nb_nodes = 2; /* RC, ITS */
>          rc_mapping_count = 1;
> +        /* Number of IORT Nodes */
> +        build_append_int_noprefix(table_data, 2 /* RC, ITS */, 4);
I think I would prefer to keep the nb_nodes variable and do the
corresponding build_append_int_noprefix only once. There may be
additional nodes added with increased complexity and potential extra
duplication.
>      }
>  
> -    /* 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;
> -        /* output IORT node is the ITS group node (the first node) */
> -        idmap->output_reference = cpu_to_le32(iort_node_offset);
> +        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 */
Please keep that comment. I think it helps
       /* output IORT node is the ITS group node (the first node) */
> +
> +        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));
> -
> +    /* 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);
> +    /* Reference to ID Array */
> +    build_append_int_noprefix(table_data, ROOT_COMPLEX_ENTRY_SIZE, 4);
>      /* fully coherent device */
this comment should become /* Memory access properties */ for homogenity
> -    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 */
> -
> +    build_append_int_noprefix(table_data,
> +        1 | /* CCA: Cache Coherent Attribute, The device is fully coherent */
> +        (3ULL << 7 * 8) /* MAF: Memory Access Flags, CCA = CPM = DCAS = 1 */,
> +        8);
I think we would gain in readability if we were to split into multiple

build_append_int_noprefix according to Table 13 fields

> +    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);
please keep the original comment
> +            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);
same, at least it helps me ;-)
> +            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);
Thanks

Eric

Re: [PATCH v3 33/35] acpi: build_facs: use build_append_int_noprefix() API to compose table

[Eric Auger]

On 9/7/21 4:48 PM, Igor Mammedov wrote:
> Drop usage of packed structures and explicit endian
> conversions when building table and use endian agnostic
> build_append_int_noprefix() API to build it.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> CC: marcel.apfelbaum@gmail.com
> ---
>  include/hw/acpi/acpi-defs.h | 14 --------------
>  include/hw/acpi/aml-build.h |  1 +
>  hw/acpi/aml-build.c         |  2 +-
>  hw/i386/acpi-build.c        | 18 ++++++++++++++----
>  4 files changed, 16 insertions(+), 19 deletions(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index 0b375e7589..1a0774edd6 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index 6e1f42e119..6f3d1de1b1 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -413,6 +413,7 @@ 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);
> +void build_append_byte(GArray *array, uint8_t val);
what's the rationale behind changes related to build_append_byte?
>  
>  typedef struct AcpiTable {
>      const char *sig;
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 050fdb3f37..4135b385e5 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -47,7 +47,7 @@ static void build_prepend_byte(GArray *array, uint8_t val)
>      g_array_prepend_val(array, val);
>  }
>  
> -static void build_append_byte(GArray *array, uint8_t val)
> +void build_append_byte(GArray *array, uint8_t val)
>  {
>      g_array_append_val(array, val);
>  }
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 9f888d5a2c..547cd4ed9d 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -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)
> 
Without thoses changes

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Re: [PATCH v3 34/35] acpi: remove no longer used build_header()

[Eric Auger]

On 9/7/21 4:48 PM, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric
> ---
>  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(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index 1a0774edd6..ee733840aa 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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 */
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index 6f3d1de1b1..b8272c239a 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -445,10 +445,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);
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 4135b385e5..b261ecfbc1 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -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;
> 

Re: [PATCH v3 35/35] acpi: AcpiGenericAddress no longer used to map/access fields of MMIO, drop packed attribute

[Eric Auger]

On 9/7/21 4:48 PM, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric
> ---
>  include/hw/acpi/acpi-defs.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> index ee733840aa..c97e8633ad 100644
> --- a/include/hw/acpi/acpi-defs.h
> +++ b/include/hw/acpi/acpi-defs.h
> @@ -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 */
> 

Re: [PATCH v3 29/35] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API

[Igor Mammedov]

On Wed, 22 Sep 2021 15:26:49 +0200
Eric Auger <eric.auger@redhat.com> wrote:

I'll fix patch up as suggested,
though there is a question, see below

> On 9/7/21 4:48 PM, Igor Mammedov wrote:
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > v3:
> >   * practically rewritten, due to conflicts wiht bypass iommu feature
> >
> > CC: drjones@redhat.com
> > CC: peter.maydell@linaro.org
> > CC: shannon.zhaosl@gmail.com
> > CC: qemu-arm@nongnu.org
> > CC: wangxingang5@huawei.com
> > CC: Eric Auger <eric.auger@redhat.com>
> > ---
> >  include/hw/acpi/acpi-defs.h |  71 ---------------
> >  hw/arm/virt-acpi-build.c    | 167 ++++++++++++++++++++----------------
> >  2 files changed, 91 insertions(+), 147 deletions(-)
> >
> > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> > index 195f90caf6..6f2f08a9de 100644
> > --- a/include/hw/acpi/acpi-defs.h
> > +++ b/include/hw/acpi/acpi-defs.h
> > @@ -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
> > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> > index bceb1b3b7e..4c682e7b09 100644
> > --- a/hw/arm/virt-acpi-build.c
> > +++ b/hw/arm/virt-acpi-build.c
> > @@ -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)
> > @@ -281,18 +303,17 @@ static int iort_idmap_compare(gconstpointer a, gconstpointer b)
> >  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;
> > +    int i, rc_mapping_count;
> >      const uint32_t iort_node_offset = 48;  
> can be replaced by IORT_NODE_OFFSET now
> >      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);  
> nit: you could have done this move in previous patch.
> >  
> >      if (vms->iommu == VIRT_IOMMU_SMMUV3) {
> >  
> > @@ -325,106 +346,100 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
> >              g_array_append_val(its_idmaps, next_range);
> >          }
> >  
> > -        nb_nodes = 3; /* RC, ITS, SMMUv3 */
> >          rc_mapping_count = smmu_idmaps->len + its_idmaps->len;
> > +        /* Number of IORT Nodes */
> > +        build_append_int_noprefix(table_data, 3 /* RC, ITS, SMMUv3 */, 4);
> >      } else {
> > -        nb_nodes = 2; /* RC, ITS */
> >          rc_mapping_count = 1;
> > +        /* Number of IORT Nodes */
> > +        build_append_int_noprefix(table_data, 2 /* RC, ITS */, 4);  
> I think I would prefer to keep the nb_nodes variable and do the
> corresponding build_append_int_noprefix only once. There may be
> additional nodes added with increased complexity and potential extra
> duplication.
> >      }
> >  
> > -    /* 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;
> > -        /* output IORT node is the ITS group node (the first node) */
> > -        idmap->output_reference = cpu_to_le32(iort_node_offset);
> > +        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 */  
> Please keep that comment. I think it helps
>        /* output IORT node is the ITS group node (the first node) */
> > +
> > +        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));
> > -
> > +    /* 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);
> > +    /* Reference to ID Array */
> > +    build_append_int_noprefix(table_data, ROOT_COMPLEX_ENTRY_SIZE, 4);
> >      /* fully coherent device */  
> this comment should become /* Memory access properties */ for homogenity
> > -    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 */
> > -
> > +    build_append_int_noprefix(table_data,
> > +        1 | /* CCA: Cache Coherent Attribute, The device is fully coherent */
> > +        (3ULL << 7 * 8) /* MAF: Memory Access Flags, CCA = CPM = DCAS = 1 */,
> > +        8);  
> I think we would gain in readability if we were to split into multiple
> 
> build_append_int_noprefix according to Table 13 fields

in spec I've got it's "Table 14: Memory access properties"
Do you have any preference which spec/rev/ we should use for IORT?

> 
> > +    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);  
> please keep the original comment
> > +            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);  
> same, at least it helps me ;-)
> > +            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);  
> Thanks
> 
> Eric
> 

Re: [PATCH v3 33/35] acpi: build_facs: use build_append_int_noprefix() API to compose table

[Igor Mammedov]

On Wed, 22 Sep 2021 15:33:27 +0200
Eric Auger <eauger@redhat.com> wrote:

> On 9/7/21 4:48 PM, Igor Mammedov wrote:
> > Drop usage of packed structures and explicit endian
> > conversions when building table and use endian agnostic
> > build_append_int_noprefix() API to build it.
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > CC: marcel.apfelbaum@gmail.com
> > ---
> >  include/hw/acpi/acpi-defs.h | 14 --------------
> >  include/hw/acpi/aml-build.h |  1 +
> >  hw/acpi/aml-build.c         |  2 +-
> >  hw/i386/acpi-build.c        | 18 ++++++++++++++----
> >  4 files changed, 16 insertions(+), 19 deletions(-)
> > 
> > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> > index 0b375e7589..1a0774edd6 100644
> > --- a/include/hw/acpi/acpi-defs.h
> > +++ b/include/hw/acpi/acpi-defs.h
> > @@ -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
> > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> > index 6e1f42e119..6f3d1de1b1 100644
> > --- a/include/hw/acpi/aml-build.h
> > +++ b/include/hw/acpi/aml-build.h
> > @@ -413,6 +413,7 @@ 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);
> > +void build_append_byte(GArray *array, uint8_t val);  
> what's the rationale behind changes related to build_append_byte?

looks like stray remnants from previous revisions, not really needed.
I'll drop it.

> >  
> >  typedef struct AcpiTable {
> >      const char *sig;
> > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> > index 050fdb3f37..4135b385e5 100644
> > --- a/hw/acpi/aml-build.c
> > +++ b/hw/acpi/aml-build.c
> > @@ -47,7 +47,7 @@ static void build_prepend_byte(GArray *array, uint8_t val)
> >      g_array_prepend_val(array, val);
> >  }
> >  
> > -static void build_append_byte(GArray *array, uint8_t val)
> > +void build_append_byte(GArray *array, uint8_t val)
> >  {
> >      g_array_append_val(array, val);
> >  }
> > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > index 9f888d5a2c..547cd4ed9d 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -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)
> >   
> Without thoses changes
> 
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> 

Re: [PATCH v3 00/35] acpi: refactor error prone build_header() and packed structures usage in ACPI tables

[Igor Mammedov]

On Tue,  7 Sep 2021 10:47:39 -0400
Igor Mammedov <imammedo@redhat.com> wrote:

Michael,

there are some fixups accumulated (mostly doc/comment related or
dropping some not related code movements),
I can respin series quickly with them incorporated or do fixups on top.
Which one would you prefer?

> 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_v3
> 
> Previous v2 revision can be found at:
>    https://www.mail-archive.com/qemu-devel@nongnu.org/msg822151.html
> 
> 
> CC: mst@redhat.com
> 
> 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          |  38 +-
>  include/hw/i386/pc.h                 |   6 +-
>  hw/acpi/acpi-x86-stub.c              |   3 +-
>  hw/acpi/aml-build.c                  | 197 +++++----
>  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                    |  16 +-
>  hw/arm/virt-acpi-build.c             | 577 +++++++++++++++------------
>  hw/i386/acpi-build.c                 | 304 +++++++-------
>  hw/i386/acpi-common.c                | 158 ++++----
>  hw/i386/acpi-microvm.c               |  13 +-
>  16 files changed, 798 insertions(+), 1168 deletions(-)
> 

Re: [PATCH v3 11/35] acpi: nvdimm_build_ssdt: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Igor Mammedov]

On Mon, 20 Sep 2021 18:41:30 +0200
Eric Auger <eauger@redhat.com> wrote:

> Hi Igor,
> 
> On 9/7/21 4:47 PM, Igor Mammedov wrote:
> > 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.
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > v3:
> >   * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> > 
> > CC: xiaoguangrong.eric@gmail.com
> > ---
> >  hw/acpi/nvdimm.c | 18 ++++++++++--------
> >  1 file changed, 10 insertions(+), 8 deletions(-)
> > 
> > diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
> > index 15f6ca82ca..e050b47c2b 100644
> > --- a/hw/acpi/nvdimm.c
> > +++ b/hw/acpi/nvdimm.c
> > @@ -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 recalculates checksum which were
> > +     * scheduled by acpi_table_composed()  
> s/acpi_table_composed/acpi_table_end.
fixed it up:

    /*                                                                           
     * 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()                                             
     */ 
 
> also the sentence may need some rewording.
> 
> Wonder if that kind of comment still is useful. Maybe this should be put
> once in the doc comment of acpi_table_end() in [PATCH v3 01/35] acpi:
> add helper routines to initialize ACPI tables, for future users to pay
> attention that it shall be called at the very end.

I'll keep comment for now, and add patch to add something similar to
acpi_table_end() later or drop it if I come up with a way to actually
enforce expected linker order.

 
> Besides
> 
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> 
> Eric
> 
> 
> > +     */
> > +    acpi_table_end(linker, &table);
> >  }
> >  
> >  void nvdimm_build_srat(GArray *table_data)
> >   
> 

Re: [PATCH v3 12/35] acpi: vmgenid_build_acpi: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Igor Mammedov]

On Wed, 22 Sep 2021 09:23:16 +0200
Eric Auger <eauger@redhat.com> wrote:

> On 9/7/21 4:47 PM, Igor Mammedov wrote:
> > 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.
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > v3:
> >   * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> > ---
> >  hw/acpi/vmgenid.c | 16 +++++++---------
> >  1 file changed, 7 insertions(+), 9 deletions(-)
> > 
> > diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c
> > index 4f41a13ea0..95f94a2510 100644
> > --- a/hw/acpi/vmgenid.c
> > +++ b/hw/acpi/vmgenid.c
> > @@ -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,15 +44,12 @@ 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");
> > +    vgia_offset = table_data->len + build_append_named_dword(ssdt->buf, "VGIA");  
> not mandated but well

dropped

> 
> >      scope = aml_scope("\\_SB");
> >      dev = aml_device("VGEN");
> >      aml_append(dev, aml_name_decl("_HID", aml_string("QEMUVGID")));
> > @@ -116,9 +115,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 */  
> ditto
I'd prefer to keep this reminder until there is a way to
enforce valid order.

> > +    acpi_table_end(linker, &table);
> >      free_aml_allocator();
> >  }
> >  
> >   
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> 
> Eric
> 

Re: [PATCH v3 16/35] acpi: arm/x86: build_srat: use acpi_table_begin()/acpi_table_end() instead of build_header()

[Igor Mammedov]

On Wed, 22 Sep 2021 09:38:14 +0200
Eric Auger <eauger@redhat.com> wrote:

> Hi Igor,
> 
> On 9/7/21 4:47 PM, Igor Mammedov wrote:
> > 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.  

> nit: also removes AcpiSystemResourceAffinityTable and use
> build_append_int_noprefix for reserved fields

I didn't find it as worth of mentioning, the same is done
in some other patches where header wasn't standard one.

> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > v3:
> >   * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> > 
> > CC: shannon.zhaosl@gmail.com
> > CC: peter.maydell@linaro.org
> > CC: marcel.apfelbaum@gmail.com
> > CC: qemu-arm@nongnu.org
> > CC: drjones@redhat.com
> > CC: eauger@redhat.com
> > ---
> >  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(-)
> > 
> > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> > index 3b42b138f0..5826ee04b6 100644
> > --- a/include/hw/acpi/acpi-defs.h
> > +++ b/include/hw/acpi/acpi-defs.h
> > @@ -358,17 +358,6 @@ struct AcpiGenericTimerTable {
> >  } QEMU_PACKED;
> >  typedef struct AcpiGenericTimerTable AcpiGenericTimerTable;
> >  
> > -/*
> > - * SRAT (NUMA topology description) table  
> Missing version reference if any
> https://uefi.org/specs/ACPI/6.4/05_ACPI_Software_Programming_Model/ACPI_Software_Programming_Model.html#system-resource-affinity-table-srat
> 5.2.16. System Resource Affinity Table (SRAT)

next patch adds missing doc comment(s) when converting
to build_append_int_noprefix()


> > - */
> > -
> > -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
> > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> > index 037cc1fd82..21efe7fe34 100644
> > --- a/hw/arm/virt-acpi-build.c
> > +++ b/hw/arm/virt-acpi-build.c
> > @@ -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 */
> > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > index c329580cff..41c0a63b30 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -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 hotplugabble_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);
> >  }
> >  
> >  /*
> >   
> Besides
> 
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> 
> 
> Eric
> 

Re: [PATCH v3 24/35] acpi: x86: madt: use build_append_int_noprefix() API to compose MADT table

[Igor Mammedov]

On Wed, 22 Sep 2021 12:20:54 +0200
Eric Auger <eauger@redhat.com> wrote:

> On 9/7/21 4:48 PM, Igor Mammedov wrote:
> > Drop 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.
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > CC: marcel.apfelbaum@gmail.com
> > CC: eauger@redhat.com
> > ---
> >  include/hw/acpi/acpi-defs.h |  64 ------------------
> >  hw/i386/acpi-common.c       | 127 ++++++++++++++++++------------------
> >  2 files changed, 65 insertions(+), 126 deletions(-)
> > 
> > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> > index af4fa412a5..3f174ba208 100644
> > --- a/include/hw/acpi/acpi-defs.h
> > +++ b/include/hw/acpi/acpi-defs.h
> > @@ -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;
> > diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
> > index 7983a13a93..aa7b5c357e 100644
> > --- a/hw/i386/acpi-common.c
> > +++ b/hw/i386/acpi-common.c
> > @@ -38,7 +38,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
> >                         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;
> > +    /* Flags – Local APIC Flags */  
> nit: move that comment at the place of the build_append_int_noprefix

that place(s) already has comment in expected format, here is just reminder
about what is initialized here.

> > +    uint32_t flags = apic_ids->cpus[uid].cpu != NULL || force_enabled ?
> > +                     1 /* Enabled */ : 0;
> >  
> >      /* ACPI spec says that LAPIC entry for non present
> >       * CPU may be omitted from MADT or it must be marked
> > @@ -47,24 +49,47 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
> >       * should be put in MADT but kept disabled.
> >       */
> >      if (apic_id < 255) {
> > -        AcpiMadtProcessorApic *apic = acpi_data_push(entry, sizeof *apic);
> > -
> > -        apic->type = ACPI_APIC_PROCESSOR;
> > -        apic->length = sizeof(*apic);
> > -        apic->processor_id = uid;
> > -        apic->local_apic_id = apic_id;
> > -        apic->flags = cpu_to_le32(flags);
> > +        /* Rev 1.0b, Table 5-13 Processor Local APIC Structure */
> > +        build_append_int_noprefix(entry, 0, 1);       /* Type */
> > +        build_append_int_noprefix(entry, 8, 1);       /* Length */
> > +        build_append_int_noprefix(entry, uid, 1);     /* ACPI Processor ID */  
> nit s/ID/UID

it's ID in 1.0b

> > +        build_append_int_noprefix(entry, apic_id, 1); /* APIC ID */
> > +        build_append_int_noprefix(entry, flags, 4); /* Flags */
> >      } else {
> > -        AcpiMadtProcessorX2Apic *apic = acpi_data_push(entry, sizeof *apic);
> > -
> > -        apic->type = ACPI_APIC_LOCAL_X2APIC;
> > -        apic->length = sizeof(*apic);
> > -        apic->uid = cpu_to_le32(uid);
> > -        apic->x2apic_id = cpu_to_le32(apic_id);
> > -        apic->flags = cpu_to_le32(flags);
> > +        /* Rev 4.0, 5.2.12.12 Processor Local x2APIC Structure */
> > +        build_append_int_noprefix(entry, 9, 1);       /* Type */
> > +        build_append_int_noprefix(entry, 16, 1);      /* Length */
> > +        build_append_int_noprefix(entry, 0, 2);       /* Reserved */
> > +        build_append_int_noprefix(entry, apic_id, 4); /* X2APIC ID */
> > +        build_append_int_noprefix(entry, flags, 4);   /* Flags */
> > +        build_append_int_noprefix(entry, uid, 4);     /* ACPI Processor UID */
> >      }
> >  }
> >  
> > +static void build_ioapic(GArray *entry, uint8_t id, uint32_t addr, uint32_t irq)
> > +{
> > +    /* Rev 1.0b, 5.2.8.2 IO APIC */
> > +    build_append_int_noprefix(entry, 1, 1);    /* Type */
> > +    build_append_int_noprefix(entry, 12, 1);   /* Length */
> > +    build_append_int_noprefix(entry, id, 1);   /* IO APIC ID */
> > +    build_append_int_noprefix(entry, 0, 1);    /* Reserved */
> > +    build_append_int_noprefix(entry, addr, 4); /* IO APIC Address */
> > +    build_append_int_noprefix(entry, irq, 4);  /* System Vector Base */
> > +}
> > +
> > +static void
> > +build_xrupt_override(GArray *entry, uint8_t src, uint32_t gsi, uint16_t flags)
> > +{
> > +    /* Rev 1.0b, 5.2.8.3.1 Interrupt Source Overrides */
> > +    build_append_int_noprefix(entry, 2, 1);  /* Type */
> > +    build_append_int_noprefix(entry, 10, 1); /* Length */
> > +    build_append_int_noprefix(entry, 0, 1);  /* Bus */
> > +    build_append_int_noprefix(entry, src, 1);  /* Source */
> > +    /* Global System Interrupt Vector */
> > +    build_append_int_noprefix(entry, gsi, 4);
> > +    build_append_int_noprefix(entry, flags, 2);  /* Flags */
> > +}
> > +
> >  /*
> >   * ACPI spec, Revision 1.0b
> >   * 5.2.8 Multiple APIC Description Table
> > @@ -73,14 +98,11 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
> >                       X86MachineState *x86ms, AcpiDeviceIf *adev,
> >                       const char *oem_id, const char *oem_table_id)
> >  {
> > +    int i;
> > +    bool x2apic_mode = false;
> >      MachineClass *mc = MACHINE_GET_CLASS(x86ms);
> >      const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(x86ms));
> >      AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(adev);
> > -    bool x2apic_mode = false;
> > -
> > -    AcpiMadtIoApic *io_apic;
> > -    AcpiMadtIntsrcovr *intsrcovr;
> > -    int i;
> >      AcpiTable table = { .sig = "APIC", .rev = 1, .oem_id = oem_id,
> >                          .oem_table_id = oem_table_id };
> >  
> > @@ -96,30 +118,14 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
> >          }
> >      }
> >  
> > -    io_apic = acpi_data_push(table_data, sizeof *io_apic);
> > -    io_apic->type = ACPI_APIC_IO;
> > -    io_apic->length = sizeof(*io_apic);
> > -    io_apic->io_apic_id = ACPI_BUILD_IOAPIC_ID;
> > -    io_apic->address = cpu_to_le32(IO_APIC_DEFAULT_ADDRESS);
> > -    io_apic->interrupt = cpu_to_le32(0);
> > -
> > +    build_ioapic(table_data, ACPI_BUILD_IOAPIC_ID, IO_APIC_DEFAULT_ADDRESS, 0);
> >      if (x86ms->ioapic2) {
> > -        AcpiMadtIoApic *io_apic2;
> > -        io_apic2 = acpi_data_push(table_data, sizeof *io_apic);
> > -        io_apic2->type = ACPI_APIC_IO;
> > -        io_apic2->length = sizeof(*io_apic);
> > -        io_apic2->io_apic_id = ACPI_BUILD_IOAPIC_ID + 1;
> > -        io_apic2->address = cpu_to_le32(IO_APIC_SECONDARY_ADDRESS);
> > -        io_apic2->interrupt = cpu_to_le32(IO_APIC_SECONDARY_IRQBASE);
> > +        build_ioapic(table_data, ACPI_BUILD_IOAPIC_ID + 1,
> > +                     IO_APIC_SECONDARY_ADDRESS, IO_APIC_SECONDARY_IRQBASE);
> >      }
> >  
> >      if (x86ms->apic_xrupt_override) {
> > -        intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
> > -        intsrcovr->type   = ACPI_APIC_XRUPT_OVERRIDE;
> > -        intsrcovr->length = sizeof(*intsrcovr);
> > -        intsrcovr->source = 0;
> > -        intsrcovr->gsi    = cpu_to_le32(2);
> > -        intsrcovr->flags  = cpu_to_le16(0); /* conforms to bus specifications */
> > +        build_xrupt_override(table_data, 0, 2, 0);  

> lost /* conforms to bus specifications */ comment for the flag during
> the battle/ Don't know if it is useful though


> >      }
> >  
> >      for (i = 1; i < 16; i++) {
> > @@ -127,32 +133,29 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
> >              /* No need for a INT source override structure. */
> >              continue;
> >          }
> > -        intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
> > -        intsrcovr->type   = ACPI_APIC_XRUPT_OVERRIDE;
> > -        intsrcovr->length = sizeof(*intsrcovr);
> > -        intsrcovr->source = i;
> > -        intsrcovr->gsi    = cpu_to_le32(i);
> > -        intsrcovr->flags  = cpu_to_le16(0xd); /* active high, level triggered */
> > +        build_xrupt_override(table_data, i, i, 0xd);  
> Lost for the flag /* active high, level triggered */
> >      }
> >  
> >      if (x2apic_mode) {
> > -        AcpiMadtLocalX2ApicNmi *local_nmi;
> > -
> > -        local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
> > -        local_nmi->type   = ACPI_APIC_LOCAL_X2APIC_NMI;
> > -        local_nmi->length = sizeof(*local_nmi);
> > -        local_nmi->uid    = 0xFFFFFFFF; /* all processors */
> > -        local_nmi->flags  = cpu_to_le16(0);
> > -        local_nmi->lint   = 1; /* ACPI_LINT1 */
> > +        /* Rev 4.0, 5.2.12.13 Local x2APIC NMI Structure*/
> > +        build_append_int_noprefix(table_data, 0xA, 1); /* Type */
> > +        build_append_int_noprefix(table_data, 12, 1);  /* Length */
> > +        build_append_int_noprefix(table_data, 0, 2);   /* Flags */
> > +        /* ACPI Processor UID */
> > +        build_append_int_noprefix(table_data, 0xFFFFFFFF /* all processors */,
> > +                                  4);
> > +        /* Local x2APIC INTI# */  
> Local x2APIC LINT#
> > +        build_append_int_noprefix(table_data, 1 /* ACPI_LINT1 */, 1);
> > +        build_append_int_noprefix(table_data, 0, 3);  
> /* reserved */
> >      } else {
> > -        AcpiMadtLocalNmi *local_nmi;
> > -
> > -        local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
> > -        local_nmi->type         = ACPI_APIC_LOCAL_NMI;
> > -        local_nmi->length       = sizeof(*local_nmi);
> > -        local_nmi->processor_id = 0xff; /* all processors */
> > -        local_nmi->flags        = cpu_to_le16(0);
> > -        local_nmi->lint         = 1; /* ACPI_LINT1 */
> > +        /* Rev 1.0b, 5.2.8.3.3 Local APIC NMI */
> > +        build_append_int_noprefix(table_data, 4, 1);  /* Type */
> > +        build_append_int_noprefix(table_data, 6, 1);  /* Length */
> > +        /* ACPI Processor ID */
> > +        build_append_int_noprefix(table_data, 0xff /* all processors */, 1);  
> 0xFF

> > +        build_append_int_noprefix(table_data, 0, 2);  /* Flags */
> > +        /* Local APIC INTI# */  
> Local APIC LINT#

it's "Local APIC INTI#" in 1.0b

> > +        build_append_int_noprefix(table_data, 1 /* ACPI_LINT1 */, 1);
> >      }
> >  
> >      acpi_table_end(linker, &table);
> >   

the rest is fixed up

> Besides
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> 
> Eric
> 

Re: [PATCH v3 29/35] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API

[Eric Auger]

Hi Igor,
On 9/22/21 3:54 PM, Igor Mammedov wrote:
> On Wed, 22 Sep 2021 15:26:49 +0200
> Eric Auger <eric.auger@redhat.com> wrote:
>
> I'll fix patch up as suggested,
> though there is a question, see below
>
>> On 9/7/21 4:48 PM, Igor Mammedov wrote:
>>> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>>> ---
>>> v3:
>>>   * practically rewritten, due to conflicts wiht bypass iommu feature
>>>
>>> CC: drjones@redhat.com
>>> CC: peter.maydell@linaro.org
>>> CC: shannon.zhaosl@gmail.com
>>> CC: qemu-arm@nongnu.org
>>> CC: wangxingang5@huawei.com
>>> CC: Eric Auger <eric.auger@redhat.com>
>>> ---
>>>  include/hw/acpi/acpi-defs.h |  71 ---------------
>>>  hw/arm/virt-acpi-build.c    | 167 ++++++++++++++++++++----------------
>>>  2 files changed, 91 insertions(+), 147 deletions(-)
>>>
>>> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
>>> index 195f90caf6..6f2f08a9de 100644
>>> --- a/include/hw/acpi/acpi-defs.h
>>> +++ b/include/hw/acpi/acpi-defs.h
>>> @@ -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
>>> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
>>> index bceb1b3b7e..4c682e7b09 100644
>>> --- a/hw/arm/virt-acpi-build.c
>>> +++ b/hw/arm/virt-acpi-build.c
>>> @@ -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)
>>> @@ -281,18 +303,17 @@ static int iort_idmap_compare(gconstpointer a, gconstpointer b)
>>>  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;
>>> +    int i, rc_mapping_count;
>>>      const uint32_t iort_node_offset = 48;  
>> can be replaced by IORT_NODE_OFFSET now
>>>      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);  
>> nit: you could have done this move in previous patch.
>>>  
>>>      if (vms->iommu == VIRT_IOMMU_SMMUV3) {
>>>  
>>> @@ -325,106 +346,100 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
>>>              g_array_append_val(its_idmaps, next_range);
>>>          }
>>>  
>>> -        nb_nodes = 3; /* RC, ITS, SMMUv3 */
>>>          rc_mapping_count = smmu_idmaps->len + its_idmaps->len;
>>> +        /* Number of IORT Nodes */
>>> +        build_append_int_noprefix(table_data, 3 /* RC, ITS, SMMUv3 */, 4);
>>>      } else {
>>> -        nb_nodes = 2; /* RC, ITS */
>>>          rc_mapping_count = 1;
>>> +        /* Number of IORT Nodes */
>>> +        build_append_int_noprefix(table_data, 2 /* RC, ITS */, 4);  
>> I think I would prefer to keep the nb_nodes variable and do the
>> corresponding build_append_int_noprefix only once. There may be
>> additional nodes added with increased complexity and potential extra
>> duplication.
>>>      }
>>>  
>>> -    /* 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;
>>> -        /* output IORT node is the ITS group node (the first node) */
>>> -        idmap->output_reference = cpu_to_le32(iort_node_offset);
>>> +        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 */  
>> Please keep that comment. I think it helps
>>        /* output IORT node is the ITS group node (the first node) */
>>> +
>>> +        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));
>>> -
>>> +    /* 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);
>>> +    /* Reference to ID Array */
>>> +    build_append_int_noprefix(table_data, ROOT_COMPLEX_ENTRY_SIZE, 4);
>>>      /* fully coherent device */  
>> this comment should become /* Memory access properties */ for homogenity
>>> -    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 */
>>> -
>>> +    build_append_int_noprefix(table_data,
>>> +        1 | /* CCA: Cache Coherent Attribute, The device is fully coherent */
>>> +        (3ULL << 7 * 8) /* MAF: Memory Access Flags, CCA = CPM = DCAS = 1 */,
>>> +        8);  
>> I think we would gain in readability if we were to split into multiple
>>
>> build_append_int_noprefix according to Table 13 fields
> in spec I've got it's "Table 14: Memory access properties"
> Do you have any preference which spec/rev/ we should use for IORT?

I looked at Document number: ARM DEN 0049B
as said in the comment Document number: ARM DEN 0049B, October 2015
Found
https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=&ved=2ahUKEwjD3q_E0JLzAhVtgP0HHRuxDtYQFnoECAIQAQ&url=https%3A%2F%2Fdocumentation-service.arm.com%2Fstatic%2F5f8eb168f86e16515cdbe414%3Ftoken%3D&usg=AOvVaw1tQQk9lJwojw_hM6ZJUbat

Table 13 Memory access properties Thanks Eric

>
>>> +    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);  
>> please keep the original comment
>>> +            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);  
>> same, at least it helps me ;-)
>>> +            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);  
>> Thanks
>>
>> Eric
>>

Re: [PATCH v3 17/35] acpi: use build_append_int_noprefix() API to compose SRAT table

[Eric Auger]

On 9/22/21 12:02 PM, Igor Mammedov wrote:
> On Wed, 22 Sep 2021 10:55:20 +0200
> Eric Auger <eauger@redhat.com> wrote:
> 
>> On 9/7/21 4:47 PM, Igor Mammedov wrote:
>>> Drop 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.
>>>
>>> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>>> ---
>>> v3:
>>>  * rebase on top of (e77af21a7a2 hw/i386/acpi-build: Get NUMA information from struct NumaState)
>>> CC: xiaoguangrong.eric@gmail.com
>>> CC: shannon.zhaosl@gmail.com
>>> CC: peter.maydell@linaro.org
>>> CC: marcel.apfelbaum@gmail.com
>>> CC: qemu-arm@nongnu.org
>>> CC: drjones@redhat.com
>>> CC: eauger@redhat.com
>>> ---
>>>  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(-)
>>>
>>> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
>>> index 5826ee04b6..d293304f9c 100644
>>> --- a/include/hw/acpi/acpi-defs.h
>>> +++ b/include/hw/acpi/acpi-defs.h
>>> @@ -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
>>> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
>>> index 4242382399..6e1f42e119 100644
>>> --- a/include/hw/acpi/aml-build.h
>>> +++ b/include/hw/acpi/aml-build.h
>>> @@ -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,
>>> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
>>> index 5e8bfb631c..050fdb3f37 100644
>>> --- a/hw/acpi/aml-build.c
>>> +++ b/hw/acpi/aml-build.c
>>> @@ -1936,15 +1936,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 */
>>>  }
>>>  
>>>  /*
>>> diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
>>> index e050b47c2b..baab81f7a6 100644
>>> --- a/hw/acpi/nvdimm.c
>>> +++ b/hw/acpi/nvdimm.c
>>> @@ -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);
>>> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
>>> index 21efe7fe34..6ba02cf281 100644
>>> --- a/hw/arm/virt-acpi-build.c
>>> +++ b/hw/arm/virt-acpi-build.c
>>> @@ -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);
>>> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
>>> index 41c0a63b30..51e0ba07b6 100644
>>> --- a/hw/i386/acpi-build.c
>>> +++ b/hw/i386/acpi-build.c
>>> @@ -1917,13 +1917,15 @@ build_tpm_tcpa(GArray *table_data, BIOSLinker *linker, GArray *tcpalog,
>>>  #define HOLE_640K_START  (640 * KiB)
>>>  #define HOLE_640K_END   (1 * MiB)
>>>  
>>> +/*
>>> + * ACPI spec, Revision 3.0
>>> + * 5.2.15 System Resource Affinity Table (SRAT)
>>> + */
>>>  static void
>>>  build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>>>  {
>>> -    AcpiSratMemoryAffinity *numamem;
>>> -
>>>      int i;
>>> -    int numa_start, slots;
>>> +    int numa_mem_start, slots;
>>>      uint64_t mem_len, mem_base, next_base;
>>>      MachineClass *mc = MACHINE_GET_CLASS(machine);
>>>      X86MachineState *x86ms = X86_MACHINE(machine);
>>> @@ -1946,34 +1948,41 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>>>          uint32_t apic_id = apic_ids->cpus[i].arch_id;
>>>  
>>>          if (apic_id < 255) {
>>> -            AcpiSratProcessorAffinity *core;
>>> -
>>> -            core = acpi_data_push(table_data, sizeof *core);
>>> -            core->type = ACPI_SRAT_PROCESSOR_APIC;
>>> -            core->length = sizeof(*core);
>>> -            core->local_apic_id = apic_id;
>>> -            core->proximity_lo = node_id;
>>> -            memset(core->proximity_hi, 0, 3);
>>> -            core->local_sapic_eid = 0;
>>> -            core->flags = cpu_to_le32(1);
>>> +            /* 5.2.15.1 Processor Local APIC/SAPIC Affinity Structure */
>>> +            build_append_int_noprefix(table_data, 0, 1);  /* Type  */
>>> +            build_append_int_noprefix(table_data, 16, 1); /* Length */
>>> +            /* Proximity Domain [7:0] */
>>> +            build_append_int_noprefix(table_data, node_id, 1);
>>> +            build_append_int_noprefix(table_data, apic_id, 1); /* APIC ID */
>>> +            /* Flags, Table 5-36 */
>>> +            build_append_int_noprefix(table_data, 1, 4);
>>> +            build_append_int_noprefix(table_data, 0, 1); /* Local SAPIC EID */
>>> +            /* Proximity Domain [31:8] */
>>> +            build_append_int_noprefix(table_data, 0, 3);
>>> +            build_append_int_noprefix(table_data, 0, 4); /* Reserved */  
>> clock domain?
> not in 3.0,  it was renamed later (4.0)
OK I must have looked at some other version. Not always easy to find
older ones.

Eric
> 
>>>          } else {
>>> -            AcpiSratProcessorX2ApicAffinity *core;
>>> -
>>> -            core = acpi_data_push(table_data, sizeof *core);
>>> -            core->type = ACPI_SRAT_PROCESSOR_x2APIC;
>>> -            core->length = sizeof(*core);
>>> -            core->x2apic_id = cpu_to_le32(apic_id);
>>> -            core->proximity_domain = cpu_to_le32(node_id);
>>> -            core->flags = cpu_to_le32(1);
>>> +            /*
>>> +             * ACPI spec, Revision 4.0
>>> +             * 5.2.16.3 Processor Local x2APIC Affinity Structure
>>> +             */
>>> +            build_append_int_noprefix(table_data, 2, 1);  /* Type  */
>>> +            build_append_int_noprefix(table_data, 24, 1); /* Length */
>>> +            build_append_int_noprefix(table_data, 0, 2); /* Reserved */
>>> +            /* Proximity Domain */
>>> +            build_append_int_noprefix(table_data, node_id, 4);
>>> +            build_append_int_noprefix(table_data, apic_id, 4); /* X2APIC ID */
>>> +            /* Flags, Table 5-39 */
>>> +            build_append_int_noprefix(table_data, 1 /* Enabled */, 4);
>>> +            build_append_int_noprefix(table_data, 0, 4); /* Clock Domain */
>>> +            build_append_int_noprefix(table_data, 0, 4); /* Reserved */
>>>          }
>>>      }
>>>  
>>> -
>>>      /* the memory map is a bit tricky, it contains at least one hole
>>>       * from 640k-1M and possibly another one from 3.5G-4G.
>>>       */
>>>      next_base = 0;
>>> -    numa_start = table_data->len;
>>> +    numa_mem_start = table_data->len;
>>>  
>>>      for (i = 1; i < nb_numa_nodes + 1; ++i) {
>>>          mem_base = next_base;
>>> @@ -1985,8 +1994,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>>>              next_base > HOLE_640K_START) {
>>>              mem_len -= next_base - HOLE_640K_START;
>>>              if (mem_len > 0) {
>>> -                numamem = acpi_data_push(table_data, sizeof *numamem);
>>> -                build_srat_memory(numamem, mem_base, mem_len, i - 1,
>>> +                build_srat_memory(table_data, mem_base, mem_len, i - 1,
>>>                                    MEM_AFFINITY_ENABLED);
>>>              }
>>>  
>>> @@ -2004,8 +2012,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>>>              next_base > x86ms->below_4g_mem_size) {
>>>              mem_len -= next_base - x86ms->below_4g_mem_size;
>>>              if (mem_len > 0) {
>>> -                numamem = acpi_data_push(table_data, sizeof *numamem);
>>> -                build_srat_memory(numamem, mem_base, mem_len, i - 1,
>>> +                build_srat_memory(table_data, mem_base, mem_len, i - 1,
>>>                                    MEM_AFFINITY_ENABLED);
>>>              }
>>>              mem_base = 1ULL << 32;
>>> @@ -2014,8 +2021,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>>>          }
>>>  
>>>          if (mem_len > 0) {
>>> -            numamem = acpi_data_push(table_data, sizeof *numamem);
>>> -            build_srat_memory(numamem, mem_base, mem_len, i - 1,
>>> +            build_srat_memory(table_data, mem_base, mem_len, i - 1,
>>>                                MEM_AFFINITY_ENABLED);
>>>          }
>>>      }
>>> @@ -2024,10 +2030,15 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>>>          nvdimm_build_srat(table_data);
>>>      }
>>>  
>>> -    slots = (table_data->len - numa_start) / sizeof *numamem;
>>> +    /*
>>> +     * TODO: this part is not in ACPI spec and current linux kernel boots fine
>>> +     * without these entries. But I recall there were issues the last time I
>>> +     * tried to remove it with some ancient guest OS, however I can't remember
>>> +     * what that was so keep this around for now
>>> +     */
>>> +    slots = (table_data->len - numa_mem_start) / 40 /* mem affinity len */;
>>>      for (; slots < nb_numa_nodes + 2; slots++) {
>>> -        numamem = acpi_data_push(table_data, sizeof *numamem);
>>> -        build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
>>> +        build_srat_memory(table_data, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
>>>      }
>>>  
>>>      /*
>>> @@ -2039,8 +2050,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>>>       * providing _PXM method if necessary.
>>>       */
>>>      if (hotplugabble_address_space_size) {
>>> -        numamem = acpi_data_push(table_data, sizeof *numamem);
>>> -        build_srat_memory(numamem, machine->device_memory->base,
>>> +        build_srat_memory(table_data, machine->device_memory->base,
>>>                            hotplugabble_address_space_size, nb_numa_nodes - 1,
>>>                            MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
>>>      }
>>>   
>> Besides
>> Reviewed-by: Eric Auger <eric.auger@redhat.com>
>>
>> Eric
>>
> 

Re: [PATCH v3 24/35] acpi: x86: madt: use build_append_int_noprefix() API to compose MADT table

[Eric Auger]

Hi,
On 9/22/21 5:30 PM, Igor Mammedov wrote:
> On Wed, 22 Sep 2021 12:20:54 +0200
> Eric Auger <eauger@redhat.com> wrote:
> 
>> On 9/7/21 4:48 PM, Igor Mammedov wrote:
>>> Drop 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.
>>>
>>> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>>> ---
>>> CC: marcel.apfelbaum@gmail.com
>>> CC: eauger@redhat.com
>>> ---
>>>  include/hw/acpi/acpi-defs.h |  64 ------------------
>>>  hw/i386/acpi-common.c       | 127 ++++++++++++++++++------------------
>>>  2 files changed, 65 insertions(+), 126 deletions(-)
>>>
>>> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
>>> index af4fa412a5..3f174ba208 100644
>>> --- a/include/hw/acpi/acpi-defs.h
>>> +++ b/include/hw/acpi/acpi-defs.h
>>> @@ -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;
>>> diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
>>> index 7983a13a93..aa7b5c357e 100644
>>> --- a/hw/i386/acpi-common.c
>>> +++ b/hw/i386/acpi-common.c
>>> @@ -38,7 +38,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
>>>                         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;
>>> +    /* Flags – Local APIC Flags */  
>> nit: move that comment at the place of the build_append_int_noprefix
> 
> that place(s) already has comment in expected format, here is just reminder
> about what is initialized here.
> 
>>> +    uint32_t flags = apic_ids->cpus[uid].cpu != NULL || force_enabled ?
>>> +                     1 /* Enabled */ : 0;
>>>  
>>>      /* ACPI spec says that LAPIC entry for non present
>>>       * CPU may be omitted from MADT or it must be marked
>>> @@ -47,24 +49,47 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
>>>       * should be put in MADT but kept disabled.
>>>       */
>>>      if (apic_id < 255) {
>>> -        AcpiMadtProcessorApic *apic = acpi_data_push(entry, sizeof *apic);
>>> -
>>> -        apic->type = ACPI_APIC_PROCESSOR;
>>> -        apic->length = sizeof(*apic);
>>> -        apic->processor_id = uid;
>>> -        apic->local_apic_id = apic_id;
>>> -        apic->flags = cpu_to_le32(flags);
>>> +        /* Rev 1.0b, Table 5-13 Processor Local APIC Structure */
>>> +        build_append_int_noprefix(entry, 0, 1);       /* Type */
>>> +        build_append_int_noprefix(entry, 8, 1);       /* Length */
>>> +        build_append_int_noprefix(entry, uid, 1);     /* ACPI Processor ID */  
>> nit s/ID/UID
> 
> it's ID in 1.0b
> 
>>> +        build_append_int_noprefix(entry, apic_id, 1); /* APIC ID */
>>> +        build_append_int_noprefix(entry, flags, 4); /* Flags */
>>>      } else {
>>> -        AcpiMadtProcessorX2Apic *apic = acpi_data_push(entry, sizeof *apic);
>>> -
>>> -        apic->type = ACPI_APIC_LOCAL_X2APIC;
>>> -        apic->length = sizeof(*apic);
>>> -        apic->uid = cpu_to_le32(uid);
>>> -        apic->x2apic_id = cpu_to_le32(apic_id);
>>> -        apic->flags = cpu_to_le32(flags);
>>> +        /* Rev 4.0, 5.2.12.12 Processor Local x2APIC Structure */
>>> +        build_append_int_noprefix(entry, 9, 1);       /* Type */
>>> +        build_append_int_noprefix(entry, 16, 1);      /* Length */
>>> +        build_append_int_noprefix(entry, 0, 2);       /* Reserved */
>>> +        build_append_int_noprefix(entry, apic_id, 4); /* X2APIC ID */
>>> +        build_append_int_noprefix(entry, flags, 4);   /* Flags */
>>> +        build_append_int_noprefix(entry, uid, 4);     /* ACPI Processor UID */
>>>      }
>>>  }
>>>  
>>> +static void build_ioapic(GArray *entry, uint8_t id, uint32_t addr, uint32_t irq)
>>> +{
>>> +    /* Rev 1.0b, 5.2.8.2 IO APIC */
>>> +    build_append_int_noprefix(entry, 1, 1);    /* Type */
>>> +    build_append_int_noprefix(entry, 12, 1);   /* Length */
>>> +    build_append_int_noprefix(entry, id, 1);   /* IO APIC ID */
>>> +    build_append_int_noprefix(entry, 0, 1);    /* Reserved */
>>> +    build_append_int_noprefix(entry, addr, 4); /* IO APIC Address */
>>> +    build_append_int_noprefix(entry, irq, 4);  /* System Vector Base */
>>> +}
>>> +
>>> +static void
>>> +build_xrupt_override(GArray *entry, uint8_t src, uint32_t gsi, uint16_t flags)
>>> +{
>>> +    /* Rev 1.0b, 5.2.8.3.1 Interrupt Source Overrides */
>>> +    build_append_int_noprefix(entry, 2, 1);  /* Type */
>>> +    build_append_int_noprefix(entry, 10, 1); /* Length */
>>> +    build_append_int_noprefix(entry, 0, 1);  /* Bus */
>>> +    build_append_int_noprefix(entry, src, 1);  /* Source */
>>> +    /* Global System Interrupt Vector */
>>> +    build_append_int_noprefix(entry, gsi, 4);
>>> +    build_append_int_noprefix(entry, flags, 2);  /* Flags */
>>> +}
>>> +
>>>  /*
>>>   * ACPI spec, Revision 1.0b
>>>   * 5.2.8 Multiple APIC Description Table
>>> @@ -73,14 +98,11 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
>>>                       X86MachineState *x86ms, AcpiDeviceIf *adev,
>>>                       const char *oem_id, const char *oem_table_id)
>>>  {
>>> +    int i;
>>> +    bool x2apic_mode = false;
>>>      MachineClass *mc = MACHINE_GET_CLASS(x86ms);
>>>      const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(x86ms));
>>>      AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(adev);
>>> -    bool x2apic_mode = false;
>>> -
>>> -    AcpiMadtIoApic *io_apic;
>>> -    AcpiMadtIntsrcovr *intsrcovr;
>>> -    int i;
>>>      AcpiTable table = { .sig = "APIC", .rev = 1, .oem_id = oem_id,
>>>                          .oem_table_id = oem_table_id };
>>>  
>>> @@ -96,30 +118,14 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
>>>          }
>>>      }
>>>  
>>> -    io_apic = acpi_data_push(table_data, sizeof *io_apic);
>>> -    io_apic->type = ACPI_APIC_IO;
>>> -    io_apic->length = sizeof(*io_apic);
>>> -    io_apic->io_apic_id = ACPI_BUILD_IOAPIC_ID;
>>> -    io_apic->address = cpu_to_le32(IO_APIC_DEFAULT_ADDRESS);
>>> -    io_apic->interrupt = cpu_to_le32(0);
>>> -
>>> +    build_ioapic(table_data, ACPI_BUILD_IOAPIC_ID, IO_APIC_DEFAULT_ADDRESS, 0);
>>>      if (x86ms->ioapic2) {
>>> -        AcpiMadtIoApic *io_apic2;
>>> -        io_apic2 = acpi_data_push(table_data, sizeof *io_apic);
>>> -        io_apic2->type = ACPI_APIC_IO;
>>> -        io_apic2->length = sizeof(*io_apic);
>>> -        io_apic2->io_apic_id = ACPI_BUILD_IOAPIC_ID + 1;
>>> -        io_apic2->address = cpu_to_le32(IO_APIC_SECONDARY_ADDRESS);
>>> -        io_apic2->interrupt = cpu_to_le32(IO_APIC_SECONDARY_IRQBASE);
>>> +        build_ioapic(table_data, ACPI_BUILD_IOAPIC_ID + 1,
>>> +                     IO_APIC_SECONDARY_ADDRESS, IO_APIC_SECONDARY_IRQBASE);
>>>      }
>>>  
>>>      if (x86ms->apic_xrupt_override) {
>>> -        intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
>>> -        intsrcovr->type   = ACPI_APIC_XRUPT_OVERRIDE;
>>> -        intsrcovr->length = sizeof(*intsrcovr);
>>> -        intsrcovr->source = 0;
>>> -        intsrcovr->gsi    = cpu_to_le32(2);
>>> -        intsrcovr->flags  = cpu_to_le16(0); /* conforms to bus specifications */
>>> +        build_xrupt_override(table_data, 0, 2, 0);  
> 
>> lost /* conforms to bus specifications */ comment for the flag during
>> the battle/ Don't know if it is useful though
> 
> 
>>>      }
>>>  
>>>      for (i = 1; i < 16; i++) {
>>> @@ -127,32 +133,29 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
>>>              /* No need for a INT source override structure. */
>>>              continue;
>>>          }
>>> -        intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
>>> -        intsrcovr->type   = ACPI_APIC_XRUPT_OVERRIDE;
>>> -        intsrcovr->length = sizeof(*intsrcovr);
>>> -        intsrcovr->source = i;
>>> -        intsrcovr->gsi    = cpu_to_le32(i);
>>> -        intsrcovr->flags  = cpu_to_le16(0xd); /* active high, level triggered */
>>> +        build_xrupt_override(table_data, i, i, 0xd);  
>> Lost for the flag /* active high, level triggered */
>>>      }
>>>  
>>>      if (x2apic_mode) {
>>> -        AcpiMadtLocalX2ApicNmi *local_nmi;
>>> -
>>> -        local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
>>> -        local_nmi->type   = ACPI_APIC_LOCAL_X2APIC_NMI;
>>> -        local_nmi->length = sizeof(*local_nmi);
>>> -        local_nmi->uid    = 0xFFFFFFFF; /* all processors */
>>> -        local_nmi->flags  = cpu_to_le16(0);
>>> -        local_nmi->lint   = 1; /* ACPI_LINT1 */
>>> +        /* Rev 4.0, 5.2.12.13 Local x2APIC NMI Structure*/
>>> +        build_append_int_noprefix(table_data, 0xA, 1); /* Type */
>>> +        build_append_int_noprefix(table_data, 12, 1);  /* Length */
>>> +        build_append_int_noprefix(table_data, 0, 2);   /* Flags */
>>> +        /* ACPI Processor UID */
>>> +        build_append_int_noprefix(table_data, 0xFFFFFFFF /* all processors */,
>>> +                                  4);
>>> +        /* Local x2APIC INTI# */  
>> Local x2APIC LINT#
>>> +        build_append_int_noprefix(table_data, 1 /* ACPI_LINT1 */, 1);
>>> +        build_append_int_noprefix(table_data, 0, 3);  
>> /* reserved */
>>>      } else {
>>> -        AcpiMadtLocalNmi *local_nmi;
>>> -
>>> -        local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
>>> -        local_nmi->type         = ACPI_APIC_LOCAL_NMI;
>>> -        local_nmi->length       = sizeof(*local_nmi);
>>> -        local_nmi->processor_id = 0xff; /* all processors */
>>> -        local_nmi->flags        = cpu_to_le16(0);
>>> -        local_nmi->lint         = 1; /* ACPI_LINT1 */
>>> +        /* Rev 1.0b, 5.2.8.3.3 Local APIC NMI */
>>> +        build_append_int_noprefix(table_data, 4, 1);  /* Type */
>>> +        build_append_int_noprefix(table_data, 6, 1);  /* Length */
>>> +        /* ACPI Processor ID */
>>> +        build_append_int_noprefix(table_data, 0xff /* all processors */, 1);  
>> 0xFF
> 
>>> +        build_append_int_noprefix(table_data, 0, 2);  /* Flags */
>>> +        /* Local APIC INTI# */  
>> Local APIC LINT#
> 
> it's "Local APIC INTI#" in 1.0b
OK sorry for the noise. Maybe we should add this link somewhere
https://uefi.org/acpi/specs

I may have looked at some other references when reviewing.

Thanks

Eric
> 
>>> +        build_append_int_noprefix(table_data, 1 /* ACPI_LINT1 */, 1);
>>>      }
>>>  
>>>      acpi_table_end(linker, &table);
>>>   
> 
> the rest is fixed up
> 
>> Besides
>> Reviewed-by: Eric Auger <eric.auger@redhat.com>
>>
>> Eric
>>
> 

Re: [PATCH v3 24/35] acpi: x86: madt: use build_append_int_noprefix() API to compose MADT table

[Igor Mammedov]

On Wed, 22 Sep 2021 17:37:40 +0200
Eric Auger <eauger@redhat.com> wrote:

> Hi,
> On 9/22/21 5:30 PM, Igor Mammedov wrote:
> > On Wed, 22 Sep 2021 12:20:54 +0200
> > Eric Auger <eauger@redhat.com> wrote:
> >   
> >> On 9/7/21 4:48 PM, Igor Mammedov wrote:  
> >>> Drop 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.
> >>>
> >>> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> >>> ---
> >>> CC: marcel.apfelbaum@gmail.com
> >>> CC: eauger@redhat.com
> >>> ---
> >>>  include/hw/acpi/acpi-defs.h |  64 ------------------
> >>>  hw/i386/acpi-common.c       | 127 ++++++++++++++++++------------------
> >>>  2 files changed, 65 insertions(+), 126 deletions(-)
> >>>
> >>> diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
> >>> index af4fa412a5..3f174ba208 100644
> >>> --- a/include/hw/acpi/acpi-defs.h
> >>> +++ b/include/hw/acpi/acpi-defs.h
> >>> @@ -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;
> >>> diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
> >>> index 7983a13a93..aa7b5c357e 100644
> >>> --- a/hw/i386/acpi-common.c
> >>> +++ b/hw/i386/acpi-common.c
> >>> @@ -38,7 +38,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
> >>>                         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;
> >>> +    /* Flags – Local APIC Flags */    
> >> nit: move that comment at the place of the build_append_int_noprefix  
> > 
> > that place(s) already has comment in expected format, here is just reminder
> > about what is initialized here.
> >   
> >>> +    uint32_t flags = apic_ids->cpus[uid].cpu != NULL || force_enabled ?
> >>> +                     1 /* Enabled */ : 0;
> >>>  
> >>>      /* ACPI spec says that LAPIC entry for non present
> >>>       * CPU may be omitted from MADT or it must be marked
> >>> @@ -47,24 +49,47 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
> >>>       * should be put in MADT but kept disabled.
> >>>       */
> >>>      if (apic_id < 255) {
> >>> -        AcpiMadtProcessorApic *apic = acpi_data_push(entry, sizeof *apic);
> >>> -
> >>> -        apic->type = ACPI_APIC_PROCESSOR;
> >>> -        apic->length = sizeof(*apic);
> >>> -        apic->processor_id = uid;
> >>> -        apic->local_apic_id = apic_id;
> >>> -        apic->flags = cpu_to_le32(flags);
> >>> +        /* Rev 1.0b, Table 5-13 Processor Local APIC Structure */
> >>> +        build_append_int_noprefix(entry, 0, 1);       /* Type */
> >>> +        build_append_int_noprefix(entry, 8, 1);       /* Length */
> >>> +        build_append_int_noprefix(entry, uid, 1);     /* ACPI Processor ID */    
> >> nit s/ID/UID  
> > 
> > it's ID in 1.0b
> >   
> >>> +        build_append_int_noprefix(entry, apic_id, 1); /* APIC ID */
> >>> +        build_append_int_noprefix(entry, flags, 4); /* Flags */
> >>>      } else {
> >>> -        AcpiMadtProcessorX2Apic *apic = acpi_data_push(entry, sizeof *apic);
> >>> -
> >>> -        apic->type = ACPI_APIC_LOCAL_X2APIC;
> >>> -        apic->length = sizeof(*apic);
> >>> -        apic->uid = cpu_to_le32(uid);
> >>> -        apic->x2apic_id = cpu_to_le32(apic_id);
> >>> -        apic->flags = cpu_to_le32(flags);
> >>> +        /* Rev 4.0, 5.2.12.12 Processor Local x2APIC Structure */
> >>> +        build_append_int_noprefix(entry, 9, 1);       /* Type */
> >>> +        build_append_int_noprefix(entry, 16, 1);      /* Length */
> >>> +        build_append_int_noprefix(entry, 0, 2);       /* Reserved */
> >>> +        build_append_int_noprefix(entry, apic_id, 4); /* X2APIC ID */
> >>> +        build_append_int_noprefix(entry, flags, 4);   /* Flags */
> >>> +        build_append_int_noprefix(entry, uid, 4);     /* ACPI Processor UID */
> >>>      }
> >>>  }
> >>>  
> >>> +static void build_ioapic(GArray *entry, uint8_t id, uint32_t addr, uint32_t irq)
> >>> +{
> >>> +    /* Rev 1.0b, 5.2.8.2 IO APIC */
> >>> +    build_append_int_noprefix(entry, 1, 1);    /* Type */
> >>> +    build_append_int_noprefix(entry, 12, 1);   /* Length */
> >>> +    build_append_int_noprefix(entry, id, 1);   /* IO APIC ID */
> >>> +    build_append_int_noprefix(entry, 0, 1);    /* Reserved */
> >>> +    build_append_int_noprefix(entry, addr, 4); /* IO APIC Address */
> >>> +    build_append_int_noprefix(entry, irq, 4);  /* System Vector Base */
> >>> +}
> >>> +
> >>> +static void
> >>> +build_xrupt_override(GArray *entry, uint8_t src, uint32_t gsi, uint16_t flags)
> >>> +{
> >>> +    /* Rev 1.0b, 5.2.8.3.1 Interrupt Source Overrides */
> >>> +    build_append_int_noprefix(entry, 2, 1);  /* Type */
> >>> +    build_append_int_noprefix(entry, 10, 1); /* Length */
> >>> +    build_append_int_noprefix(entry, 0, 1);  /* Bus */
> >>> +    build_append_int_noprefix(entry, src, 1);  /* Source */
> >>> +    /* Global System Interrupt Vector */
> >>> +    build_append_int_noprefix(entry, gsi, 4);
> >>> +    build_append_int_noprefix(entry, flags, 2);  /* Flags */
> >>> +}
> >>> +
> >>>  /*
> >>>   * ACPI spec, Revision 1.0b
> >>>   * 5.2.8 Multiple APIC Description Table
> >>> @@ -73,14 +98,11 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
> >>>                       X86MachineState *x86ms, AcpiDeviceIf *adev,
> >>>                       const char *oem_id, const char *oem_table_id)
> >>>  {
> >>> +    int i;
> >>> +    bool x2apic_mode = false;
> >>>      MachineClass *mc = MACHINE_GET_CLASS(x86ms);
> >>>      const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(x86ms));
> >>>      AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(adev);
> >>> -    bool x2apic_mode = false;
> >>> -
> >>> -    AcpiMadtIoApic *io_apic;
> >>> -    AcpiMadtIntsrcovr *intsrcovr;
> >>> -    int i;
> >>>      AcpiTable table = { .sig = "APIC", .rev = 1, .oem_id = oem_id,
> >>>                          .oem_table_id = oem_table_id };
> >>>  
> >>> @@ -96,30 +118,14 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
> >>>          }
> >>>      }
> >>>  
> >>> -    io_apic = acpi_data_push(table_data, sizeof *io_apic);
> >>> -    io_apic->type = ACPI_APIC_IO;
> >>> -    io_apic->length = sizeof(*io_apic);
> >>> -    io_apic->io_apic_id = ACPI_BUILD_IOAPIC_ID;
> >>> -    io_apic->address = cpu_to_le32(IO_APIC_DEFAULT_ADDRESS);
> >>> -    io_apic->interrupt = cpu_to_le32(0);
> >>> -
> >>> +    build_ioapic(table_data, ACPI_BUILD_IOAPIC_ID, IO_APIC_DEFAULT_ADDRESS, 0);
> >>>      if (x86ms->ioapic2) {
> >>> -        AcpiMadtIoApic *io_apic2;
> >>> -        io_apic2 = acpi_data_push(table_data, sizeof *io_apic);
> >>> -        io_apic2->type = ACPI_APIC_IO;
> >>> -        io_apic2->length = sizeof(*io_apic);
> >>> -        io_apic2->io_apic_id = ACPI_BUILD_IOAPIC_ID + 1;
> >>> -        io_apic2->address = cpu_to_le32(IO_APIC_SECONDARY_ADDRESS);
> >>> -        io_apic2->interrupt = cpu_to_le32(IO_APIC_SECONDARY_IRQBASE);
> >>> +        build_ioapic(table_data, ACPI_BUILD_IOAPIC_ID + 1,
> >>> +                     IO_APIC_SECONDARY_ADDRESS, IO_APIC_SECONDARY_IRQBASE);
> >>>      }
> >>>  
> >>>      if (x86ms->apic_xrupt_override) {
> >>> -        intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
> >>> -        intsrcovr->type   = ACPI_APIC_XRUPT_OVERRIDE;
> >>> -        intsrcovr->length = sizeof(*intsrcovr);
> >>> -        intsrcovr->source = 0;
> >>> -        intsrcovr->gsi    = cpu_to_le32(2);
> >>> -        intsrcovr->flags  = cpu_to_le16(0); /* conforms to bus specifications */
> >>> +        build_xrupt_override(table_data, 0, 2, 0);    
> >   
> >> lost /* conforms to bus specifications */ comment for the flag during
> >> the battle/ Don't know if it is useful though  
> > 
> >   
> >>>      }
> >>>  
> >>>      for (i = 1; i < 16; i++) {
> >>> @@ -127,32 +133,29 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
> >>>              /* No need for a INT source override structure. */
> >>>              continue;
> >>>          }
> >>> -        intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
> >>> -        intsrcovr->type   = ACPI_APIC_XRUPT_OVERRIDE;
> >>> -        intsrcovr->length = sizeof(*intsrcovr);
> >>> -        intsrcovr->source = i;
> >>> -        intsrcovr->gsi    = cpu_to_le32(i);
> >>> -        intsrcovr->flags  = cpu_to_le16(0xd); /* active high, level triggered */
> >>> +        build_xrupt_override(table_data, i, i, 0xd);    
> >> Lost for the flag /* active high, level triggered */  
> >>>      }
> >>>  
> >>>      if (x2apic_mode) {
> >>> -        AcpiMadtLocalX2ApicNmi *local_nmi;
> >>> -
> >>> -        local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
> >>> -        local_nmi->type   = ACPI_APIC_LOCAL_X2APIC_NMI;
> >>> -        local_nmi->length = sizeof(*local_nmi);
> >>> -        local_nmi->uid    = 0xFFFFFFFF; /* all processors */
> >>> -        local_nmi->flags  = cpu_to_le16(0);
> >>> -        local_nmi->lint   = 1; /* ACPI_LINT1 */
> >>> +        /* Rev 4.0, 5.2.12.13 Local x2APIC NMI Structure*/
> >>> +        build_append_int_noprefix(table_data, 0xA, 1); /* Type */
> >>> +        build_append_int_noprefix(table_data, 12, 1);  /* Length */
> >>> +        build_append_int_noprefix(table_data, 0, 2);   /* Flags */
> >>> +        /* ACPI Processor UID */
> >>> +        build_append_int_noprefix(table_data, 0xFFFFFFFF /* all processors */,
> >>> +                                  4);
> >>> +        /* Local x2APIC INTI# */    
> >> Local x2APIC LINT#  
> >>> +        build_append_int_noprefix(table_data, 1 /* ACPI_LINT1 */, 1);
> >>> +        build_append_int_noprefix(table_data, 0, 3);    
> >> /* reserved */  
> >>>      } else {
> >>> -        AcpiMadtLocalNmi *local_nmi;
> >>> -
> >>> -        local_nmi = acpi_data_push(table_data, sizeof *local_nmi);
> >>> -        local_nmi->type         = ACPI_APIC_LOCAL_NMI;
> >>> -        local_nmi->length       = sizeof(*local_nmi);
> >>> -        local_nmi->processor_id = 0xff; /* all processors */
> >>> -        local_nmi->flags        = cpu_to_le16(0);
> >>> -        local_nmi->lint         = 1; /* ACPI_LINT1 */
> >>> +        /* Rev 1.0b, 5.2.8.3.3 Local APIC NMI */
> >>> +        build_append_int_noprefix(table_data, 4, 1);  /* Type */
> >>> +        build_append_int_noprefix(table_data, 6, 1);  /* Length */
> >>> +        /* ACPI Processor ID */
> >>> +        build_append_int_noprefix(table_data, 0xff /* all processors */, 1);    
> >> 0xFF  
> >   
> >>> +        build_append_int_noprefix(table_data, 0, 2);  /* Flags */
> >>> +        /* Local APIC INTI# */    
> >> Local APIC LINT#  
> > 
> > it's "Local APIC INTI#" in 1.0b  
> OK sorry for the noise. Maybe we should add this link somewhere
> https://uefi.org/acpi/specs
> 
> I may have looked at some other references when reviewing.

problems with the links is that they are usually go stale
(good or rather bad example of that is so called Microsoft 'specs' html docs,
ex: early revisions of SRAT)

That's why we put in put in comment spec name and revision which
is usually sufficient to reliably find a spec in question,
regardless of where it's hosted at the moment.


> 
> Thanks
> 
> Eric
> >   
> >>> +        build_append_int_noprefix(table_data, 1 /* ACPI_LINT1 */, 1);
> >>>      }
> >>>  
> >>>      acpi_table_end(linker, &table);
> >>>     
> > 
> > the rest is fixed up
> >   
> >> Besides
> >> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> >>
> >> Eric
> >>  
> >   
> 

[PATCH v4 29/35] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API

[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 <imammedo@redhat.com>
---
CC: Eric Auger <eric.auger@redhat.com>

v4:
  - (Eric Auger <eric.auger@redhat.com>)
    * 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

CC: drjones@redhat.com
CC: peter.maydell@linaro.org
CC: shannon.zhaosl@gmail.com
CC: qemu-arm@nongnu.org
CC: wangxingang5@huawei.com
CC: Eric Auger <eric.auger@redhat.com>
---
 include/hw/acpi/acpi-defs.h |  71 ----------------
 hw/arm/virt-acpi-build.c    | 164 ++++++++++++++++++++----------------
 2 files changed, 93 insertions(+), 142 deletions(-)

diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 195f90caf6..6f2f08a9de 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -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
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 42ea460313..8c382915a9 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -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);
+    /* 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);
+
+    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);
-- 
2.27.0