1 files changed, 230 insertions, 242 deletions

diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 745a6445a4f9..8ae30b7ed652 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -73,12 +73,6 @@
 #define ACPI_SIG_TCPA           "TCPA"  /* Trusted Computing Platform Alliance table */
 #define ACPI_SIG_WDRT           "WDRT"  /* Watchdog Resource Table */
 
-/* Legacy names */
-
-#define APIC_SIG                "APIC"  /* Multiple APIC Description Table */
-#define BOOT_SIG                "BOOT"  /* Simple Boot Flag Table */
-#define SBST_SIG                "SBST"  /* Smart Battery Specification Table */
-
 /*
  * All tables must be byte-packed to match the ACPI specification, since
  * the tables are provided by the system BIOS.
@@ -91,6 +85,13 @@
  * portable, so do not use any other bitfield types.
  */
 
+/* Common Sub-table header (used in MADT, SRAT, etc.) */
+
+struct acpi_subtable_header {
+        u8 type;
+        u8 length;
+};
+
 /*******************************************************************************
  *
  * ASF - Alert Standard Format table (Signature "ASF!")
@@ -98,24 +99,27 @@
  ******************************************************************************/
 
 struct acpi_table_asf {
-ACPI_TABLE_HEADER_DEF};
+        struct acpi_table_header header;        /* Common ACPI table header */
+};
 
-#define ACPI_ASF_HEADER_DEF \
-        u8                              type; \
-        u8                              reserved; \
-        u16                             length;
+/* ASF subtable header */
 
 struct acpi_asf_header {
-ACPI_ASF_HEADER_DEF};
+        u8 type;
+        u8 reserved;
+        u16 length;
+};
 
-/* Values for Type field */
+/* Values for Type field above */
 
-#define ASF_INFO                0
-#define ASF_ALERT               1
-#define ASF_CONTROL             2
-#define ASF_BOOT                3
-#define ASF_ADDRESS             4
-#define ASF_RESERVED            5
+enum acpi_asf_type {
+        ACPI_ASF_TYPE_INFO = 0,
+        ACPI_ASF_TYPE_ALERT = 1,
+        ACPI_ASF_TYPE_CONTROL = 2,
+        ACPI_ASF_TYPE_BOOT = 3,
+        ACPI_ASF_TYPE_ADDRESS = 4,
+        ACPI_ASF_TYPE_RESERVED = 5
+};
 
 /*
  * ASF subtables
@@ -124,7 +128,8 @@ ACPI_ASF_HEADER_DEF};
 /* 0: ASF Information */
 
 struct acpi_asf_info {
-        ACPI_ASF_HEADER_DEF u8 min_reset_value;
+        struct acpi_asf_header header;
+        u8 min_reset_value;
         u8 min_poll_interval;
         u16 system_id;
         u32 mfg_id;
@@ -135,7 +140,8 @@ struct acpi_asf_info {
 /* 1: ASF Alerts */
 
 struct acpi_asf_alert {
-        ACPI_ASF_HEADER_DEF u8 assert_mask;
+        struct acpi_asf_header header;
+        u8 assert_mask;
         u8 deassert_mask;
         u8 alerts;
         u8 data_length;
@@ -145,7 +151,8 @@ struct acpi_asf_alert {
 /* 2: ASF Remote Control */
 
 struct acpi_asf_remote {
-        ACPI_ASF_HEADER_DEF u8 controls;
+        struct acpi_asf_header header;
+        u8 controls;
         u8 data_length;
         u16 reserved2;
         u8 array[1];
@@ -154,7 +161,8 @@ struct acpi_asf_remote {
 /* 3: ASF RMCP Boot Options */
 
 struct acpi_asf_rmcp {
-        ACPI_ASF_HEADER_DEF u8 capabilities[7];
+        struct acpi_asf_header header;
+        u8 capabilities[7];
         u8 completion_code;
         u32 enterprise_id;
         u8 command;
@@ -166,7 +174,8 @@ struct acpi_asf_rmcp {
 /* 4: ASF Address */
 
 struct acpi_asf_address {
-        ACPI_ASF_HEADER_DEF u8 eprom_address;
+        struct acpi_asf_header header;
+        u8 eprom_address;
         u8 devices;
         u8 smbus_addresses[1];
 };
@@ -178,7 +187,8 @@ struct acpi_asf_address {
  ******************************************************************************/
 
 struct acpi_table_boot {
-        ACPI_TABLE_HEADER_DEF u8 cmos_index;    /* Index in CMOS RAM for the boot register */
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u8 cmos_index;          /* Index in CMOS RAM for the boot register */
         u8 reserved[3];
 };
 
@@ -189,7 +199,8 @@ struct acpi_table_boot {
  ******************************************************************************/
 
 struct acpi_table_cpep {
-        ACPI_TABLE_HEADER_DEF u64 reserved;
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u64 reserved;
 };
 
 /* Subtable */
@@ -197,9 +208,9 @@ struct acpi_table_cpep {
 struct acpi_cpep_polling {
         u8 type;
         u8 length;
-        u8 processor_id;        /* Processor ID */
-        u8 processor_eid;       /* Processor EID */
-        u32 polling_interval;   /* Polling interval (msec) */
+        u8 id;                  /* Processor ID */
+        u8 eid;                 /* Processor EID */
+        u32 interval;           /* Polling interval (msec) */
 };
 
 /*******************************************************************************
@@ -209,7 +220,8 @@ struct acpi_cpep_polling {
  ******************************************************************************/
 
 struct acpi_table_dbgp {
-        ACPI_TABLE_HEADER_DEF u8 interface_type;        /* 0=full 16550, 1=subset of 16550 */
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u8 type;                /* 0=full 16550, 1=subset of 16550 */
         u8 reserved[3];
         struct acpi_generic_address debug_port;
 };
@@ -220,12 +232,13 @@ struct acpi_table_dbgp {
  *
  ******************************************************************************/
 
-struct ec_boot_resources {
-        ACPI_TABLE_HEADER_DEF struct acpi_generic_address ec_control;   /* Address of EC command/status register */
-        struct acpi_generic_address ec_data;    /* Address of EC data register */
+struct acpi_table_ecdt {
+        struct acpi_table_header header;        /* Common ACPI table header */
+        struct acpi_generic_address control;    /* Address of EC command/status register */
+        struct acpi_generic_address data;       /* Address of EC data register */
         u32 uid;                /* Unique ID - must be same as the EC _UID method */
-        u8 gpe_bit;             /* The GPE for the EC */
-        u8 ec_id[1];            /* Full namepath of the EC in the ACPI namespace */
+        u8 gpe;                 /* The GPE for the EC */
+        u8 id[1];               /* Full namepath of the EC in the ACPI namespace */
 };
 
 /*******************************************************************************
@@ -234,22 +247,22 @@ struct ec_boot_resources {
  *
  ******************************************************************************/
 
-struct acpi_hpet_table {
-        ACPI_TABLE_HEADER_DEF u32 hardware_id;  /* Hardware ID of event timer block */
-        struct acpi_generic_address base_address;       /* Address of event timer block */
-        u8 hpet_number;         /* HPET sequence number */
-        u16 clock_tick;         /* Main counter min tick, periodic mode */
-        u8 attributes;
+struct acpi_table_hpet {
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u32 id;                 /* Hardware ID of event timer block */
+        struct acpi_generic_address address;    /* Address of event timer block */
+        u8 sequence;            /* HPET sequence number */
+        u16 minimum_tick;       /* Main counter min tick, periodic mode */
+        u8 flags;
 };
 
-#if 0                           /* HPET flags to be converted to macros */
-struct {                        /* Flags (8 bits) */
-        u8 page_protect:1;      /* 00:    No page protection */
-        u8 page_protect4:1;     /* 01:    4_kB page protected */
-        u8 page_protect64:1;    /* 02:    64_kB page protected */
-         u8:5;                  /* 03-07: Reserved, must be zero */
-} flags;
-#endif
+/*! Flags */
+
+#define ACPI_HPET_PAGE_PROTECT      (1) /* 00: No page protection */
+#define ACPI_HPET_PAGE_PROTECT_4    (1<<1)      /* 01: 4KB page protected */
+#define ACPI_HPET_PAGE_PROTECT_64   (1<<2)      /* 02: 64KB page protected */
+
+/*! [End] no source code translation !*/
 
 /*******************************************************************************
  *
@@ -257,148 +270,159 @@ struct {			/* Flags (8 bits) */
  *
  ******************************************************************************/
 
-struct multiple_apic_table {
-        ACPI_TABLE_HEADER_DEF u32 local_apic_address;   /* Physical address of local APIC */
-
-        /* Flags (32 bits) */
-
-        u8 PCATcompat:1;        /* 00:    System also has dual 8259s */
-         u8:7;                  /* 01-07: Reserved, must be zero */
-        u8 reserved1[3];        /* 08-31: Reserved, must be zero */
+struct acpi_table_madt {
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u32 address;            /* Physical address of local APIC */
+        u32 flags;
 };
 
-/* Values for MADT PCATCompat */
-
-#define DUAL_PIC                0
-#define MULTIPLE_APIC           1
-
-/* Common MADT Sub-table header */
-
-#define APIC_HEADER_DEF \
-        u8                              type; \
-        u8                              length;
-
-struct apic_header {
-APIC_HEADER_DEF};
-
-/* Values for Type in struct apic_header */
+/* Flags */
 
-#define APIC_PROCESSOR          0
-#define APIC_IO                 1
-#define APIC_XRUPT_OVERRIDE     2
-#define APIC_NMI                3
-#define APIC_LOCAL_NMI          4
-#define APIC_ADDRESS_OVERRIDE   5
-#define APIC_IO_SAPIC           6
-#define APIC_LOCAL_SAPIC        7
-#define APIC_XRUPT_SOURCE       8
-#define APIC_RESERVED           9       /* 9 and greater are reserved */
+#define ACPI_MADT_PCAT_COMPAT       (1) /* 00:    System also has dual 8259s */
 
-/* Flag definitions for MADT sub-tables */
+/* Values for PCATCompat flag */
 
-#define ACPI_MADT_IFLAGS /* INTI flags (16 bits) */ \
-        u8                              polarity        : 2;    /* 00-01: Polarity of APIC I/O input signals */\
-        u8                              trigger_mode    : 2;    /* 02-03: Trigger mode of APIC input signals */\
-        u8                                              : 4;    /* 04-07: Reserved, must be zero */\
-        u8                              reserved1;      /* 08-15: Reserved, must be zero */
+#define ACPI_MADT_DUAL_PIC          0
+#define ACPI_MADT_MULTIPLE_APIC     1
 
-#define ACPI_MADT_LFLAGS /* Local Sapic flags (32 bits) */ \
-        u8                              processor_enabled: 1;   /* 00:    Processor is usable if set */\
-        u8                                              : 7;    /* 01-07: Reserved, must be zero */\
-        u8                              reserved2[3];   /* 08-31: Reserved, must be zero */
+/* Values for subtable type in struct acpi_subtable_header */
 
-/* Values for MPS INTI flags */
-
-#define POLARITY_CONFORMS       0
-#define POLARITY_ACTIVE_HIGH    1
-#define POLARITY_RESERVED       2
-#define POLARITY_ACTIVE_LOW     3
-
-#define TRIGGER_CONFORMS        0
-#define TRIGGER_EDGE            1
-#define TRIGGER_RESERVED        2
-#define TRIGGER_LEVEL           3
+enum acpi_madt_type {
+        ACPI_MADT_TYPE_LOCAL_APIC = 0,
+        ACPI_MADT_TYPE_IO_APIC = 1,
+        ACPI_MADT_TYPE_INTERRUPT_OVERRIDE = 2,
+        ACPI_MADT_TYPE_NMI_SOURCE = 3,
+        ACPI_MADT_TYPE_LOCAL_APIC_NMI = 4,
+        ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE = 5,
+        ACPI_MADT_TYPE_IO_SAPIC = 6,
+        ACPI_MADT_TYPE_LOCAL_SAPIC = 7,
+        ACPI_MADT_TYPE_INTERRUPT_SOURCE = 8,
+        ACPI_MADT_TYPE_RESERVED = 9     /* 9 and greater are reserved */
+};
 
 /*
- * MADT Sub-tables, correspond to Type in struct apic_header
+ * MADT Sub-tables, correspond to Type in struct acpi_subtable_header
  */
 
-/* 0: processor APIC */
+/* 0: Processor Local APIC */
 
-struct madt_processor_apic {
-        APIC_HEADER_DEF u8 processor_id;        /* ACPI processor id */
-        u8 local_apic_id;       /* Processor's local APIC id */
- ACPI_MADT_LFLAGS};
+struct acpi_madt_local_apic {
+        struct acpi_subtable_header header;
+        u8 processor_id;        /* ACPI processor id */
+        u8 id;                  /* Processor's local APIC id */
+        u32 lapic_flags;
+};
 
 /* 1: IO APIC */
 
-struct madt_io_apic {
-        APIC_HEADER_DEF u8 io_apic_id;  /* I/O APIC ID */
+struct acpi_madt_io_apic {
+        struct acpi_subtable_header header;
+        u8 id;                  /* I/O APIC ID */
         u8 reserved;            /* Reserved - must be zero */
         u32 address;            /* APIC physical address */
-        u32 interrupt;          /* Global system interrupt where INTI lines start */
+        u32 global_irq_base;    /* Global system interrupt where INTI lines start */
 };
 
 /* 2: Interrupt Override */
 
-struct madt_interrupt_override {
-        APIC_HEADER_DEF u8 bus; /* 0 - ISA */
-        u8 source;              /* Interrupt source (IRQ) */
-        u32 interrupt;          /* Global system interrupt */
- ACPI_MADT_IFLAGS};
+struct acpi_madt_interrupt_override {
+        struct acpi_subtable_header header;
+        u8 bus;                 /* 0 - ISA */
+        u8 source_irq;          /* Interrupt source (IRQ) */
+        u32 global_irq;         /* Global system interrupt */
+        u16 inti_flags;
+};
 
-/* 3: NMI Sources */
+/* 3: NMI Source */
 
-struct madt_nmi_source {
-        APIC_HEADER_DEF ACPI_MADT_IFLAGS u32 interrupt; /* Global system interrupt */
+struct acpi_madt_nmi_source {
+        struct acpi_subtable_header header;
+        u16 inti_flags;
+        u32 global_irq;         /* Global system interrupt */
 };
 
 /* 4: Local APIC NMI */
 
-struct madt_local_apic_nmi {
-        APIC_HEADER_DEF u8 processor_id;        /* ACPI processor id */
-        ACPI_MADT_IFLAGS u8 lint;       /* LINTn to which NMI is connected */
+struct acpi_madt_local_apic_nmi {
+        struct acpi_subtable_header header;
+        u8 processor_id;        /* ACPI processor id */
+        u16 inti_flags;
+        u8 lint;                /* LINTn to which NMI is connected */
 };
 
 /* 5: Address Override */
 
-struct madt_address_override {
-        APIC_HEADER_DEF u16 reserved;   /* Reserved, must be zero */
+struct acpi_madt_local_apic_override {
+        struct acpi_subtable_header header;
+        u16 reserved;           /* Reserved, must be zero */
         u64 address;            /* APIC physical address */
 };
 
 /* 6: I/O Sapic */
 
-struct madt_io_sapic {
-        APIC_HEADER_DEF u8 io_sapic_id; /* I/O SAPIC ID */
+struct acpi_madt_io_sapic {
+        struct acpi_subtable_header header;
+        u8 id;                  /* I/O SAPIC ID */
         u8 reserved;            /* Reserved, must be zero */
-        u32 interrupt_base;     /* Glocal interrupt for SAPIC start */
+        u32 global_irq_base;    /* Global interrupt for SAPIC start */
         u64 address;            /* SAPIC physical address */
 };
 
 /* 7: Local Sapic */
 
-struct madt_local_sapic {
-        APIC_HEADER_DEF u8 processor_id;        /* ACPI processor id */
-        u8 local_sapic_id;      /* SAPIC ID */
-        u8 local_sapic_eid;     /* SAPIC EID */
+struct acpi_madt_local_sapic {
+        struct acpi_subtable_header header;
+        u8 processor_id;        /* ACPI processor id */
+        u8 id;                  /* SAPIC ID */
+        u8 eid;                 /* SAPIC EID */
         u8 reserved[3];         /* Reserved, must be zero */
-         ACPI_MADT_LFLAGS u32 processor_uID;    /* Numeric UID - ACPI 3.0 */
-        char processor_uIDstring[1];    /* String UID  - ACPI 3.0 */
+        u32 lapic_flags;
+        u32 uid;                /* Numeric UID - ACPI 3.0 */
+        char uid_string[1];     /* String UID  - ACPI 3.0 */
 };
 
 /* 8: Platform Interrupt Source */
 
-struct madt_interrupt_source {
-        APIC_HEADER_DEF ACPI_MADT_IFLAGS u8 interrupt_type;     /* 1=PMI, 2=INIT, 3=corrected */
-        u8 processor_id;        /* Processor ID */
-        u8 processor_eid;       /* Processor EID */
+struct acpi_madt_interrupt_source {
+        struct acpi_subtable_header header;
+        u16 inti_flags;
+        u8 type;                /* 1=PMI, 2=INIT, 3=corrected */
+        u8 id;                  /* Processor ID */
+        u8 eid;                 /* Processor EID */
         u8 io_sapic_vector;     /* Vector value for PMI interrupts */
-        u32 interrupt;          /* Global system interrupt */
+        u32 global_irq;         /* Global system interrupt */
         u32 flags;              /* Interrupt Source Flags */
 };
 
-#ifdef DUPLICATE_DEFINITION_WITH_LINUX_ACPI_H
+/* Flags field above */
+
+#define ACPI_MADT_CPEI_OVERRIDE     (1)
+
+/*
+ * Common flags fields for MADT subtables
+ */
+
+/* MADT Local APIC flags (lapic_flags) */
+
+#define ACPI_MADT_ENABLED           (1) /* 00: Processor is usable if set */
+
+/* MADT MPS INTI flags (inti_flags) */
+
+#define ACPI_MADT_POLARITY_MASK     (3) /* 00-01: Polarity of APIC I/O input signals */
+#define ACPI_MADT_TRIGGER_MASK      (3<<2)      /* 02-03: Trigger mode of APIC input signals */
+
+/* Values for MPS INTI flags */
+
+#define ACPI_MADT_POLARITY_CONFORMS       0
+#define ACPI_MADT_POLARITY_ACTIVE_HIGH    1
+#define ACPI_MADT_POLARITY_RESERVED       2
+#define ACPI_MADT_POLARITY_ACTIVE_LOW     3
+
+#define ACPI_MADT_TRIGGER_CONFORMS        (0)
+#define ACPI_MADT_TRIGGER_EDGE            (1<<2)
+#define ACPI_MADT_TRIGGER_RESERVED        (2<<2)
+#define ACPI_MADT_TRIGGER_LEVEL           (3<<2)
+
 /*******************************************************************************
  *
  * MCFG - PCI Memory Mapped Configuration table and sub-table
@@ -406,17 +430,19 @@ struct madt_interrupt_source {
  ******************************************************************************/
 
 struct acpi_table_mcfg {
-        ACPI_TABLE_HEADER_DEF u8 reserved[8];
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u8 reserved[8];
 };
 
+/* Subtable */
+
 struct acpi_mcfg_allocation {
-        u64 base_address;       /* Base address, processor-relative */
+        u64 address;            /* Base address, processor-relative */
         u16 pci_segment;        /* PCI segment group number */
         u8 start_bus_number;    /* Starting PCI Bus number */
         u8 end_bus_number;      /* Final PCI Bus number */
         u32 reserved;
 };
-#endif
 
 /*******************************************************************************
  *
@@ -424,8 +450,9 @@ struct acpi_mcfg_allocation {
  *
  ******************************************************************************/
 
-struct smart_battery_table {
-        ACPI_TABLE_HEADER_DEF u32 warning_level;
+struct acpi_table_sbst {
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u32 warning_level;
         u32 low_level;
         u32 critical_level;
 };
@@ -436,9 +463,10 @@ struct smart_battery_table {
  *
  ******************************************************************************/
 
-struct system_locality_info {
-        ACPI_TABLE_HEADER_DEF u64 locality_count;
-        u8 entry[1][1];
+struct acpi_table_slit {
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u64 locality_count;
+        u8 entry[1];            /* Real size = localities^2 */
 };
 
 /*******************************************************************************
@@ -448,7 +476,8 @@ struct system_locality_info {
  ******************************************************************************/
 
 struct acpi_table_spcr {
-        ACPI_TABLE_HEADER_DEF u8 interface_type;        /* 0=full 16550, 1=subset of 16550 */
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u8 interface_type;      /* 0=full 16550, 1=subset of 16550 */
         u8 reserved[3];
         struct acpi_generic_address serial_port;
         u8 interrupt_type;
@@ -459,7 +488,7 @@ struct acpi_table_spcr {
         u8 stop_bits;
         u8 flow_control;
         u8 terminal_type;
-        u8 reserved2;
+        u8 reserved1;
         u16 pci_device_id;
         u16 pci_vendor_id;
         u8 pci_bus;
@@ -467,7 +496,7 @@ struct acpi_table_spcr {
         u8 pci_function;
         u32 pci_flags;
         u8 pci_segment;
-        u32 reserved3;
+        u32 reserved2;
 };
 
 /*******************************************************************************
@@ -477,12 +506,13 @@ struct acpi_table_spcr {
  ******************************************************************************/
 
 struct acpi_table_spmi {
-        ACPI_TABLE_HEADER_DEF u8 reserved;
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u8 reserved;
         u8 interface_type;
         u16 spec_revision;      /* Version of IPMI */
         u8 interrupt_type;
         u8 gpe_number;          /* GPE assigned */
-        u8 reserved2;
+        u8 reserved1;
         u8 pci_device_flag;
         u32 interrupt;
         struct acpi_generic_address ipmi_register;
@@ -498,56 +528,61 @@ struct acpi_table_spmi {
  *
  ******************************************************************************/
 
-struct system_resource_affinity {
-        ACPI_TABLE_HEADER_DEF u32 reserved1;    /* Must be value '1' */
-        u64 reserved2;          /* Reserved, must be zero */
+struct acpi_table_srat {
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u32 table_revision;     /* Must be value '1' */
+        u64 reserved;           /* Reserved, must be zero */
 };
 
-/* SRAT common sub-table header */
-
-#define SRAT_SUBTABLE_HEADER \
-        u8                              type; \
-        u8                              length;
-
-/* Values for Type above */
+/* Values for subtable type in struct acpi_subtable_header */
 
-#define SRAT_CPU_AFFINITY       0
-#define SRAT_MEMORY_AFFINITY    1
-#define SRAT_RESERVED           2
+enum acpi_srat_type {
+        ACPI_SRAT_TYPE_CPU_AFFINITY = 0,
+        ACPI_SRAT_TYPE_MEMORY_AFFINITY = 1,
+        ACPI_SRAT_TYPE_RESERVED = 2
+};
 
 /* SRAT sub-tables */
 
-struct static_resource_alloc {
-        SRAT_SUBTABLE_HEADER u8 proximity_domain_lo;
+struct acpi_srat_cpu_affinity {
+        struct acpi_subtable_header header;
+        u8 proximity_domain_lo;
         u8 apic_id;
-
-        /* Flags (32 bits) */
-
-        u8 enabled:1;           /* 00:    Use affinity structure */
-         u8:7;                  /* 01-07: Reserved, must be zero */
-        u8 reserved3[3];        /* 08-31: Reserved, must be zero */
-
+        u32 flags;
         u8 local_sapic_eid;
         u8 proximity_domain_hi[3];
-        u32 reserved4;          /* Reserved, must be zero */
+        u32 reserved;           /* Reserved, must be zero */
 };
 
-struct memory_affinity {
-        SRAT_SUBTABLE_HEADER u32 proximity_domain;
-        u16 reserved3;
+/* Flags */
+
+#define ACPI_SRAT_CPU_ENABLED       (1) /* 00: Use affinity structure */
+
+struct acpi_srat_mem_affinity {
+        struct acpi_subtable_header header;
+        u32 proximity_domain;
+        u16 reserved;           /* Reserved, must be zero */
         u64 base_address;
-        u64 address_length;
-        u32 reserved4;
+        u64 length;
+        u32 memory_type;        /* See acpi_address_range_id */
+        u32 flags;
+        u64 reserved1;          /* Reserved, must be zero */
+};
+
+/* Flags */
 
-        /* Flags (32 bits) */
+#define ACPI_SRAT_MEM_ENABLED       (1) /* 00: Use affinity structure */
+#define ACPI_SRAT_MEM_HOT_PLUGGABLE (1<<1)      /* 01: Memory region is hot pluggable */
+#define ACPI_SRAT_MEM_NON_VOLATILE  (1<<2)      /* 02: Memory region is non-volatile */
 
-        u8 enabled:1;           /* 00:    Use affinity structure */
-        u8 hot_pluggable:1;     /* 01:    Memory region is hot pluggable */
-        u8 non_volatile:1;      /* 02:    Memory is non-volatile */
-         u8:5;                  /* 03-07: Reserved, must be zero */
-        u8 reserved5[3];        /* 08-31: Reserved, must be zero */
+/* Memory types */
 
-        u64 reserved6;          /* Reserved, must be zero */
+enum acpi_address_range_id {
+        ACPI_ADDRESS_RANGE_MEMORY = 1,
+        ACPI_ADDRESS_RANGE_RESERVED = 2,
+        ACPI_ADDRESS_RANGE_ACPI = 3,
+        ACPI_ADDRESS_RANGE_NVS = 4,
+        ACPI_ADDRESS_RANGE_COUNT = 5
 };
 
 /*******************************************************************************
@@ -557,7 +592,8 @@ struct memory_affinity {
  ******************************************************************************/
 
 struct acpi_table_tcpa {
-        ACPI_TABLE_HEADER_DEF u16 reserved;
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u16 reserved;
         u32 max_log_length;     /* Maximum length for the event log area */
         u64 log_address;        /* Address of the event log area */
 };
@@ -569,7 +605,8 @@ struct acpi_table_tcpa {
  ******************************************************************************/
 
 struct acpi_table_wdrt {
-        ACPI_TABLE_HEADER_DEF u32 header_length;        /* Watchdog Header Length */
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u32 header_length;      /* Watchdog Header Length */
         u8 pci_segment;         /* PCI Segment number */
         u8 pci_bus;             /* PCI Bus number */
         u8 pci_device;          /* PCI Device number */
@@ -582,58 +619,9 @@ struct acpi_table_wdrt {
         u32 entries;            /* Number of watchdog entries that follow */
 };
 
-#if 0                           /* Flags, will be converted to macros */
-u8 enabled:1;                   /* 00:    Timer enabled */
-u8:6;                           /* 01-06: Reserved */
-u8 sleep_stop:1;                /* 07:    Timer stopped in sleep state */
-#endif
-
-/* Macros used to generate offsets to specific table fields */
-
-#define ACPI_ASF0_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_asf_info,f)
-#define ACPI_ASF1_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_asf_alert,f)
-#define ACPI_ASF2_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_asf_remote,f)
-#define ACPI_ASF3_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_asf_rmcp,f)
-#define ACPI_ASF4_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_asf_address,f)
-#define ACPI_BOOT_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_table_boot,f)
-#define ACPI_CPEP_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_table_cpep,f)
-#define ACPI_CPEP0_OFFSET(f)            (u8) ACPI_OFFSET (struct acpi_cpep_polling,f)
-#define ACPI_DBGP_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_table_dbgp,f)
-#define ACPI_ECDT_OFFSET(f)             (u8) ACPI_OFFSET (struct ec_boot_resources,f)
-#define ACPI_HPET_OFFSET(f)             (u8) ACPI_OFFSET (struct hpet_table,f)
-#define ACPI_MADT_OFFSET(f)             (u8) ACPI_OFFSET (struct multiple_apic_table,f)
-#define ACPI_MADT0_OFFSET(f)            (u8) ACPI_OFFSET (struct madt_processor_apic,f)
-#define ACPI_MADT1_OFFSET(f)            (u8) ACPI_OFFSET (struct madt_io_apic,f)
-#define ACPI_MADT2_OFFSET(f)            (u8) ACPI_OFFSET (struct madt_interrupt_override,f)
-#define ACPI_MADT3_OFFSET(f)            (u8) ACPI_OFFSET (struct madt_nmi_source,f)
-#define ACPI_MADT4_OFFSET(f)            (u8) ACPI_OFFSET (struct madt_local_apic_nmi,f)
-#define ACPI_MADT5_OFFSET(f)            (u8) ACPI_OFFSET (struct madt_address_override,f)
-#define ACPI_MADT6_OFFSET(f)            (u8) ACPI_OFFSET (struct madt_io_sapic,f)
-#define ACPI_MADT7_OFFSET(f)            (u8) ACPI_OFFSET (struct madt_local_sapic,f)
-#define ACPI_MADT8_OFFSET(f)            (u8) ACPI_OFFSET (struct madt_interrupt_source,f)
-#define ACPI_MADTH_OFFSET(f)            (u8) ACPI_OFFSET (struct apic_header,f)
-#define ACPI_MCFG_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_table_mcfg,f)
-#define ACPI_MCFG0_OFFSET(f)            (u8) ACPI_OFFSET (struct acpi_mcfg_allocation,f)
-#define ACPI_SBST_OFFSET(f)             (u8) ACPI_OFFSET (struct smart_battery_table,f)
-#define ACPI_SLIT_OFFSET(f)             (u8) ACPI_OFFSET (struct system_locality_info,f)
-#define ACPI_SPCR_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_table_spcr,f)
-#define ACPI_SPMI_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_table_spmi,f)
-#define ACPI_SRAT_OFFSET(f)             (u8) ACPI_OFFSET (struct system_resource_affinity,f)
-#define ACPI_SRAT0_OFFSET(f)            (u8) ACPI_OFFSET (struct static_resource_alloc,f)
-#define ACPI_SRAT1_OFFSET(f)            (u8) ACPI_OFFSET (struct memory_affinity,f)
-#define ACPI_TCPA_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_table_tcpa,f)
-#define ACPI_WDRT_OFFSET(f)             (u8) ACPI_OFFSET (struct acpi_table_wdrt,f)
-
-#define ACPI_HPET_FLAG_OFFSET(f,o)      ACPI_FLAG_OFFSET (struct hpet_table,f,o)
-#define ACPI_SRAT0_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (struct static_resource_alloc,f,o)
-#define ACPI_SRAT1_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (struct memory_affinity,f,o)
-#define ACPI_MADT_FLAG_OFFSET(f,o)      ACPI_FLAG_OFFSET (struct multiple_apic_table,f,o)
-#define ACPI_MADT0_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (struct madt_processor_apic,f,o)
-#define ACPI_MADT2_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (struct madt_interrupt_override,f,o)
-#define ACPI_MADT3_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (struct madt_nmi_source,f,o)
-#define ACPI_MADT4_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (struct madt_local_apic_nmi,f,o)
-#define ACPI_MADT7_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (struct madt_local_sapic,f,o)
-#define ACPI_MADT8_FLAG_OFFSET(f,o)     ACPI_FLAG_OFFSET (struct madt_interrupt_source,f,o)
+/* Flags */
+
+#define ACPI_WDRT_TIMER_ENABLED     (1) /* 00: Timer enabled */
 
 /* Reset to default packing */