diff options
| author | Igor Mammedov | 2018-02-28 15:23:54 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2018-03-13 22:09:50 +0100 |
| commit | dd1b2037a38024b69e952c5ac41fd63b96e552ab (patch) | |
| tree | 9bcd195b4a51099eeaee84409268e2abda834625 /include/hw/acpi | |
| parent | acpi: move build_fadt() from i386 specific to generic ACPI source (diff) | |
| download | qemu-dd1b2037a38024b69e952c5ac41fd63b96e552ab.tar.gz qemu-dd1b2037a38024b69e952c5ac41fd63b96e552ab.tar.xz qemu-dd1b2037a38024b69e952c5ac41fd63b96e552ab.zip | |
virt_arm: acpi: reuse common build_fadt()
Extend generic build_fadt() to support rev5.1 FADT
and reuse it for 'virt' board, it would allow to
phase out usage of AcpiFadtDescriptorRev5_1 and
later ACPI_FADT_COMMON_DEF.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'include/hw/acpi')
| -rw-r--r-- | include/hw/acpi/acpi-defs.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index 3fb0ace5f8..fe15e954fa 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -165,16 +165,6 @@ struct AcpiFadtDescriptorRev3 { } QEMU_PACKED; typedef struct AcpiFadtDescriptorRev3 AcpiFadtDescriptorRev3; -struct AcpiFadtDescriptorRev5_1 { - ACPI_FADT_COMMON_DEF - /* 64-bit Sleep Control register (ACPI 5.0) */ - struct AcpiGenericAddress sleep_control; - /* 64-bit Sleep Status register (ACPI 5.0) */ - struct AcpiGenericAddress sleep_status; -} QEMU_PACKED; - -typedef struct AcpiFadtDescriptorRev5_1 AcpiFadtDescriptorRev5_1; - typedef struct AcpiFadtData { struct AcpiGenericAddress pm1a_cnt; /* PM1a_CNT_BLK */ struct AcpiGenericAddress pm1a_evt; /* PM1a_EVT_BLK */ @@ -192,6 +182,8 @@ typedef struct AcpiFadtData { uint8_t rtc_century; /* CENTURY */ uint16_t plvl2_lat; /* P_LVL2_LAT */ uint16_t plvl3_lat; /* P_LVL3_LAT */ + uint16_t arm_boot_arch; /* ARM_BOOT_ARCH */ + uint8_t minor_ver; /* FADT Minor Version */ /* * respective tables offsets within ACPI_BUILD_TABLE_FILE, |