From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, drjones@redhat.com,
shannon.zhaosl@gmail.com, mst@redhat.com,
Eric Auger <eric.auger@redhat.com>,
qemu-arm@nongnu.org, eauger@redhat.com, ani@anisinha.ca
Subject: [PATCH v4 21/35] acpi: madt: arm/x86: use acpi_table_begin()/acpi_table_end() instead of build_header()
Date: Fri, 24 Sep 2021 08:27:48 -0400 [thread overview]
Message-ID: <20210924122802.1455362-22-imammedo@redhat.com> (raw)
In-Reply-To: <20210924122802.1455362-1-imammedo@redhat.com>
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
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
next prev parent reply other threads:[~2021-09-24 13:02 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 12:27 [PATCH v4 00/35] acpi: refactor error prone build_header() and packed structures usage in ACPI tables Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 01/35] acpi: add helper routines to initialize " Igor Mammedov
2021-09-24 20:52 ` Stefan Berger
2021-09-26 9:16 ` wangyanan (Y)
2021-09-24 12:27 ` [PATCH v4 02/35] acpi: build_rsdt: use acpi_table_begin()/acpi_table_end() instead of build_header() Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 03/35] acpi: build_xsdt: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 04/35] acpi: build_slit: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 05/35] acpi: build_fadt: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 06/35] acpi: build_tpm2: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 07/35] acpi: acpi_build_hest: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 08/35] acpi: build_mcfg: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 09/35] acpi: build_hmat: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 10/35] acpi: nvdimm_build_nfit: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 11/35] acpi: nvdimm_build_ssdt: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 12/35] acpi: vmgenid_build_acpi: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 13/35] acpi: x86: build_dsdt: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 14/35] acpi: build_hpet: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 15/35] acpi: build_tpm_tcpa: " Igor Mammedov
2021-09-24 20:46 ` Stefan Berger
2021-09-24 12:27 ` [PATCH v4 16/35] acpi: arm/x86: build_srat: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 17/35] acpi: use build_append_int_noprefix() API to compose SRAT table Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 18/35] acpi: build_dmar_q35: use acpi_table_begin()/acpi_table_end() instead of build_header() Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 19/35] acpi: build_waet: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 20/35] acpi: build_amd_iommu: " Igor Mammedov
2021-09-24 12:27 ` Igor Mammedov [this message]
2021-09-24 12:27 ` [PATCH v4 22/35] acpi: x86: remove dead code Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 23/35] acpi: x86: set enabled when composing _MAT entries Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 24/35] acpi: x86: madt: use build_append_int_noprefix() API to compose MADT table Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 25/35] acpi: arm/virt: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 26/35] acpi: build_dsdt_microvm: use acpi_table_begin()/acpi_table_end() instead of build_header() Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 27/35] acpi: arm: virt: build_dsdt: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 28/35] acpi: arm: virt: build_iort: " Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 29/35] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API Igor Mammedov
2021-09-27 9:56 ` Eric Auger
2021-09-24 12:27 ` [PATCH v4 30/35] acpi: arm/virt: build_spcr: fix invalid cast Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 31/35] acpi: arm/virt: build_spcr: use acpi_table_begin()/acpi_table_end() instead of build_header() Igor Mammedov
2021-09-24 12:27 ` [PATCH v4 32/35] acpi: arm/virt: build_gtdt: " Igor Mammedov
2021-09-24 12:28 ` [PATCH v4 33/35] acpi: build_facs: use build_append_int_noprefix() API to compose table Igor Mammedov
2021-09-24 12:28 ` [PATCH v4 34/35] acpi: remove no longer used build_header() Igor Mammedov
2021-09-24 12:28 ` [PATCH v4 35/35] acpi: AcpiGenericAddress no longer used to map/access fields of MMIO, drop packed attribute Igor Mammedov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210924122802.1455362-22-imammedo@redhat.com \
--to=imammedo@redhat.com \
--cc=ani@anisinha.ca \
--cc=drjones@redhat.com \
--cc=eauger@redhat.com \
--cc=eric.auger@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=shannon.zhaosl@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).