From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, drjones@redhat.com,
shannon.zhaosl@gmail.com, qemu-arm@nongnu.org, mst@redhat.com
Subject: [PATCH 50/53] acpi: arm/virt: build_gtdt: use acpi_init_table()/acpi_table_composed() instead of build_header()
Date: Fri, 25 Jun 2021 05:18:15 -0400 [thread overview]
Message-ID: <20210625091818.1047980-52-imammedo@redhat.com> (raw)
In-Reply-To: <20210625091818.1047980-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.
while at it, replace packed structure with endian agnostic
build_append_FOO() API.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
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 e8553dcae5..8f28e82760 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -455,40 +455,61 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
acpi_table_composed(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_init_table(&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_composed(linker, &table);
}
/*
--
2.27.0
next prev parent reply other threads:[~2021-06-25 9:46 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 9:17 [PATCH 00/53] acpi: refactor error prone build_header() and packed structures usage in ACPI tables Igor Mammedov
2021-06-25 9:17 ` [PATCH 01/53] tests: acpi: dump table with failed checksum Igor Mammedov
2021-06-25 9:17 ` [PATCH 02/53] tests: qtest: add qtest_has_accel() to check if tested binary supports accelerator Igor Mammedov
2021-06-25 9:33 ` Philippe Mathieu-Daudé
2021-06-25 9:17 ` [PATCH 03/53] tests: acpi: whitelist expected tables for acpi/q35/numamem testcase Igor Mammedov
2021-06-25 9:17 ` [PATCH 04/53] tests: acpi: q35: test for x2APIC entries in SRAT Igor Mammedov
2021-07-02 14:45 ` Michael S. Tsirkin
2021-07-08 9:18 ` Igor Mammedov
2021-07-08 11:59 ` Michael S. Tsirkin
2021-06-25 9:17 ` [PATCH 05/53] tests: acpi: update expected tables blobs Igor Mammedov
2021-06-25 9:17 ` [PATCH 06/53] tests: acpi: whitelist new expected table tests/data/acpi/q35/DMAR.dmar Igor Mammedov
2021-06-25 9:17 ` [PATCH 07/53] tests: acpi: add testcase for intel_iommu (DMAR table) Igor Mammedov
2021-06-25 9:17 ` [PATCH 08/53] tests: acpi: add expected blob for DMAR table Igor Mammedov
2021-06-25 9:17 ` [PATCH 09/53] tests: acpi: whitelist expected blobs for new acpi/q35/ivrs testcase Igor Mammedov
2021-06-25 9:17 ` [PATCH 10/53] tests: acpi: add testcase for amd-iommu (IVRS table) Igor Mammedov
2021-06-25 9:17 ` [PATCH 11/53] tests: acpi: update expected blobs Igor Mammedov
2021-06-25 9:17 ` [PATCH 12/53] tests: acpi: arm/virt: drop redudant test_acpi_one() in test_acpi_virt_tcg() Igor Mammedov
2021-06-25 9:17 ` [PATCH 12/53] tests: acpi: arm/virt: drop redundant " Igor Mammedov
2021-06-25 9:17 ` [PATCH 13/53] tests: acpi: whitelist expected tables for acpi/virt/iort testcase Igor Mammedov
2021-06-25 9:17 ` [PATCH 14/53] tests: acpi: arm/virt: use kvm to test IORT table Igor Mammedov
2021-06-25 9:17 ` [PATCH 15/53] tests: acpi: add expected IORT table blob Igor Mammedov
2021-06-25 9:17 ` [PATCH 16/53] tests: arm-cpu-features: use qtest_has_kvm() API Igor Mammedov
2021-06-25 9:17 ` [PATCH 17/53] tests: migration-test: use qtest_has_accel() API Igor Mammedov
2021-06-25 9:17 ` [PATCH 18/53] tests: bios-tables-test: use qtest_has_accel() API to register TCG only tests Igor Mammedov
2021-06-25 9:17 ` [PATCH 19/53] acpi: add helper routines to initialize ACPI tables Igor Mammedov
2021-06-29 19:16 ` Michael S. Tsirkin
2021-06-30 6:32 ` Igor Mammedov
2021-06-25 9:17 ` [PATCH 20/53] acpi: build_rsdt: use acpi_init_table()/acpi_table_composed() instead of build_header() Igor Mammedov
2021-06-25 9:17 ` [PATCH 21/53] acpi: build_xsdt: " Igor Mammedov
2021-06-25 9:17 ` [PATCH 22/53] acpi: build_slit: " Igor Mammedov
2021-06-25 9:17 ` [PATCH 23/53] acpi: build_fadt: " Igor Mammedov
2021-06-25 9:17 ` [PATCH 24/53] acpi: build_tpm2: " Igor Mammedov
2021-06-29 14:56 ` Stefan Berger
2021-06-25 9:17 ` [PATCH 25/53] acpi: acpi_build_hest: " Igor Mammedov
2021-07-02 12:21 ` Dongjiu Geng
2021-06-25 9:17 ` [PATCH 26/53] acpi: build_mcfg: " Igor Mammedov
2021-06-25 9:17 ` [PATCH 27/53] acpi: build_hmat: " Igor Mammedov
2021-06-25 9:17 ` [PATCH 28/53] acpi: nvdimm_build_nfit: " Igor Mammedov
2021-06-25 9:17 ` [PATCH 29/53] acpi: nvdimm_build_ssdt: " Igor Mammedov
2021-06-25 9:17 ` [PATCH 30/53] acpi: vmgenid_build_acpi: " Igor Mammedov
2021-06-25 9:17 ` [PATCH 31/53] acpi: x86: build_dsdt: " Igor Mammedov
2021-06-25 9:17 ` [PATCH 32/53] acpi: build_hpet: " Igor Mammedov
2021-06-25 9:17 ` [PATCH 33/53] acpi: build_tpm_tcpa: " Igor Mammedov
2021-06-29 15:19 ` Stefan Berger
2021-06-30 7:22 ` Igor Mammedov
2021-06-30 7:25 ` [PATCH v2 " Igor Mammedov
2021-06-30 12:21 ` Stefan Berger
2021-06-25 9:17 ` [PATCH 34/53] acpi: arm/x86: build_srat: " Igor Mammedov
2021-06-25 9:18 ` [PATCH 35/53] acpi: use build_append_int_noprefix() API to compose SRAT table Igor Mammedov
2021-06-25 9:18 ` [PATCH 36/53] acpi: build_dmar_q35: use acpi_init_table()/acpi_table_composed() instead of build_header() Igor Mammedov
2021-06-25 9:18 ` [PATCH 37/53] acpi: build_waet: " Igor Mammedov
2021-06-25 9:18 ` [PATCH 38/53] acpi: build_amd_iommu: " Igor Mammedov
2021-06-25 9:18 ` [PATCH 39/53] acpi: madt: arm/x86: " Igor Mammedov
2021-06-25 9:18 ` [PATCH 40/53] acpi: x86: remove dead code Igor Mammedov
2021-06-25 9:18 ` [PATCH 41/53] acpi: x86: set enabled when composing _MAT entries Igor Mammedov
2021-06-25 9:18 ` [PATCH 42/53] acpi: x86: madt: use build_append_int_noprefix() API to compose MADT table Igor Mammedov
2021-06-25 9:18 ` [PATCH 43/53] acpi: arm/virt: " Igor Mammedov
2021-06-25 9:18 ` [PATCH 44/53] acpi: build_dsdt_microvm: use acpi_init_table()/acpi_table_composed() instead of build_header() Igor Mammedov
2021-06-25 9:18 ` [PATCH 45/53] acpi: arm: virt: build_dsdt: " Igor Mammedov
2021-06-25 9:18 ` [PATCH 46/53] acpi: arm: virt: build_iort: " Igor Mammedov
2021-06-25 9:18 ` [PATCH 47/53] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API Igor Mammedov
2021-06-25 9:18 ` [PATCH 48/53] acpi: arm/virt: build_spcr: fix invalid cast Igor Mammedov
2021-06-25 9:18 ` [PATCH 49/53] acpi: arm/virt: build_spcr: use acpi_init_table()/acpi_table_composed() instead of build_header() Igor Mammedov
2021-06-25 9:18 ` Igor Mammedov [this message]
2021-06-25 9:18 ` [PATCH 51/53] acpi: build_facs: use build_append_int_noprefix() API to compose table Igor Mammedov
2021-06-25 9:18 ` [PATCH 52/53] acpi: remove no longer used build_header() Igor Mammedov
2021-06-25 9:18 ` [PATCH 53/53] acpi: AcpiGenericAddress no longer used to map/access fields of MMIO, drop packed attribute Igor Mammedov
2021-07-02 14:47 ` [PATCH 00/53] acpi: refactor error prone build_header() and packed structures usage in ACPI tables Michael S. Tsirkin
2021-07-05 7:56 ` Igor Mammedov
2021-07-05 18:00 ` Michael S. Tsirkin
2021-07-07 9:11 ` 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=20210625091818.1047980-52-imammedo@redhat.com \
--to=imammedo@redhat.com \
--cc=drjones@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).