Merge branch 'acpica'

* acpica:
  ACPICA: Update version to 20140724.
  ACPICA: ACPI 5.1: Update for PCCT table changes.
  ACPICA/ARM: ACPI 5.1: Update for GTDT table changes.
  ACPICA/ARM: ACPI 5.1: Update for MADT changes.
  ACPICA/ARM: ACPI 5.1: Update for FADT changes.
  ACPICA: ACPI 5.1: Support for the _CCA predifined name.
  ACPICA: ACPI 5.1: New notify value for System Affinity Update.
  ACPICA: ACPI 5.1: Support for the _DSD predefined name.
  ACPICA: Debug object: Add current value of Timer() to debug line prefix.
  ACPICA: acpihelp: Add UUID support, restructure some existing files.
  ACPICA: Utilities: Fix local printf issue.
  ACPICA: Tables: Update for DMAR table changes.
  ACPICA: Remove some extraneous printf arguments.
  ACPICA: Update for comments/formatting. No functional changes.
  ACPICA: Disassembler: Add support for the ToUUID opererator (macro).
  ACPICA: Remove a redundant cast to acpi_size for ACPI_OFFSET() macro.
  ACPICA: Work around an ancient GCC bug.

8 files changed, 182 insertions, 32 deletions

diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index 932a60d6ed82..5a0a3e5daf85 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -219,6 +219,24 @@
 
 /******************************************************************************
  *
+ * Miscellaneous constants
+ *
+ *****************************************************************************/
+
+/* UUID constants */
+
+#define UUID_BUFFER_LENGTH          16  /* Length of UUID in memory */
+#define UUID_STRING_LENGTH          36  /* Total length of a UUID string */
+
+/* Positions for required hyphens (dashes) in UUID strings */
+
+#define UUID_HYPHEN1_OFFSET         8
+#define UUID_HYPHEN2_OFFSET         13
+#define UUID_HYPHEN3_OFFSET         18
+#define UUID_HYPHEN4_OFFSET         23
+
+/******************************************************************************
+ *
  * ACPI AML Debugger
  *
  *****************************************************************************/
diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h
index 3dd6e838dc30..c728113374f5 100644
--- a/include/acpi/acnames.h
+++ b/include/acpi/acnames.h
@@ -55,6 +55,7 @@
 #define METHOD_NAME__HID        "_HID"
 #define METHOD_NAME__INI        "_INI"
 #define METHOD_NAME__PLD        "_PLD"
+#define METHOD_NAME__DSD        "_DSD"
 #define METHOD_NAME__PRS        "_PRS"
 #define METHOD_NAME__PRT        "_PRT"
 #define METHOD_NAME__PRW        "_PRW"
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index c3f38bc459e1..b7c89d47efbe 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -46,7 +46,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20140627
+#define ACPI_CA_VERSION                 0x20140724
 
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 1cc7ef13c01a..bee19d8170c5 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -270,7 +270,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 */
@@ -285,7 +286,7 @@ struct acpi_table_fadt {
         struct acpi_generic_address sleep_status;       /* 64-bit Sleep Status register (ACPI 5.0) */
 };
 
-/* Masks for FADT Boot Architecture Flags (boot_flags) [Vx]=Introduced in this FADT revision */
+/* Masks for FADT IA-PC Boot Architecture Flags (boot_flags) [Vx]=Introduced in this FADT revision */
 
 #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 */
@@ -296,6 +297,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 */
@@ -399,7 +405,7 @@ struct acpi_table_desc {
  *     FADT V5  size: 0x10C
  */
 #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) (sizeof (struct acpi_table_fadt))
 
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 9613e8e97960..7626bfeac2cb 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -671,7 +671,9 @@ enum acpi_madt_type {
         ACPI_MADT_TYPE_LOCAL_X2APIC_NMI = 10,
         ACPI_MADT_TYPE_GENERIC_INTERRUPT = 11,
         ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR = 12,
-        ACPI_MADT_TYPE_RESERVED = 13    /* 13 and greater are reserved */
+        ACPI_MADT_TYPE_GENERIC_MSI_FRAME = 13,
+        ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR = 14,
+        ACPI_MADT_TYPE_RESERVED = 15    /* 15 and greater are reserved */
 };
 
 /*
@@ -797,15 +799,26 @@ struct acpi_madt_local_x2apic_nmi {
 struct acpi_madt_generic_interrupt {
         struct acpi_subtable_header header;
         u16 reserved;           /* reserved - must be zero */
-        u32 gic_id;
+        u32 cpu_interface_number;
         u32 uid;
         u32 flags;
         u32 parking_version;
         u32 performance_interrupt;
         u64 parked_address;
         u64 base_address;
+        u64 gicv_base_address;
+        u64 gich_base_address;
+        u32 vgic_interrupt;
+        u64 gicr_base_address;
+        u64 arm_mpidr;
 };
 
+/* Masks for Flags field above */
+
+/* ACPI_MADT_ENABLED                    (1)      Processor is usable if set */
+#define ACPI_MADT_PERFORMANCE_IRQ_MODE  (1<<1)  /* 01: Performance Interrupt Mode */
+#define ACPI_MADT_VGIC_IRQ_MODE         (1<<2)  /* 02: VGIC Maintenance Interrupt mode */
+
 /* 12: Generic Distributor (ACPI 5.0) */
 
 struct acpi_madt_generic_distributor {
@@ -817,11 +830,36 @@ struct acpi_madt_generic_distributor {
         u32 reserved2;          /* reserved - must be zero */
 };
 
+/* 13: Generic MSI Frame (ACPI 5.1) */
+
+struct acpi_madt_generic_msi_frame {
+        struct acpi_subtable_header header;
+        u16 reserved;           /* reserved - must be zero */
+        u32 msi_frame_id;
+        u64 base_address;
+        u32 flags;
+        u16 spi_count;
+        u16 spi_base;
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_MADT_OVERRIDE_SPI_VALUES   (1)
+
+/* 14: Generic Redistributor (ACPI 5.1) */
+
+struct acpi_madt_generic_redistributor {
+        struct acpi_subtable_header header;
+        u16 reserved;           /* reserved - must be zero */
+        u64 base_address;
+        u32 length;
+};
+
 /*
  * Common flags fields for MADT subtables
  */
 
-/* MADT Local APIC flags (lapic_flags) and GIC flags */
+/* MADT Local APIC flags */
 
 #define ACPI_MADT_ENABLED           (1) /* 00: Processor is usable if set */
 
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 21314d37cb07..ecff62405f17 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -396,7 +396,7 @@ struct acpi_table_dbgp {
  *        Version 1
  *
  * Conforms to "Intel Virtualization Technology for Directed I/O",
- * Version 1.2, Sept. 2008
+ * Version 2.2, Sept. 2013
  *
  ******************************************************************************/
 
@@ -423,9 +423,9 @@ struct acpi_dmar_header {
 enum acpi_dmar_type {
         ACPI_DMAR_TYPE_HARDWARE_UNIT = 0,
         ACPI_DMAR_TYPE_RESERVED_MEMORY = 1,
-        ACPI_DMAR_TYPE_ATSR = 2,
-        ACPI_DMAR_HARDWARE_AFFINITY = 3,
-        ACPI_DMAR_TYPE_ANDD = 4,
+        ACPI_DMAR_TYPE_ROOT_ATS = 2,
+        ACPI_DMAR_TYPE_HARDWARE_AFFINITY = 3,
+        ACPI_DMAR_TYPE_NAMESPACE = 4,
         ACPI_DMAR_TYPE_RESERVED = 5     /* 5 and greater are reserved */
 };
 
@@ -439,7 +439,7 @@ struct acpi_dmar_device_scope {
         u8 bus;
 };
 
-/* Values for entry_type in struct acpi_dmar_device_scope */
+/* Values for entry_type in struct acpi_dmar_device_scope - device types */
 
 enum acpi_dmar_scope_type {
         ACPI_DMAR_SCOPE_TYPE_NOT_USED = 0,
@@ -447,7 +447,7 @@ enum acpi_dmar_scope_type {
         ACPI_DMAR_SCOPE_TYPE_BRIDGE = 2,
         ACPI_DMAR_SCOPE_TYPE_IOAPIC = 3,
         ACPI_DMAR_SCOPE_TYPE_HPET = 4,
-        ACPI_DMAR_SCOPE_TYPE_ACPI = 5,
+        ACPI_DMAR_SCOPE_TYPE_NAMESPACE = 5,
         ACPI_DMAR_SCOPE_TYPE_RESERVED = 6       /* 6 and greater are reserved */
 };
 
@@ -516,7 +516,7 @@ struct acpi_dmar_andd {
         struct acpi_dmar_header header;
         u8 reserved[3];
         u8 device_number;
-        char object_name[1];
+        char device_name[1];
 };
 
 /*******************************************************************************
diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h
index c2295cc4a5c0..787bcc814463 100644
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
@@ -241,33 +241,96 @@ struct acpi_s3pt_suspend {
 
 /*******************************************************************************
  *
- * GTDT - Generic Timer Description Table (ACPI 5.0)
- *        Version 1
+ * GTDT - Generic Timer Description Table (ACPI 5.1)
+ *        Version 2
  *
  ******************************************************************************/
 
 struct acpi_table_gtdt {
         struct acpi_table_header header;        /* Common ACPI table header */
-        u64 address;
-        u32 flags;
-        u32 secure_pl1_interrupt;
-        u32 secure_pl1_flags;
-        u32 non_secure_pl1_interrupt;
-        u32 non_secure_pl1_flags;
+        u64 counter_block_addresss;
+        u32 reserved;
+        u32 secure_el1_interrupt;
+        u32 secure_el1_flags;
+        u32 non_secure_el1_interrupt;
+        u32 non_secure_el1_flags;
         u32 virtual_timer_interrupt;
         u32 virtual_timer_flags;
-        u32 non_secure_pl2_interrupt;
-        u32 non_secure_pl2_flags;
+        u32 non_secure_el2_interrupt;
+        u32 non_secure_el2_flags;
+        u64 counter_read_block_address;
+        u32 platform_timer_count;
+        u32 platform_timer_offset;
 };
 
-/* Values for Flags field above */
+/* Flag Definitions: Timer Block Physical Timers and Virtual timers */
+
+#define ACPI_GTDT_INTERRUPT_MODE        (1)
+#define ACPI_GTDT_INTERRUPT_POLARITY    (1<<1)
+#define ACPI_GTDT_ALWAYS_ON             (1<<2)
+
+/* Common GTDT subtable header */
+
+struct acpi_gtdt_header {
+        u8 type;
+        u16 length;
+};
 
-#define ACPI_GTDT_MAPPED_BLOCK_PRESENT      1
+/* Values for GTDT subtable type above */
 
-/* Values for all "TimerFlags" fields above */
+enum acpi_gtdt_type {
+        ACPI_GTDT_TYPE_TIMER_BLOCK = 0,
+        ACPI_GTDT_TYPE_WATCHDOG = 1,
+        ACPI_GTDT_TYPE_RESERVED = 2     /* 2 and greater are reserved */
+};
+
+/* GTDT Subtables, correspond to Type in struct acpi_gtdt_header */
+
+/* 0: Generic Timer Block */
+
+struct acpi_gtdt_timer_block {
+        struct acpi_gtdt_header header;
+        u8 reserved;
+        u64 block_address;
+        u32 timer_count;
+        u32 timer_offset;
+};
+
+/* Timer Sub-Structure, one per timer */
+
+struct acpi_gtdt_timer_entry {
+        u8 frame_number;
+        u8 reserved[3];
+        u64 base_address;
+        u64 el0_base_address;
+        u32 timer_interrupt;
+        u32 timer_flags;
+        u32 virtual_timer_interrupt;
+        u32 virtual_timer_flags;
+        u32 common_flags;
+};
 
-#define ACPI_GTDT_INTERRUPT_MODE            1
-#define ACPI_GTDT_INTERRUPT_POLARITY        2
+/* Flag Definitions: common_flags above */
+
+#define ACPI_GTDT_GT_IS_SECURE_TIMER    (1)
+#define ACPI_GTDT_GT_ALWAYS_ON          (1<<1)
+
+/* 1: SBSA Generic Watchdog Structure */
+
+struct acpi_gtdt_watchdog {
+        struct acpi_gtdt_header header;
+        u8 reserved;
+        u64 refresh_frame_address;
+        u64 control_frame_address;
+        u32 timer_interrupt;
+        u32 timer_flags;
+};
+
+/* Flag Definitions: timer_flags above */
+
+#define ACPI_GTDT_WATCHDOG_IRQ_MODE         (1)
+#define ACPI_GTDT_WATCHDOG_IRQ_POLARITY     (1<<1)
+#define ACPI_GTDT_WATCHDOG_SECURE           (1<<2)
 
 /*******************************************************************************
  *
@@ -385,7 +448,8 @@ struct acpi_table_pcct {
 
 enum acpi_pcct_type {
         ACPI_PCCT_TYPE_GENERIC_SUBSPACE = 0,
-        ACPI_PCCT_TYPE_RESERVED = 1     /* 1 and greater are reserved */
+        ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE = 1,
+        ACPI_PCCT_TYPE_RESERVED = 2     /* 2 and greater are reserved */
 };
 
 /*
@@ -407,6 +471,28 @@ struct acpi_pcct_subspace {
         u16 min_turnaround_time;
 };
 
+/* 1: HW-reduced Communications Subspace (ACPI 5.1) */
+
+struct acpi_pcct_hw_reduced {
+        struct acpi_subtable_header header;
+        u32 doorbell_interrupt;
+        u8 flags;
+        u8 reserved;
+        u64 base_address;
+        u64 length;
+        struct acpi_generic_address doorbell_register;
+        u64 preserve_mask;
+        u64 write_mask;
+        u32 latency;
+        u32 max_access_rate;
+        u16 min_turnaround_time;
+};
+
+/* Values for doorbell flags above */
+
+#define ACPI_PCCT_INTERRUPT_POLARITY    (1)
+#define ACPI_PCCT_INTERRUPT_MODE        (1<<1)
+
 /*
  * PCC memory structures (not part of the ACPI table)
  */
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 608a04019372..ac03ec81d342 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -517,7 +517,7 @@ typedef u64 acpi_integer;
 
 #define ACPI_TO_POINTER(i)              ACPI_ADD_PTR (void, (void *) NULL,(acpi_size) i)
 #define ACPI_TO_INTEGER(p)              ACPI_PTR_DIFF (p, (void *) NULL)
-#define ACPI_OFFSET(d, f)               (acpi_size) ACPI_PTR_DIFF (&(((d *)0)->f), (void *) NULL)
+#define ACPI_OFFSET(d, f)               ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) NULL)
 #define ACPI_PHYSADDR_TO_PTR(i)         ACPI_TO_POINTER(i)
 #define ACPI_PTR_TO_PHYSADDR(i)         ACPI_TO_INTEGER(i)
 
@@ -612,8 +612,9 @@ typedef u64 acpi_integer;
 #define ACPI_NOTIFY_RESERVED            (u8) 0x0A
 #define ACPI_NOTIFY_LOCALITY_UPDATE     (u8) 0x0B
 #define ACPI_NOTIFY_SHUTDOWN_REQUEST    (u8) 0x0C
+#define ACPI_NOTIFY_AFFINITY_UPDATE     (u8) 0x0D
 
-#define ACPI_NOTIFY_MAX                 0x0C
+#define ACPI_NOTIFY_MAX                 0x0D
 
 /*
  * Types associated with ACPI names and objects. The first group of