Linaro-acpi October 2014

linaro-acpi@lists.linaro.org

12 participants
16 discussions

[PATCH 0/4 v2] Add tool to enable APEI tables test, other minor changes.

by Tomasz Nowicki

Patch set implement as follows: 1. Minor changes around existing tools - reorganize building process, - move common code to separate direction, - no functionality changes. 2. Add BFAPEI (Blob For APEI) tool which can create blobs for APEI testing. - see commit log for more details Changes for v2: - compilation regardless of whether APEI is used or not, - correct file name in comment headers, - move ACPI structures, defines, etc. to acpi.h headers, - suppress compiler warnings. Tomasz Nowicki (4): map, cab: Reorganize building process and tree hierarchy. bfapei: Add tool that can create blobs for APEI table testing. bfapei: Move generic ACPI structures to separated file, remove duplicated defines. Suppress compiler warnings, file comment headers cleanup. Makefile | 28 +- platforms/Makefile | 9 +- tools/bfapei/Makefile | 11 + tools/bfapei/bfapei.c | 271 +++++++++++++++++++ tools/bfapei/bfapei.h | 49 ++++ tools/cab/Makefile | 12 +- tools/cab/cab.c | 535 +------------------------------------- tools/cab/cab.h | 149 ----------- tools/common/Makefile | 4 + tools/common/build_aml.c | 455 ++++++++++++++++++++++++++++++++ tools/common/check_aml.c | 512 ++++++++++++++++++++++++++++++++++++ tools/common/include/acpi.h | 204 +++++++++++++++ tools/common/include/build_aml.h | 74 ++++++ tools/common/include/check_aml.h | 92 +++++++ tools/mab/Makefile | 13 +- tools/mab/mab.c | 437 +------------------------------ tools/mab/mab.h | 77 ------ 17 files changed, 1734 insertions(+), 1198 deletions(-) create mode 100644 tools/bfapei/Makefile create mode 100644 tools/bfapei/bfapei.c create mode 100644 tools/bfapei/bfapei.h create mode 100644 tools/common/Makefile create mode 100644 tools/common/build_aml.c create mode 100644 tools/common/check_aml.c create mode 100644 tools/common/include/acpi.h create mode 100644 tools/common/include/build_aml.h create mode 100644 tools/common/include/check_aml.h -- 1.7.9.5

7 years, 2 months

[RFC PATCH 0/7] hw/arm/virt: Dynamic ACPI v5.1 table generation

by Alexander Spyridakis

Currently, the virt machine model generates Device Tree information dynamically based on the existing devices in the system. This patch series extends the same concept but for ACPI information instead. A total of seven tables have been implemented in this patch series, which is the minimum for a basic ARM support. The set of generated tables are: - RSDP - XSDT - MADT - GTDT - FADT - FACS - DSDT The tables are created in standalone buffers, taking into account the needed information passed from the virt machine model. When the generation is finalized, the individual buffers are compacted to a single ACPI binary blob, where it is injected on the guest memory space in a fixed location. The guest kernel can find the ACPI tables by providing to it the physical address of the ACPI blob (e.g. acpi_rsdp=0x47000000 boot argument). This series has been tested on the Foundation Model 0.8 build 5206 and the Juno development board. For kernel and driver support it is based on the "Introduce ACPI for ARM64 based on ACPI 5.1" and "Drivers for Juno to boot from ACPI" patch series from Hanjun Guo. Alexander Spyridakis (7): hw/i386: Move ACPI header definitions in an arch-independent location hw/arm/virt-acpi: Basic skeleton for dynamic generation of ACPI tables hw/arm/virt-acpi: Generate RSDP and XSDT, add helper functions hw/arm/virt-acpi: Generate FACS and FADT, update ACPI headers hw/arm/virt-acpi: GIC and Arch Timer definitions in MADT and GTDT hw/arm/virt-acpi: Generation of DSDT including virt devices hw/arm/virt: Enable dynamic generation of ACPI v5.1 tables hw/arm/Makefile.objs | 2 +- hw/arm/boot.c | 26 +++ hw/arm/virt-acpi.c | 555 ++++++++++++++++++++++++++++++++++++++++++++ hw/arm/virt.c | 54 ++++- hw/i386/acpi-build.c | 2 +- hw/i386/acpi-defs.h | 368 ----------------------------- include/hw/acpi/acpi-defs.h | 535 ++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/arm.h | 2 + include/hw/arm/virt-acpi.h | 73 ++++++ tests/bios-tables-test.c | 2 +- 10 files changed, 1244 insertions(+), 375 deletions(-) create mode 100644 hw/arm/virt-acpi.c delete mode 100644 hw/i386/acpi-defs.h create mode 100644 include/hw/acpi/acpi-defs.h create mode 100644 include/hw/arm/virt-acpi.h -- 1.9.1

9 years, 3 months

[PATCH v5 00/18] Introduce ACPI for ARM64 based on ACPI 5.1

by Hanjun Guo

ACPI 5.1 has some major changes for ARM platform and the following tables which are essential for ARM platforms: 1) MADT table updates for GIC v2/v3. 2) FADT updates for PSCI 3) GTDT for arch timer This patch set is the ARM64 ACPI core patches covered MADT, FADT and GTDT, platform board specific drivers are not covered by this patch set. We first introduce acpi.c and its related head file which are needed by ACPI core, and then get RSDP to extract all the ACPI boot-time tables. When all the boot-time tables (FADT, MADT, GTDT) are ready, then parse them to init the sytem when booted. Specifically, a) we use FADT to init PSCI and use PSCI to boot SMP; b) Use MADT for GIC init and SMP init; c) GTDT for arch timer init. This patch set is based on 3.17-rc4 and was tested by Graeme on Juno and FVP base model boot with ACPI only OK, if you want to test them, you can pull from acpi-5.1-v5 branch in leg/acpi repo: git://git.linaro.org/leg/acpi/acpi.git Updates since v4: - ACPI uasge doc for ARM64 was updated a lot by Al - Collect some ACKs from Grant, Olof, Mark - address some comments from Olof and Catalin since last version Updates since v3: - Compile out sleep.c on ARM64 when ACPI enabled - refactor the GIC init code to address the comments from Marc and Arnd - refactor the SMP init code to fix some logic problem when PSCI is not present, also address some of Grant and Lorenzo's comments - reorder the patch series and move ACPI table changes to the front of patch set - rebase on top of 3.17-rc4 Updates since v2: - Refactor the code to make SMP/PSCI init with less sperated init path by Tomasz - make ACPI depend on EXPERT - Address lots of comments from Catalin, Sudeep, Geoff - Add Juno device ACPI driver patches for review Updates since v1: - Set ACPI default off on ARM64 suggested by Olof; - Rebase the patch set on top of linux-next branch/linux-pm tree which includes the ACPICA for full ACPI 5.1 support. - Update the document as suggested; - Adress lots of comments from Mark, Sudeep, Randy, Naresh, Olof, Geoff and more... Al Stone (3): ARM64 / ACPI: Get RSDP and ACPI boot-time tables ARM64 / ACPI: Introduce early_param for "acpi" and pass acpi=force to enable ACPI ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Ashwin Chaugule (1): ACPI / table: Add new function to get table entries Graeme Gregory (4): ARM64 / ACPI: Introduce sleep-arm.c ARM64 / ACPI: If we chose to boot from acpi then disable FDT ARM64 / ACPI: Enable ARM64 in Kconfig Documentation: ACPI for ARM64 Hanjun Guo (8): ARM64: Move the init of cpu_logical_map(0) before unflatten_device_tree() ARM64 / ACPI: Make PCI optional for ACPI on ARM64 ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init ACPI / table: Print GIC information when MADT is parsed ARM64 / ACPI: Parse MADT for SMP initialization ACPI / processor: Make it possible to get CPU hardware ID via GICC ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi ARM64 / ACPI: Parse GTDT to initialize arch timer Tomasz Nowicki (2): ACPI / table: Count matched and successfully parsed entries without specifying max entries ARM64 / ACPI: Add GICv2 specific ACPI boot support Documentation/arm64/arm-acpi.txt | 323 ++++++++++++++++++++++++++++++ Documentation/kernel-parameters.txt | 3 +- arch/arm64/Kconfig | 3 + arch/arm64/include/asm/acenv.h | 18 ++ arch/arm64/include/asm/acpi.h | 99 ++++++++++ arch/arm64/include/asm/cpu_ops.h | 1 + arch/arm64/include/asm/pci.h | 11 ++ arch/arm64/include/asm/psci.h | 3 +- arch/arm64/include/asm/smp.h | 5 +- arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/acpi.c | 356 ++++++++++++++++++++++++++++++++++ arch/arm64/kernel/cpu_ops.c | 4 +- arch/arm64/kernel/psci.c | 78 +++++--- arch/arm64/kernel/setup.c | 25 ++- arch/arm64/kernel/smp.c | 2 +- arch/arm64/kernel/time.c | 7 + drivers/acpi/Kconfig | 6 +- drivers/acpi/Makefile | 6 +- drivers/acpi/bus.c | 3 + drivers/acpi/internal.h | 5 + drivers/acpi/processor_core.c | 37 ++++ drivers/acpi/sleep-arm.c | 28 +++ drivers/acpi/tables.c | 115 +++++++++-- drivers/clocksource/arm_arch_timer.c | 117 +++++++++-- drivers/irqchip/irq-gic.c | 106 ++++++++++ drivers/irqchip/irqchip.c | 3 + include/linux/acpi.h | 5 + include/linux/clocksource.h | 6 + include/linux/irqchip/arm-gic-acpi.h | 31 +++ include/linux/pci.h | 37 +++- 30 files changed, 1353 insertions(+), 91 deletions(-) create mode 100644 Documentation/arm64/arm-acpi.txt create mode 100644 arch/arm64/include/asm/acenv.h create mode 100644 arch/arm64/include/asm/acpi.h create mode 100644 arch/arm64/include/asm/pci.h create mode 100644 arch/arm64/kernel/acpi.c create mode 100644 drivers/acpi/sleep-arm.c create mode 100644 include/linux/irqchip/arm-gic-acpi.h -- 1.7.9.5

9 years, 5 months

[PATCH 1/3] ACPI / processor: Update the comments in processor.h

by Hanjun Guo

In commit 46ba51e (ACPI / processor: Introduce ARCH_MIGHT_HAVE_ACPI_PDC), acpi_processor_set_pdc() was moved to processor_pdc.c, so update the comments accordingly. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- include/acpi/processor.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 9b9b6f2..cbb6cd3 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -313,11 +313,13 @@ static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit) #endif /* CONFIG_CPU_FREQ */ /* in processor_core.c */ -void acpi_processor_set_pdc(acpi_handle handle); int acpi_get_apicid(acpi_handle, int type, u32 acpi_id); int acpi_map_cpuid(int apic_id, u32 acpi_id); int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id); +/* in processor_pdc.c */ +void acpi_processor_set_pdc(acpi_handle handle); + /* in processor_throttling.c */ int acpi_processor_tstate_has_changed(struct acpi_processor *pr); int acpi_processor_get_throttling_info(struct acpi_processor *pr); -- 1.7.9.5

9 years, 7 months

[PATCH v9] PCC: Platform Communication Channel

by Ashwin Chaugule

Changes since V8: - Removed unncessary header files. - Added kerneldoc comments. - Added intro about PCC in pcc.c Changes since V7: - Added timeout to tx method in case the remote dies. - Restructured usage of acpi_status. Had inverted logic previously. Changes since V6: - Cosmetic changes based on Lv's suggestions Changes since V5: - Optimize loop that matches channel request. - Use platform_create_bundle. - Replace ioread/writes. - Remove redundant code and headers. - Restructure common mailbox macros. - Reformat PCC cmd parsing. Changes since V4: - Folded PCC Mailbox helpers into pcc.c Changes since V3: - Added PCC helper functions to work around "struct device" limitations. - PCC driver changes to work with PCC specific Mailbox helpers. Changes since V2: - Rebased on top of git://git.linaro.org/landing-teams/working/fujitsu/integration.git branch mailbox-for-3.17 - Added PCC API to mailbox framework as per Arnd's suggestion to allow usage without ACPI. Changes since V1: - Integration with Mailbox framework - https://lkml.org/lkml/2014/5/15/49 This patchset adds support for the PCC (Platform Communication Channel) interface as described in the current ACPI 5.0 spec. See Section 14 of the ACPI spec - http://acpi.info/DOWNLOADS/ACPI_5_Errata%20A.pdf for more details on how PCC works. In brief PCC is a generic means for PCC clients, to talk to the firmware. The PCC register space is typically memory mapped IO and uses a doorbell mechanism to communicate synchronously from the OS to the firmware. The PCC driver is completely agnostic to the protocol implemented by the PCC clients. It only implements the enumeration of PCC channels and the low level transport mechanism and leaves the rest to the PCC clients. The PCC is meant to be useable in the future by clients such as CPPC (Collaborative Processor Performance Control), RAS (Reliability, Availability and Serviceability) and MPST (Memory Power State Tables) and possibly others. Ashwin Chaugule (1): Mailbox: Add support for Platform Communication Channel drivers/mailbox/Kconfig | 12 ++ drivers/mailbox/Makefile | 2 + drivers/mailbox/mailbox.c | 4 +- drivers/mailbox/mailbox.h | 16 ++ drivers/mailbox/pcc.c | 369 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 400 insertions(+), 3 deletions(-) create mode 100644 drivers/mailbox/mailbox.h create mode 100644 drivers/mailbox/pcc.c -- 1.9.1

9 years, 7 months

[RFC PATCH 3/7] hw/arm/virt-acpi: Generate RSDP and XSDT, add helper functions

by Alexander Spyridakis

RSDP points to XSDT which in turn points to other tables. In the case of RSDP things are straightforward as we can point to XSDT just by adding the binary blob base address plus the size of RSDP. For XSDT we traverse the table array and point every other table by calculating their size (exception being FACS and DSDT which are pointed from FADT). Finally implement a common header and checksum helper functions for usage in all generated ACPI tables. Signed-off-by: Alexander Spyridakis <a.spyridakis(a)virtualopensystems.com> Signed-off-by: Alvise Rigo <a.rigo(a)virtualopensystems.com> --- hw/arm/virt-acpi.c | 93 +++++++++++++++++++++++++++++++++++++++++++-- include/hw/acpi/acpi-defs.h | 9 +++++ include/hw/arm/virt-acpi.h | 6 +++ 3 files changed, 104 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt-acpi.c b/hw/arm/virt-acpi.c index 5c8df45..0d7bb99 100644 --- a/hw/arm/virt-acpi.c +++ b/hw/arm/virt-acpi.c @@ -21,16 +21,101 @@ static void *acpi_table[NUM_ACPI_TABLES]; static int acpi_size[NUM_ACPI_TABLES]; +/* + * Many of the ACPI tables use the same header structure + * This is a common function to fill such information. + */ +static void acpi_fill_common_header_data(void *table, const char *signature, + uint8_t revision, int length) +{ + AcpiTableHeader *h = (AcpiTableHeader *)table; + + memcpy(&h->signature, signature, sizeof(h->signature)); + memcpy(h->oem_id, ACPI_VIRT_QEMU_STR_4, sizeof(h->oem_id)); + memcpy(h->oem_table_id, ACPI_VIRT_MACH_STR_8, sizeof(h->oem_table_id)); + h->revision = revision; + h->length = cpu_to_le32(length); +} + +/* + * Called at the very end of an ACPI table. + * Adding all the data bytes, plus the checksum should equal to zero. + */ +static void acpi_do_checksum(void *table, uint32_t length, uint8_t *checksum) +{ + uint8_t sum, *ptr; + + sum = 0; + ptr = table; + + *checksum = 0; + while (length--) { + sum = (uint8_t)(sum + (*ptr++)); + } + + ptr = table; + *checksum = (uint8_t) (0xff - sum + 1); +} + static void acpi_create_rsdp(void) { - acpi_table[RSDP] = NULL; - acpi_size[RSDP] = 0; + AcpiRsdpDescriptor *rsdp; + + rsdp = g_malloc0(sizeof(*rsdp)); + + /* Set table header information */ + memcpy(&rsdp->signature, "RSD PTR ", sizeof(rsdp->signature)); + memcpy(rsdp->oem_id, ACPI_VIRT_QEMU_STR_6, sizeof(rsdp->oem_id)); + rsdp->length = cpu_to_le32(sizeof(*rsdp)); + rsdp->revision = 0x02; + + /* Point to XSDT */ + rsdp->xsdt_physical_address = cpu_to_le64(ACPI_BASE_ADDRESS + rsdp->length); + + /* Calculate normal and extended checksum */ + acpi_do_checksum(rsdp, + offsetof(AcpiRsdpDescriptor, length), &rsdp->checksum); + acpi_do_checksum(rsdp, rsdp->length, &rsdp->extended_checksum); + + acpi_table[RSDP] = (void *)rsdp; + acpi_size[RSDP] = rsdp->length; } static void acpi_create_xsdt(void) { - acpi_table[XSDT] = NULL; - acpi_size[XSDT] = 0; + AcpiXsdtDescriptor *xsdt; + int i, xsdt_size; + + /* + * The final size of XSDT is the table size plus the number + * of pointed tables multiplied by the table_offset_entry size. + * + * The initial xsdt table size already includes one pointed table and + * assuming that FADT is the last pointed table we can calculate the + * total based on that. + */ + xsdt_size = sizeof(*xsdt) + + ((FADT - (XSDT + 1)) * sizeof(xsdt->table_offset_entry)); + xsdt = g_malloc0(xsdt_size); + + /* Set table header information */ + acpi_fill_common_header_data(xsdt, "XSDT", 1, xsdt_size); + + /* Point first table included by default in the xsdt structure */ + xsdt->table_offset_entry[0] = cpu_to_le64( + ACPI_BASE_ADDRESS + acpi_size[RSDP] + xsdt->length); + + /* Point all other tables (excluding FACS and DSDT) */ + for (i = XSDT; i < FADT - 1; i++) { + xsdt->table_offset_entry[i] = + xsdt->table_offset_entry[i - 1] + acpi_size[i + 1]; + } + + /* Calculate checksum */ + acpi_do_checksum(xsdt, xsdt->length, &xsdt->checksum); + + acpi_table[XSDT] = (void *)xsdt; + acpi_size[XSDT] = xsdt->length; } static void acpi_create_madt(uint32_t smp_cpus, diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index c4468f8..779f872 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -88,6 +88,15 @@ struct AcpiTableHeader /* ACPI common table header */ typedef struct AcpiTableHeader AcpiTableHeader; /* + * Extended System Description Table (XSDT) + */ +struct AcpiXsdtDescriptor { + ACPI_TABLE_HEADER_DEF + uint64_t table_offset_entry[1]; /* Array of pointers to ACPI tables */ +} QEMU_PACKED; +typedef struct AcpiXsdtDescriptor AcpiXsdtDescriptor; + +/* * ACPI 1.0 Fixed ACPI Description Table (FADT) */ struct AcpiFadtDescriptorRev1 diff --git a/include/hw/arm/virt-acpi.h b/include/hw/arm/virt-acpi.h index 5098118..66a73eb 100644 --- a/include/hw/arm/virt-acpi.h +++ b/include/hw/arm/virt-acpi.h @@ -23,6 +23,12 @@ #define NUM_ACPI_TABLES 7 +#define ACPI_VIRT_QEMU_STR_4 "QEMU" +#define ACPI_VIRT_QEMU_STR_6 "QEMU " +#define ACPI_VIRT_MACH_STR_8 "MACHVIRT" + +#define ACPI_BASE_ADDRESS 0x47000000 + enum { RSDP, XSDT, -- 1.9.1

9 years, 7 months

[RFC PATCH 5/7] hw/arm/virt-acpi: GIC and Arch Timer definitions in MADT and GTDT

by Alexander Spyridakis

ACPI v5.1 defines GTDT for ARM devices as a place to describe timer related information in the system. MADT is also updated with a number of relevant subtables that can describe GIC enabled ARM platforms. For GTDT the Arch Timer interrupts must be provided, in the case of MADT the GICC and GICD subtables are used to define the GIC regions. Signed-off-by: Alexander Spyridakis <a.spyridakis(a)virtualopensystems.com> --- hw/arm/virt-acpi.c | 65 +++++++++++++++++++++++++++++++++++++--- include/hw/acpi/acpi-defs.h | 73 ++++++++++++++++++++++++++++++++++++++++++++- include/hw/arm/virt-acpi.h | 6 ++++ 3 files changed, 139 insertions(+), 5 deletions(-) diff --git a/hw/arm/virt-acpi.c b/hw/arm/virt-acpi.c index aca0434..a53a620 100644 --- a/hw/arm/virt-acpi.c +++ b/hw/arm/virt-acpi.c @@ -121,14 +121,71 @@ static void acpi_create_xsdt(void) static void acpi_create_madt(uint32_t smp_cpus, const struct acpi_madt_info *info) { - acpi_table[MADT] = NULL; - acpi_size[MADT] = 0; + AcpiMultipleApicTable *madt; + AcpiMadtGenericInterrupt *gicc; + AcpiMadtGenericDistributor *gicd; + int i, madt_size; + + madt_size = sizeof(*madt) + (smp_cpus * sizeof(*gicc) + sizeof(*gicd)); + madt = g_malloc0(madt_size); + + acpi_fill_common_header_data(madt, "APIC", 1, madt_size); + + madt->local_apic_address = *info->gic_cpu_base_addr; + + /* Point at the end of the madt structure */ + gicc = (AcpiMadtGenericInterrupt *)(madt + 1); + + /* GICC subtable, one for each cpu in the guest*/ + for (i = 0; i < smp_cpus; i++) { + gicc->type = ACPI_APIC_GENERIC_INTERRUPT; + gicc->length = sizeof(*gicc); + + gicc->base_address = *info->gic_cpu_base_addr; + gicc->cpu_interface_number = i; + gicc->arm_mpidr = i; + gicc->uid = i; + gicc->flags = 0x01; + + gicc++; + } + + /* GIC Distributor subtable */ + gicd = (AcpiMadtGenericDistributor *)(gicc); + gicd->type = ACPI_APIC_GENERIC_DISTRIBUTOR; + gicd->length = sizeof(*gicd); + gicd->base_address = *info->gic_dist_base_addr; + + acpi_do_checksum(madt, madt->length, &madt->checksum); + + acpi_table[MADT] = (void *)madt; + acpi_size[MADT] = madt->length; } static void acpi_create_gtdt(const struct acpi_gtdt_info *irqs) { - acpi_table[GTDT] = NULL; - acpi_size[GTDT] = 0; + AcpiGenericTimerTable *gtdt; + + gtdt = g_malloc0(sizeof(*gtdt)); + acpi_fill_common_header_data(gtdt, "GTDT", 1, sizeof(*gtdt)); + + /* The interrupt values are the same with the device tree when adding 16 */ + gtdt->secure_el1_interrupt = irqs->timer_s_el1; + gtdt->secure_el1_flags = ACPI_EDGE_SENSITIVE; + + gtdt->non_secure_el1_interrupt = irqs->timer_ns_el1; + gtdt->non_secure_el1_flags = ACPI_EDGE_SENSITIVE; + + gtdt->virtual_timer_interrupt = irqs->timer_virt; + gtdt->virtual_timer_flags = ACPI_EDGE_SENSITIVE; + + gtdt->non_secure_el2_interrupt = irqs->timer_ns_el2; + gtdt->non_secure_el2_flags = ACPI_EDGE_SENSITIVE; + + acpi_do_checksum(gtdt, gtdt->length, &gtdt->checksum); + + acpi_table[GTDT] = (void *)gtdt; + acpi_size[GTDT] = gtdt->length; } static void acpi_create_fadt(void) diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index ebbd2d0..f5e5222 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -257,7 +257,13 @@ typedef struct AcpiMultipleApicTable AcpiMultipleApicTable; #define ACPI_APIC_IO_SAPIC 6 #define ACPI_APIC_LOCAL_SAPIC 7 #define ACPI_APIC_XRUPT_SOURCE 8 -#define ACPI_APIC_RESERVED 9 /* 9 and greater are reserved */ +#define ACPI_APIC_LOCAL_X2APIC 9 +#define ACPI_APIC_LOCAL_X2APIC_NMI 10 +#define ACPI_APIC_GENERIC_INTERRUPT 11 +#define ACPI_APIC_GENERIC_DISTRIBUTOR 12 +#define ACPI_APIC_GENERIC_MSI_FRAME 13 +#define ACPI_APIC_GENERIC_REDISTRIBUTOR 14 +#define ACPI_APIC_RESERVED 15 /* 15 and greater are reserved */ /* * MADT sub-structures (Follow MULTIPLE_APIC_DESCRIPTION_TABLE) @@ -305,6 +311,71 @@ struct AcpiMadtLocalNmi { } QEMU_PACKED; typedef struct AcpiMadtLocalNmi AcpiMadtLocalNmi; +struct AcpiMadtGenericInterrupt { + 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 AcpiMadtGenericInterrupt AcpiMadtGenericInterrupt; + +struct AcpiMadtGenericDistributor { + ACPI_SUB_HEADER_DEF + uint16_t reserved; + uint32_t gic_id; + uint64_t base_address; + uint32_t global_irq_base; + uint32_t reserved2; +} QEMU_PACKED; +typedef struct AcpiMadtGenericDistributor AcpiMadtGenericDistributor; + +/* + * Generic Timer Description Table (GTDT) + */ + +#define ACPI_GTDT_INTERRUPT_MODE (1) +#define ACPI_GTDT_INTERRUPT_POLARITY (1<<1) +#define ACPI_GTDT_ALWAYS_ON (1<<2) + +/* Triggering */ + +#define ACPI_LEVEL_SENSITIVE (uint8_t) 0x00 +#define ACPI_EDGE_SENSITIVE (uint8_t) 0x01 + +/* Polarity */ + +#define ACPI_ACTIVE_HIGH (uint8_t) 0x00 +#define ACPI_ACTIVE_LOW (uint8_t) 0x01 +#define ACPI_ACTIVE_BOTH (uint8_t) 0x02 + +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; + /* * HPET Description Table */ diff --git a/include/hw/arm/virt-acpi.h b/include/hw/arm/virt-acpi.h index 66a73eb..216a3a2 100644 --- a/include/hw/arm/virt-acpi.h +++ b/include/hw/arm/virt-acpi.h @@ -41,9 +41,15 @@ enum { }; struct acpi_gtdt_info { + uint32_t timer_virt; + uint32_t timer_s_el1; + uint32_t timer_ns_el1; + uint32_t timer_ns_el2; }; struct acpi_madt_info { + const hwaddr *gic_cpu_base_addr; + const hwaddr *gic_dist_base_addr; }; struct acpi_dsdt_info { -- 1.9.1

9 years, 7 months

[RFC PATCH 6/7] hw/arm/virt-acpi: Generation of DSDT including virt devices

by Alexander Spyridakis

DSDT consists of the usual common table header plus a definition block in AML encoding which describes all devices in the platform. After initializing DSDT with header information the namespace is created which is followed by the device encodings. The devices are described using the Resource Template for the 32-Bit Fixed Memory Range and the Extended Interrupt Descriptors. Additional helper functions are implemented to add devices with the Resource Template and calculating their multiple size fields which are not fixed. The following devices are included in the DSDT: - CPUs - UART - RTC - NAND Flash - virtio-mmio Signed-off-by: Alexander Spyridakis <a.spyridakis(a)virtualopensystems.com> --- hw/arm/virt-acpi.c | 284 +++++++++++++++++++++++++++++++++++++++++++- include/hw/acpi/acpi-defs.h | 34 ++++++ include/hw/arm/virt-acpi.h | 9 ++ 3 files changed, 325 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt-acpi.c b/hw/arm/virt-acpi.c index a53a620..be490e7 100644 --- a/hw/arm/virt-acpi.c +++ b/hw/arm/virt-acpi.c @@ -22,6 +22,258 @@ static void *acpi_table[NUM_ACPI_TABLES]; static int acpi_size[NUM_ACPI_TABLES]; /* + * Package length encoding: + * The package length can range from 1 to 4 bytes. For a package size less than + * 64, only 1 byte is needed, bits 0 - 5 represent the size and the rest should + * be zero. In case of larger package sizes, for the first byte (Package Lead + * Byte), bits 0 - 3 hold the least significant nibble of the size value, bits + * 4 - 5 are reserved and must be zero, bits 6 - 7 signify how many size bytes + * are following. + */ +static void *acpi_calc_size(uint8_t *buf, uint8_t *end, bool resource) +{ + uint8_t *ret, *ptr = buf; + unsigned int size = end - buf; + unsigned int i, shift, byte_num = 1; + + if (size < (1 << 6)) { + byte_num = 1; + } else if (size < (1 << 12)) { + byte_num = 2; + } else if (size < (1 << 20)) { + byte_num = 3; + } else if (size < (1 << 28)) { + byte_num = 4; + } + + if (resource) { + memmove(ptr + (byte_num * 2) + 1, buf, size); + size += (byte_num * 2) + 1; + } else { + memmove(ptr + byte_num, buf, size); + size += byte_num; + } + + *ptr++ = byte_num == 1 ? size : (size & 0x0F) | ((byte_num - 1) << 6); + + shift = 4; + for (i = 1; i < byte_num; i++) { + *ptr++ = size >> shift; + shift += 8; + } + + /* In the case of a resource template we have to add another size + * value just after the package size. This field needs to be + * prefixed by a byte signifying how many bytes the size is. */ + if (resource) { + switch (byte_num) { + case 1: + *ptr++ = ACPI_AML_BYTE_PREFIX; + break; + case 2: + *ptr++ = ACPI_AML_WORD_PREFIX; + break; + case 3: + *ptr++ = ACPI_AML_DWORD_PREFIX; + break; + case 4: + *ptr++ = ACPI_AML_QWORD_PREFIX; + break; + } + + shift = 0; + for (i = 0; i < byte_num; i++) { + *ptr++ = (size - byte_num - 2) >> shift; + shift += 8; + } + } + + ret = buf + size; + return ret; +} + +static void *acpi_dsdt_init_device(uint8_t *buf, const char *name, + const char *hid, int uid) +{ + uint8_t *ptr = buf; + + /* DeviceOp */ + *ptr++ = ACPI_AML_DEVICE_OP; + *ptr++ = ACPI_AML_OP_PREFIX; + + /* Device name */ + ptr = mempcpy(ptr, name, 4); + *ptr++ = ACPI_AML_NAME_OP; + + /* Hardware ID */ + ptr = mempcpy(ptr, "_HID", 4); + *ptr++ = ACPI_AML_STRING_PREFIX; + ptr = mempcpy(ptr, hid, 9); + *ptr++ = ACPI_AML_NAME_OP; + + /* Unique ID - Values greater than one need the byte prefix */ + ptr = mempcpy(ptr, "_UID", 4); + if (uid > 1) { + *ptr++ = ACPI_AML_BYTE_PREFIX; + } + *ptr++ = uid; + + return ptr; +} + +static void *acpi_add_res_memory32(uint8_t *buf, hwaddr addr, + hwaddr size, uint8_t rw_flag) +{ + AcpiAmlResourceFixedMemory32 *memory = (AcpiAmlResourceFixedMemory32 *)buf; + + memory->descriptor_type = ACPI_AML_RESOURCE_MEMORY32; + memory->resource_length = sizeof(*memory) - 3; + + memory->flags = rw_flag; + memory->address = addr; + memory->address_length = size; + + return (void *)memory + sizeof(*memory); +} + +static void *acpi_add_res_extended_irq(uint8_t *buf, uint8_t irq_flags, int irq) +{ + AcpiAmlResourceExtendedIrq *ext_irq = (AcpiAmlResourceExtendedIrq *)buf; + + ext_irq->descriptor_type = ACPI_AML_RESOURCE_EXTENDED_IRQ; + ext_irq->resource_length = sizeof(*ext_irq) - 3; + + ext_irq->flags = irq_flags; + ext_irq->interrupt_count = 0x01; + ext_irq->interrupts[0] = irq; + + return (void *)ext_irq + sizeof(*ext_irq); +} + +/* + * Create a device definition based on the ACPI ResourceTemplate: + * First the name, hardware and unique ID segments are created, + * then the resource template regions are added to define the + * address, size and interrupts of the device. + * Finally, the End Tag is used to signify the end of the device, + * and the total length is calculated. + */ +static void *acpi_dsdt_add_simple_resource(uint8_t *buf, const char *name, + const char *hid, int uid, + hwaddr base, hwaddr size, + int irq, uint8_t irq_flags) +{ + uint8_t *res_len, *ptr = buf; + + ptr = acpi_dsdt_init_device(ptr, name, hid, uid); + + /* Skip the creation of a resource template if it is not provided */ + if (!size && !irq) { + goto ret; + } + + /* Resource template */ + *ptr++ = ACPI_AML_NAME_OP; + ptr = mempcpy(ptr, "_CRS", 4); + *ptr++ = ACPI_AML_BUFFER_PREFIX; + + /* Point to resource size for later */ + res_len = ptr; + + /* Add resource template regions */ + if (size) { + ptr = acpi_add_res_memory32(ptr, base, size, 0x01); + } + if (irq) { + ptr = acpi_add_res_extended_irq(ptr, irq_flags, irq); + } + + /* End the resource template */ + *ptr++ = ACPI_AML_END_TAG; + *ptr++ = 0x00; + + /* Update resource size */ + ptr = acpi_calc_size(res_len, ptr, 1); + +ret: + /* Calculate total device size */ + ptr = acpi_calc_size(buf + 2, ptr, 0); + + return ptr; +} + +static void *acpi_dsdt_add_cpus(uint8_t *buf, int cpus) +{ + int i; + char name[5]; + uint8_t *ptr = buf; + + /* In the case of CPUs there is no need for a resource template */ + for (i = 0; i < cpus; i++) { + snprintf(name, 5, "CPU%u", i); + ptr = acpi_dsdt_add_simple_resource(ptr, name, "ACPI0007", + i, 0, 0, 0, 0); + } + + return ptr; +} + +static void *acpi_dsdt_add_uart(uint8_t *buf, const hwaddr *uart_addr, + const int *uart_irq) +{ + uint8_t *ptr = buf; + + ptr = acpi_dsdt_add_simple_resource(ptr, "COM0", "ARMH0011", 0, + uart_addr[0], uart_addr[1], *uart_irq + 32, 0x01); + return ptr; +} + +static void *acpi_dsdt_add_rtc(uint8_t *buf, const hwaddr *rtc_addrs, + const int *rtc_irq) +{ + uint8_t *ptr = buf; + int irq = *rtc_irq + 32; + + ptr = acpi_dsdt_add_simple_resource(ptr, "RTC0", "LNRO0013", 0, + rtc_addrs[0], rtc_addrs[1], irq, 0x01); + + return ptr; +} + +static void *acpi_dsdt_add_flash(uint8_t *buf, const hwaddr *flash_addrs) +{ + uint8_t *ptr = buf; + hwaddr base = flash_addrs[0]; + hwaddr size = flash_addrs[1]; + + ptr = acpi_dsdt_add_simple_resource(ptr, "FLS0", "LNRO0015", + 0, base, size, 0, 0); + ptr = acpi_dsdt_add_simple_resource(ptr, "FLS1", "LNRO0015", + 1, base + size, size, 0, 0); + return ptr; +} + +static void *acpi_dsdt_add_virtio(uint8_t *buf, const hwaddr *mmio_addrs, + const int *mmio_irq, int num) +{ + int i; + char name[5]; + uint8_t *ptr = buf; + hwaddr base = mmio_addrs[0]; + hwaddr size = mmio_addrs[1]; + int irq = *mmio_irq + 32; + + for (i = 0; i < num; i++) { + snprintf(name, 5, "VR%02u", i); + ptr = acpi_dsdt_add_simple_resource(ptr, name, "LNRO0005", + i, base, size, irq + i, 0x01); + base += size; + } + + return ptr; +} + +/* * Many of the ACPI tables use the same header structure * This is a common function to fill such information. */ @@ -235,8 +487,36 @@ static void acpi_create_facs(void) static void acpi_create_dsdt(int smp_cpus, const struct acpi_dsdt_info *info) { - acpi_table[DSDT] = NULL; - acpi_size[DSDT] = 0; + uint8_t *ptr; + AcpiTableHeader *header; + + /* As we don't know the size of DSDT beforehand, allocate a chunk of + * memory and pass this to all other calls that add device definitions */ + acpi_table[DSDT] = g_malloc0(ACPI_DSDT_MAX_SIZE); + ptr = acpi_table[DSDT]; + header = (AcpiTableHeader *)acpi_table[DSDT]; + + acpi_fill_common_header_data(ptr, "DSDT", 1, sizeof(AcpiTableHeader)); + ptr = acpi_table[DSDT] + sizeof(AcpiTableHeader); + + /* Scope and namespace, length will be filled at the end */ + *ptr++ = ACPI_AML_SCOPE_OP; + ptr = mempcpy(ptr, "_SB_", 4); + + /* Add device definitions */ + ptr = acpi_dsdt_add_cpus(ptr, smp_cpus); + ptr = acpi_dsdt_add_uart(ptr, info->uart_addr, info->uart_irq); + ptr = acpi_dsdt_add_rtc(ptr, info->rtc_addr, info->rtc_irq); + ptr = acpi_dsdt_add_flash(ptr, info->flash_addr); + ptr = acpi_dsdt_add_virtio(ptr, info->virtio_mmio_addr, + info->virtio_mmio_irq, info->virtio_mmio_num); + + /* Table and namespace size calculation */ + ptr = acpi_calc_size(acpi_table[DSDT] + sizeof(*header) + 1, ptr, 0); + acpi_size[DSDT] = (void *)ptr - acpi_table[DSDT]; + header->length = acpi_size[DSDT]; + + acpi_do_checksum(acpi_table[DSDT], acpi_size[DSDT], &header->checksum); } void acpi_build_tables(int smp_cpus, diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index f5e5222..dc4ae46 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -227,6 +227,40 @@ typedef struct AcpiFacsDescriptorRev5_1 AcpiFacsDescriptorRev5_1; * Differentiated System Description Table (DSDT) */ +#define ACPI_AML_SCOPE_OP 0x10 +#define ACPI_AML_DEVICE_OP 0x5B +#define ACPI_AML_NAME_OP 0x08 +#define ACPI_AML_OP_PREFIX 0x82 +#define ACPI_AML_BYTE_PREFIX 0x0A +#define ACPI_AML_WORD_PREFIX 0x0B +#define ACPI_AML_DWORD_PREFIX 0x0C +#define ACPI_AML_QWORD_PREFIX 0x0E +#define ACPI_AML_STRING_PREFIX 0x0D +#define ACPI_AML_BUFFER_PREFIX 0x11 +#define ACPI_AML_END_TAG 0x79 +#define ACPI_AML_RESOURCE_MEMORY32 0x86 +#define ACPI_AML_RESOURCE_EXTENDED_IRQ 0x89 + +#define AML_RESOURCE_LARGE_HEADER_COMMON \ + uint8_t descriptor_type;\ + uint16_t resource_length; + +struct AcpiAmlResourceFixedMemory32 { + AML_RESOURCE_LARGE_HEADER_COMMON + uint8_t flags; + uint32_t address; + uint32_t address_length; +} QEMU_PACKED; +typedef struct AcpiAmlResourceFixedMemory32 AcpiAmlResourceFixedMemory32; + +struct AcpiAmlResourceExtendedIrq { + AML_RESOURCE_LARGE_HEADER_COMMON + uint8_t flags; + uint8_t interrupt_count; + uint32_t interrupts[1]; +} QEMU_PACKED; +typedef struct AcpiAmlResourceExtendedIrq AcpiAmlResourceExtendedIrq; + /* * MADT values and structures */ diff --git a/include/hw/arm/virt-acpi.h b/include/hw/arm/virt-acpi.h index 216a3a2..39bb14d 100644 --- a/include/hw/arm/virt-acpi.h +++ b/include/hw/arm/virt-acpi.h @@ -28,6 +28,7 @@ #define ACPI_VIRT_MACH_STR_8 "MACHVIRT" #define ACPI_BASE_ADDRESS 0x47000000 +#define ACPI_DSDT_MAX_SIZE 0x4000 enum { RSDP, @@ -53,6 +54,14 @@ struct acpi_madt_info { }; struct acpi_dsdt_info { + const hwaddr *uart_addr; + const int *uart_irq; + const hwaddr *virtio_mmio_addr; + const int *virtio_mmio_irq; + int virtio_mmio_num; + const hwaddr *rtc_addr; + const int *rtc_irq; + const hwaddr *flash_addr; }; void acpi_build_tables(int smp_cpus, -- 1.9.1

9 years, 7 months

[RFC PATCH 7/7] hw/arm/virt: Enable dynamic generation of ACPI v5.1 tables

by Alexander Spyridakis

Expose the needed device information to the table generation insfrastructure and assemble the final compacted ACPI binary blob in the guest memory. Signed-off-by: Alvise Rigo <a.rigo(a)virtualopensystems.com> --- hw/arm/boot.c | 26 +++++++++++++++++++++++++ hw/arm/virt-acpi.c | 18 +++++++++++++++++- hw/arm/virt.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++---- include/hw/arm/arm.h | 2 ++ 4 files changed, 95 insertions(+), 5 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index bffbea5..74c8eb5 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -179,6 +179,11 @@ static inline bool have_dtb(const struct arm_boot_info *info) return info->dtb_filename || info->get_dtb; } +static inline bool have_acpi(const struct arm_boot_info *info) +{ + return info->get_acpi; +} + #define WRITE_WORD(p, value) do { \ stl_phys_notdirty(&address_space_memory, p, value); \ p += 4; \ @@ -438,6 +443,20 @@ fail: return -1; } +static int load_acpi(hwaddr addr, const struct arm_boot_info *binfo, + hwaddr addr_limit) +{ + void *acpi_blob = NULL; + int acpi_size; + + acpi_blob = binfo->get_acpi(binfo, &acpi_size); + rom_add_blob_fixed("acpi", acpi_blob, acpi_size, binfo->acpi_base_addr); + g_free(acpi_blob); + /* TODO: check to not write outside memory boundaries */ + + return 0; +} + static void do_cpu_reset(void *opaque) { ARMCPU *cpu = opaque; @@ -497,6 +516,13 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) qemu_register_reset(do_cpu_reset, ARM_CPU(cs)); } + /* load ACPI blob */ + if (have_acpi(info)) { + if (load_acpi(info->acpi_base_addr, info, 0) < 0) { + exit(1); + } + } + /* Load the kernel. */ if (!info->kernel_filename) { diff --git a/hw/arm/virt-acpi.c b/hw/arm/virt-acpi.c index be490e7..19e6779 100644 --- a/hw/arm/virt-acpi.c +++ b/hw/arm/virt-acpi.c @@ -535,5 +535,21 @@ void acpi_build_tables(int smp_cpus, uint32_t acpi_make_blob(void **blob_ptr) { - return 0; + uint8_t *acpi_blob_ptr = NULL; + uint32_t blob_size, n; + + for (n = RSDP, blob_size = 0; n <= DSDT; n++) { + blob_size += acpi_size[n]; + } + + *blob_ptr = (void *)g_malloc0(blob_size); + acpi_blob_ptr = *blob_ptr; + + for (n = RSDP; n <= DSDT; n++) { + memcpy(acpi_blob_ptr, acpi_table[n], acpi_size[n]); + acpi_blob_ptr += acpi_size[n]; + g_free(acpi_table[n]); + } + + return blob_size; } diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 78f618d..5b40292 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -42,6 +42,8 @@ #include "exec/address-spaces.h" #include "qemu/bitops.h" #include "qemu/error-report.h" +#include "hw/acpi/acpi-defs.h" +#include "hw/arm/virt-acpi.h" #define NUM_VIRTIO_TRANSPORTS 32 @@ -59,6 +61,11 @@ #define GIC_FDT_IRQ_PPI_CPU_START 8 #define GIC_FDT_IRQ_PPI_CPU_WIDTH 8 +#define ARCH_TIMER_VIRT_IRQ 11 +#define ARCH_TIMER_S_EL1_IRQ 13 +#define ARCH_TIMER_NS_EL1_IRQ 14 +#define ARCH_TIMER_NS_EL2_IRQ 10 + enum { VIRT_FLASH, VIRT_MEM, @@ -83,6 +90,8 @@ typedef struct VirtBoardInfo { int smp_cpus; void *fdt; int fdt_size; + void *acpi; + int acpi_size; uint32_t clock_phandle; } VirtBoardInfo; @@ -119,6 +128,29 @@ static const int a15irqmap[] = { [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ }; +static const struct acpi_madt_info madt_info = { + &a15memmap[VIRT_GIC_CPU].base, + &a15memmap[VIRT_GIC_DIST].base +}; + +static const struct acpi_dsdt_info dsdt_info = { + .uart_addr = &a15memmap[VIRT_UART].base, + .uart_irq = &a15irqmap[VIRT_UART], + .virtio_mmio_addr = &a15memmap[VIRT_MMIO].base, + .virtio_mmio_irq = &a15irqmap[VIRT_MMIO], + .virtio_mmio_num = NUM_VIRTIO_TRANSPORTS, + .rtc_addr = &a15memmap[VIRT_RTC].base, + .rtc_irq = &a15irqmap[VIRT_RTC], + .flash_addr = &a15memmap[VIRT_FLASH].base, +}; + +static const struct acpi_gtdt_info gtdt_info = { + ARCH_TIMER_VIRT_IRQ + 16, + ARCH_TIMER_S_EL1_IRQ + 16, + ARCH_TIMER_NS_EL1_IRQ + 16, + ARCH_TIMER_NS_EL2_IRQ + 16 +}; + static VirtBoardInfo machines[] = { { .cpu_model = "cortex-a15", @@ -259,10 +291,10 @@ static void fdt_add_timer_nodes(const VirtBoardInfo *vbi) "arm,armv7-timer"); } qemu_fdt_setprop_cells(vbi->fdt, "/timer", "interrupts", - GIC_FDT_IRQ_TYPE_PPI, 13, irqflags, - GIC_FDT_IRQ_TYPE_PPI, 14, irqflags, - GIC_FDT_IRQ_TYPE_PPI, 11, irqflags, - GIC_FDT_IRQ_TYPE_PPI, 10, irqflags); + GIC_FDT_IRQ_TYPE_PPI, ARCH_TIMER_S_EL1_IRQ, irqflags, + GIC_FDT_IRQ_TYPE_PPI, ARCH_TIMER_NS_EL1_IRQ, irqflags, + GIC_FDT_IRQ_TYPE_PPI, ARCH_TIMER_VIRT_IRQ, irqflags, + GIC_FDT_IRQ_TYPE_PPI, ARCH_TIMER_NS_EL2_IRQ, irqflags); } static void fdt_add_cpu_nodes(const VirtBoardInfo *vbi) @@ -527,6 +559,14 @@ static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) return board->fdt; } +static void *machvirt_acpi(const struct arm_boot_info *binfo, int *acpi_size) +{ + const VirtBoardInfo *board = (const VirtBoardInfo *)binfo; + + *acpi_size = board->acpi_size; + return board->acpi; +} + static void machvirt_init(MachineState *machine) { qemu_irq pic[NUM_IRQS]; @@ -604,6 +644,10 @@ static void machvirt_init(MachineState *machine) */ create_virtio_devices(vbi, pic); + /* Build ACPI tables and form the binary blob */ + acpi_build_tables(vbi->smp_cpus, &gtdt_info, &madt_info, &dsdt_info); + vbi->acpi_size = acpi_make_blob(&vbi->acpi); + vbi->bootinfo.ram_size = machine->ram_size; vbi->bootinfo.kernel_filename = machine->kernel_filename; vbi->bootinfo.kernel_cmdline = machine->kernel_cmdline; @@ -612,6 +656,8 @@ static void machvirt_init(MachineState *machine) vbi->bootinfo.board_id = -1; vbi->bootinfo.loader_start = vbi->memmap[VIRT_MEM].base; vbi->bootinfo.get_dtb = machvirt_dtb; + vbi->bootinfo.acpi_base_addr = ACPI_BASE_ADDRESS; + vbi->bootinfo.get_acpi = machvirt_acpi; arm_load_kernel(ARM_CPU(first_cpu), &vbi->bootinfo); } diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index cefc9e6..806faaf 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -27,6 +27,7 @@ struct arm_boot_info { const char *initrd_filename; const char *dtb_filename; hwaddr loader_start; + hwaddr acpi_base_addr; /* multicore boards that use the default secondary core boot functions * need to put the address of the secondary boot code, the boot reg, * and the GIC address in the next 3 values, respectively. boards that @@ -61,6 +62,7 @@ struct arm_boot_info { * the user it should implement this hook. */ void (*modify_dtb)(const struct arm_boot_info *info, void *fdt); + void *(*get_acpi)(const struct arm_boot_info *info, int *size); /* Used internally by arm_boot.c */ int is_linux; hwaddr initrd_start; -- 1.9.1

9 years, 7 months

[RFC PATCH 4/7] hw/arm/virt-acpi: Generate FACS and FADT, update ACPI headers

by Alexander Spyridakis

FADT points to FACS and DSDT and additionally, in the case of mach virt, it is also used to set the Hardware Reduced bit and enable PSCI SMP booting through HVC. For FACS the table is created as a mockup, as with the Hardware Reduced bit set it will not be used. Update the header definitions for FADT and FACS taking into account the new additions of ACPI v5.1 in `include/hw/acpi/acpi-defs.h` Signed-off-by: Alexander Spyridakis <a.spyridakis(a)virtualopensystems.com> Signed-off-by: Alvise Rigo <a.rigo(a)virtualopensystems.com> --- hw/arm/virt-acpi.c | 41 +++++++++++-- include/hw/acpi/acpi-defs.h | 141 ++++++++++++++++++++++++++++++-------------- 2 files changed, 134 insertions(+), 48 deletions(-) diff --git a/hw/arm/virt-acpi.c b/hw/arm/virt-acpi.c index 0d7bb99..aca0434 100644 --- a/hw/arm/virt-acpi.c +++ b/hw/arm/virt-acpi.c @@ -133,14 +133,47 @@ static void acpi_create_gtdt(const struct acpi_gtdt_info *irqs) static void acpi_create_fadt(void) { - acpi_table[FADT] = NULL; - acpi_size[FADT] = 0; + AcpiFacpDescriptorRev5_1 *fadt; + hwaddr facs_offset; + int i; + + fadt = g_malloc0(sizeof(*fadt)); + acpi_fill_common_header_data(fadt, "FACP", 5, sizeof(*fadt)); + + /* Hardware Reduced = 1 and use PSCI 0.2+ and with HVC */ + fadt->flags = cpu_to_le32(1 << ACPI_FADT_F_HW_REDUCED_ACPI); + fadt->arm_boot_flags = cpu_to_le16((1 << ACPI_FADT_ARM_USE_PSCI_G_0_2) | + (1 << ACPI_FADT_ARM_PSCI_USE_HVC)); + + /* ACPI v5.1 (fadt->revision.fadt->minor_revision) */ + fadt->minor_revision = 0x1; + + acpi_size[FADT] = fadt->length; + + /* Calculate FACS and DSDT table offsets */ + for (i = RSDP, facs_offset = 0; i < FACS; ++i) { + facs_offset += acpi_size[i]; + } + fadt->Xfacs = cpu_to_le64(ACPI_BASE_ADDRESS + facs_offset); + fadt->Xdsdt = cpu_to_le64(fadt->Xfacs + acpi_size[FACS]); + + acpi_do_checksum(fadt, fadt->length, &fadt->checksum); + + acpi_table[FADT] = (void *)fadt; } static void acpi_create_facs(void) { - acpi_table[FACS] = NULL; - acpi_size[FACS] = 0; + AcpiFacsDescriptorRev5_1 *facs; + + facs = g_malloc0(sizeof(*facs)); + + memcpy(&facs->signature, "FACS", sizeof(facs->signature)); + facs->length = cpu_to_le32(sizeof(*facs)); + facs->version = 0x02; + + acpi_table[FACS] = (void *)facs; + acpi_size[FACS] = facs->length; } static void acpi_create_dsdt(int smp_cpus, const struct acpi_dsdt_info *info) diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index 779f872..ebbd2d0 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -97,46 +97,49 @@ struct AcpiXsdtDescriptor { typedef struct AcpiXsdtDescriptor AcpiXsdtDescriptor; /* - * ACPI 1.0 Fixed ACPI Description Table (FADT) + * ACPI Fixed ACPI Description Table (FADT) */ +#define ACPI_FADT_COMMON_DEF /* FADT common definition */ \ + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ \ + uint32_t firmware_ctrl; /* Physical address of FACS */ \ + uint32_t dsdt; /* Physical address of DSDT */ \ + uint8_t model; /* System Interrupt Model */ \ + uint8_t reserved1; /* Reserved */ \ + uint16_t sci_int; /* System vector of SCI interrupt */ \ + uint32_t smi_cmd; /* Port address of SMI command port */ \ + uint8_t acpi_enable; /* Value to write to smi_cmd to enable ACPI */ \ + uint8_t acpi_disable; /* Value to write to smi_cmd to disable ACPI */ \ + uint8_t S4bios_req; /* Value to write to SMI CMD to enter S4BIOS state */ \ + uint8_t reserved2; /* Reserved - must be zero */ \ + uint32_t pm1a_evt_blk; /* Port address of Power Mgt 1a acpi_event Reg Blk */ \ + uint32_t pm1b_evt_blk; /* Port address of Power Mgt 1b acpi_event Reg Blk */ \ + uint32_t pm1a_cnt_blk; /* Port address of Power Mgt 1a Control Reg Blk */ \ + uint32_t pm1b_cnt_blk; /* Port address of Power Mgt 1b Control Reg Blk */ \ + uint32_t pm2_cnt_blk; /* Port address of Power Mgt 2 Control Reg Blk */ \ + uint32_t pm_tmr_blk; /* Port address of Power Mgt Timer Ctrl Reg Blk */ \ + uint32_t gpe0_blk; /* Port addr of General Purpose acpi_event 0 Reg Blk */ \ + uint32_t gpe1_blk; /* Port addr of General Purpose acpi_event 1 Reg Blk */ \ + uint8_t pm1_evt_len; /* Byte length of ports at pm1_x_evt_blk */ \ + uint8_t pm1_cnt_len; /* Byte length of ports at pm1_x_cnt_blk */ \ + uint8_t pm2_cnt_len; /* Byte Length of ports at pm2_cnt_blk */ \ + uint8_t pm_tmr_len; /* Byte Length of ports at pm_tm_blk */ \ + uint8_t gpe0_blk_len; /* Byte Length of ports at gpe0_blk */ \ + uint8_t gpe1_blk_len; /* Byte Length of ports at gpe1_blk */ \ + uint8_t gpe1_base; /* Offset in gpe model where gpe1 events start */ \ + uint8_t reserved3; /* Reserved */ \ + uint16_t plvl2_lat; /* Worst case HW latency to enter/exit C2 state */ \ + uint16_t plvl3_lat; /* Worst case HW latency to enter/exit C3 state */ \ + uint16_t flush_size; /* Size of area read to flush caches */ \ + uint16_t flush_stride; /* Stride used in flushing caches */ \ + uint8_t duty_offset; /* Bit location of duty cycle field in p_cnt reg */ \ + uint8_t duty_width; /* Bit width of duty cycle field in p_cnt reg */ \ + uint8_t day_alrm; /* Index to day-of-month alarm in RTC CMOS RAM */ \ + uint8_t mon_alrm; /* Index to month-of-year alarm in RTC CMOS RAM */ \ + uint8_t century; /* Index to century in RTC CMOS RAM */ + struct AcpiFadtDescriptorRev1 { - ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint32_t firmware_ctrl; /* Physical address of FACS */ - uint32_t dsdt; /* Physical address of DSDT */ - uint8_t model; /* System Interrupt Model */ - uint8_t reserved1; /* Reserved */ - uint16_t sci_int; /* System vector of SCI interrupt */ - uint32_t smi_cmd; /* Port address of SMI command port */ - uint8_t acpi_enable; /* Value to write to smi_cmd to enable ACPI */ - uint8_t acpi_disable; /* Value to write to smi_cmd to disable ACPI */ - uint8_t S4bios_req; /* Value to write to SMI CMD to enter S4BIOS state */ - uint8_t reserved2; /* Reserved - must be zero */ - uint32_t pm1a_evt_blk; /* Port address of Power Mgt 1a acpi_event Reg Blk */ - uint32_t pm1b_evt_blk; /* Port address of Power Mgt 1b acpi_event Reg Blk */ - uint32_t pm1a_cnt_blk; /* Port address of Power Mgt 1a Control Reg Blk */ - uint32_t pm1b_cnt_blk; /* Port address of Power Mgt 1b Control Reg Blk */ - uint32_t pm2_cnt_blk; /* Port address of Power Mgt 2 Control Reg Blk */ - uint32_t pm_tmr_blk; /* Port address of Power Mgt Timer Ctrl Reg Blk */ - uint32_t gpe0_blk; /* Port addr of General Purpose acpi_event 0 Reg Blk */ - uint32_t gpe1_blk; /* Port addr of General Purpose acpi_event 1 Reg Blk */ - uint8_t pm1_evt_len; /* Byte length of ports at pm1_x_evt_blk */ - uint8_t pm1_cnt_len; /* Byte length of ports at pm1_x_cnt_blk */ - uint8_t pm2_cnt_len; /* Byte Length of ports at pm2_cnt_blk */ - uint8_t pm_tmr_len; /* Byte Length of ports at pm_tm_blk */ - uint8_t gpe0_blk_len; /* Byte Length of ports at gpe0_blk */ - uint8_t gpe1_blk_len; /* Byte Length of ports at gpe1_blk */ - uint8_t gpe1_base; /* Offset in gpe model where gpe1 events start */ - uint8_t reserved3; /* Reserved */ - uint16_t plvl2_lat; /* Worst case HW latency to enter/exit C2 state */ - uint16_t plvl3_lat; /* Worst case HW latency to enter/exit C3 state */ - uint16_t flush_size; /* Size of area read to flush caches */ - uint16_t flush_stride; /* Stride used in flushing caches */ - uint8_t duty_offset; /* Bit location of duty cycle field in p_cnt reg */ - uint8_t duty_width; /* Bit width of duty cycle field in p_cnt reg */ - uint8_t day_alrm; /* Index to day-of-month alarm in RTC CMOS RAM */ - uint8_t mon_alrm; /* Index to month-of-year alarm in RTC CMOS RAM */ - uint8_t century; /* Index to century in RTC CMOS RAM */ + ACPI_FADT_COMMON_DEF uint8_t reserved4; /* Reserved */ uint8_t reserved4a; /* Reserved */ uint8_t reserved4b; /* Reserved */ @@ -144,6 +147,43 @@ struct AcpiFadtDescriptorRev1 } QEMU_PACKED; typedef struct AcpiFadtDescriptorRev1 AcpiFadtDescriptorRev1; +struct acpi_generic_address { + uint8_t space_id; /* Address space where struct or register exists */ + uint8_t bit_width; /* Size in bits of given register */ + uint8_t bit_offset; /* Bit offset within the register */ + uint8_t access_width; /* Minimum Access size (ACPI 3.0) */ + uint64_t address; /* 64-bit address of struct or register */ +} QEMU_PACKED; + +struct AcpiFacpDescriptorRev5_1 { + ACPI_FADT_COMMON_DEF + uint16_t boot_flags; /* IA-PC Boot Architecture Flags (see below for individual flags) */ + uint8_t reserved; /* Reserved, must be zero */ + uint32_t flags; /* Miscellaneous flag bits (see below for individual flags) */ + struct acpi_generic_address reset_register; /* 64-bit address of the Reset register */ + uint8_t reset_value; /* Value to write to the reset_register port to reset the system */ + uint16_t arm_boot_flags; /* ARM-Specific Boot Flags (see below for individual flags) (ACPI 5.1) */ + uint8_t minor_revision; /* FADT Minor Revision (ACPI 5.1) */ + uint64_t Xfacs; /* 64-bit physical address of FACS */ + uint64_t Xdsdt; /* 64-bit physical address of DSDT */ + struct acpi_generic_address xpm1a_event_block; /* 64-bit Extended Power Mgt 1a Event Reg Blk address */ + struct acpi_generic_address xpm1b_event_block; /* 64-bit Extended Power Mgt 1b Event Reg Blk address */ + struct acpi_generic_address xpm1a_control_block; /* 64-bit Extended Power Mgt 1a Control Reg Blk address */ + struct acpi_generic_address xpm1b_control_block; /* 64-bit Extended Power Mgt 1b Control Reg Blk address */ + struct acpi_generic_address xpm2_control_block; /* 64-bit Extended Power Mgt 2 Control Reg Blk address */ + struct acpi_generic_address xpm_timer_block; /* 64-bit Extended Power Mgt Timer Ctrl Reg Blk address */ + struct acpi_generic_address xgpe0_block; /* 64-bit Extended General Purpose Event 0 Reg Blk address */ + struct acpi_generic_address xgpe1_block; /* 64-bit Extended General Purpose Event 1 Reg Blk address */ + struct acpi_generic_address sleep_control; /* 64-bit Sleep Control register (ACPI 5.0) */ + struct acpi_generic_address sleep_status; /* 64-bit Sleep Status register (ACPI 5.0) */ +} QEMU_PACKED; +typedef struct AcpiFacpDescriptorRev5_1 AcpiFacpDescriptorRev5_1; + +enum { + ACPI_FADT_ARM_USE_PSCI_G_0_2, + ACPI_FADT_ARM_PSCI_USE_HVC, +}; + /* * ACPI 1.0 Root System Description Table (RSDT) */ @@ -156,20 +196,33 @@ struct AcpiRsdtDescriptorRev1 typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1; /* - * ACPI 1.0 Firmware ACPI Control Structure (FACS) + * ACPI Firmware ACPI Control Structure (FACS) */ +#define ACPI_FACS_COMMON_DEF /* FACS common definition */ \ + 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; + 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; + ACPI_FACS_COMMON_DEF uint8_t resverved3 [40]; /* Reserved - must be zero */ } QEMU_PACKED; typedef struct AcpiFacsDescriptorRev1 AcpiFacsDescriptorRev1; +struct AcpiFacsDescriptorRev5_1 { + ACPI_FACS_COMMON_DEF + uint64_t xfirmware_waking_vector; /* 64-bit version of the Firmware Waking Vector (ACPI 2.0+) */ + uint8_t version; /* Version of this table (ACPI 2.0+) */ + uint8_t reserved [3]; /* Reserved, must be zero */ + uint32_t ospm_flags; /* Flags to be set by OSPM (ACPI 4.0) */ + uint8_t reserved1 [24]; /* Reserved, must be zero */ +} QEMU_PACKED; +typedef struct AcpiFacsDescriptorRev5_1 AcpiFacsDescriptorRev5_1; + /* * Differentiated System Description Table (DSDT) */ -- 1.9.1

9 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-acpi October 2014