[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v2 04/16] hw/arm/virt-acpi-build: fadt: improve flag n
From: |
Andrew Jones |
Subject: |
[Qemu-arm] [PATCH v2 04/16] hw/arm/virt-acpi-build: fadt: improve flag naming |
Date: |
Mon, 2 Jan 2017 21:01:41 +0100 |
Signed-off-by: Andrew Jones <address@hidden>
---
hw/arm/virt-acpi-build.c | 4 ++--
include/hw/acpi/acpi-defs.h | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index b6b64296f119..a6c6180f4bce 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -642,8 +642,8 @@ build_fadt(GArray *table_data, BIOSLinker *linker, unsigned
dsdt_tbl_offset)
/* 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));
+ fadt->arm_boot_flags = cpu_to_le16(ACPI_FADT_ARM_PSCI_COMPLIANT |
+ ACPI_FADT_ARM_PSCI_USE_HVC);
/* ACPI v5.1 (fadt->revision.fadt->minor_revision) */
fadt->minor_revision = 0x1;
diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 8fe0996e15fb..d15b7e5cd39a 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -191,10 +191,8 @@ struct AcpiFadtDescriptorRev5_1 {
typedef struct AcpiFadtDescriptorRev5_1 AcpiFadtDescriptorRev5_1;
-enum {
- ACPI_FADT_ARM_USE_PSCI_G_0_2 = 0,
- ACPI_FADT_ARM_PSCI_USE_HVC = 1,
-};
+#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
--
2.9.3
- [Qemu-arm] [PATCH v2 00/16] Remove VirtGuestInfo, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 01/16] hw/arm/virt-acpi-build: add all missing cpu_to_le's, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 02/16] hw/arm/virt-acpi-build: name GIC CPU Interface Structure appropriately, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 03/16] hw/arm/virt-acpi-build: gtdt: improve flag naming, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 04/16] hw/arm/virt-acpi-build: fadt: improve flag naming,
Andrew Jones <=
- [Qemu-arm] [PATCH v2 05/16] hw/arm/virt: parameter passing cleanups, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 06/16] hw/arm/virt: use VirtMachineState.gic_version, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 07/16] hw/arm/virt: eliminate struct VirtGuestInfoState, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 08/16] hw/arm/virt: remove include/hw/arm/virt-acpi-build.h, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 10/16] hw/arm/virt: pass VirtMachineState instead of VirtGuestInfo, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 09/16] hw/arm/virt: move VirtMachineState/Class to virt.h, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 12/16] hw/arm/virt-acpi-build: don't save VirtGuestInfo on AcpiBuildState, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 11/16] hw/arm/virt-acpi-build: remove redundant members from VirtGuestInfo, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 13/16] hw/arm/virt: remove VirtGuestInfo, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 15/16] hw/arm/virt-acpi-build: use SMC if booting in EL2, Andrew Jones, 2017/01/02