[Xen-changelog] [xen master] ACPICA/ARM: ACPI 5.1: Update for FADT changes

[patchbot@xxxxxxx]

commit d829211592ca7d64c040f797e68d85cbf8ae7a4f
Author:     Graeme Gregory <graeme.gregory@xxxxxxxxxx>
AuthorDate: Thu Jan 7 17:34:32 2016 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Jan 7 17:34:32 2016 +0100

    ACPICA/ARM: ACPI 5.1: Update for FADT changes
    
    Adds ARM flags and FADT minor revision. Graeme Gregory.
    
    Signed-off-by: Graeme Gregory <graeme.gregory@xxxxxxxxxx>
    Signed-off-by: Hanjun Guo <hanjun.guo@xxxxxxxxxx>
    Signed-off-by: Bob Moore <robert.moore@xxxxxxxxx>
    Signed-off-by: Lv Zheng <lv.zheng@xxxxxxxxx>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
    [Linux commit 9eb1105babb8948c402ff785f5b43e35f79c0a0c]
    Signed-off-by: Shannon Zhao <shannon.zhao@xxxxxxxxxx>
    Acked-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 xen/include/acpi/actbl.h |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/xen/include/acpi/actbl.h b/xen/include/acpi/actbl.h
index 401bc9d..3079176 100644
--- a/xen/include/acpi/actbl.h
+++ b/xen/include/acpi/actbl.h
@@ -244,7 +244,8 @@ struct acpi_table_fadt {
        u32 flags;              /* Miscellaneous flag bits (see below for 
individual flags) */
        struct acpi_generic_address reset_register;     /* 64-bit address of 
the Reset register */
        u8 reset_value;         /* Value to write to the reset_register port to 
reset the system */
-       u8 reserved4[3];        /* Reserved, must be zero */
+       u16 arm_boot_flags;     /* ARM-Specific Boot Flags (see below for 
individual flags) (ACPI 5.1) */
+       u8 minor_revision;      /* FADT Minor Revision (ACPI 5.1) */
        u64 Xfacs;              /* 64-bit physical address of FACS */
        u64 Xdsdt;              /* 64-bit physical address of DSDT */
        struct acpi_generic_address xpm1a_event_block;  /* 64-bit Extended 
Power Mgt 1a Event Reg Blk address */
@@ -260,7 +261,7 @@ struct acpi_table_fadt {
        u64 hypervisor_id;      /* Hypervisor Vendor ID (ACPI 6.0) */
 };
 
-/* Masks for FADT Boot Architecture Flags (boot_flags) */
+/* Masks for FADT IA-PC Boot Architecture Flags (boot_flags) */
 
 #define ACPI_FADT_LEGACY_DEVICES    (1)        /* 00: [V2] System has LPC or 
ISA bus devices */
 #define ACPI_FADT_8042              (1<<1)     /* 01: [V3] System has an 8042 
controller on port 60/64 */
@@ -271,6 +272,11 @@ struct acpi_table_fadt {
 
 #define FADT2_REVISION_ID               3
 
+/* Masks for FADT ARM Boot Architecture Flags (arm_boot_flags) ACPI 5.1 */
+
+#define ACPI_FADT_PSCI_COMPLIANT    (1)        /* 00:  [V5+] PSCI 0.2+ is 
implemented */
+#define ACPI_FADT_PSCI_USE_HVC      (1<<1)     /* 01:  [V5+] HVC must be used 
instead of SMC as the PSCI conduit */
+
 /* Masks for FADT flags */
 
 #define ACPI_FADT_WBINVD            (1)        /* 00: [V1] The wbinvd 
instruction works properly */
@@ -347,7 +353,7 @@ enum acpi_prefered_pm_profiles {
  *     FADT V6 size: 0x114
  */
 #define ACPI_FADT_V1_SIZE       (u32) (ACPI_FADT_OFFSET (flags) + 4)
-#define ACPI_FADT_V2_SIZE       (u32) (ACPI_FADT_OFFSET (reserved4[0]) + 3)
+#define ACPI_FADT_V2_SIZE       (u32) (ACPI_FADT_OFFSET (minor_revision) + 1)
 #define ACPI_FADT_V3_SIZE       (u32) (ACPI_FADT_OFFSET (sleep_control))
 #define ACPI_FADT_V5_SIZE       (u32) (ACPI_FADT_OFFSET (hypervisor_id))
 #define ACPI_FADT_V6_SIZE       (u32) (sizeof (struct acpi_table_fadt))
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog