[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH 2/4] ACPI: update table interface headers



... to what is being used on Linux 3.1 (and 3.2-rc).

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>

--- a/xen/drivers/acpi/numa.c
+++ b/xen/drivers/acpi/numa.c
@@ -78,9 +78,11 @@ void __init acpi_table_print_srat_entry(
                        if (srat_rev < 2)
                                proximity_domain &= 0xff;
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                         "SRAT Memory (0x%016"PRIx64" length 
0x%016"PRIx64" type 0x%x) in proximity domain %d %s%s\n",
+                                         "SRAT Memory (%#016"PRIx64
+                                         " length %#016"PRIx64")"
+                                         " in proximity domain %d %s%s\n",
                                          p->base_address, p->length,
-                                         p->memory_type, proximity_domain,
+                                         proximity_domain,
                                          p->flags & ACPI_SRAT_MEM_ENABLED
                                          ? "enabled" : "disabled",
                                          p->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE
--- a/xen/include/acpi/actbl.h
+++ b/xen/include/acpi/actbl.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,9 +44,23 @@
 #ifndef __ACTBL_H__
 #define __ACTBL_H__
 
+/*******************************************************************************
+ *
+ * Fundamental ACPI tables
+ *
+ * This file contains definitions for the ACPI tables that are directly 
consumed
+ * by ACPICA. All other tables are consumed by the OS-dependent ACPI-related
+ * device drivers and other OS support code.
+ *
+ * The RSDP and FACS do not use the common ACPI table header. All other ACPI
+ * tables use the header.
+ *
+ 
******************************************************************************/
+
 /*
- * Values for description table header signatures. Useful because they make
- * it more difficult to inadvertently type in the wrong signature.
+ * Values for description table header signatures for tables defined in this
+ * file. Useful because they make it more difficult to inadvertently type in
+ * the wrong signature.
  */
 #define ACPI_SIG_DSDT           "DSDT" /* Differentiated System Description 
Table */
 #define ACPI_SIG_FADT           "FACP" /* Fixed ACPI Description Table */
@@ -65,11 +79,6 @@
 #pragma pack(1)
 
 /*
- * These are the ACPI tables that are directly consumed by the subsystem.
- *
- * The RSDP and FACS do not use the common ACPI table header. All other ACPI
- * tables use the header.
- *
  * Note about bitfields: The u8 type is used for bitfields in ACPI tables.
  * This is the only type that is even remotely portable. Anything else is not
  * portable, so do not use any other bitfield types.
@@ -77,9 +86,8 @@
 
 
/*******************************************************************************
  *
- * ACPI Table Header. This common header is used by all tables except the
- * RSDP and FACS. The define is used for direct inclusion of header into
- * other ACPI tables
+ * Master ACPI Table Header. This common header is used by all ACPI tables
+ * except the RSDP and FACS.
  *
  
******************************************************************************/
 
@@ -95,13 +103,16 @@ struct acpi_table_header {
        u32 asl_compiler_revision;      /* ASL compiler version */
 };
 
-/*
+/*******************************************************************************
+ *
  * GAS - Generic Address Structure (ACPI 2.0+)
  *
  * Note: Since this structure is used in the ACPI tables, it is byte aligned.
- * If misalignment is not supported, access to the Address field must be
- * performed with care.
- */
+ * If misaliged access is not supported by the hardware, accesses to the
+ * 64-bit Address field must be performed with care.
+ *
+ 
******************************************************************************/
+
 struct acpi_generic_address {
        u8 space_id;            /* Address space where struct or register 
exists */
        u8 bit_width;           /* Size in bits of given register */
@@ -113,6 +124,7 @@ struct acpi_generic_address {
 
/*******************************************************************************
  *
  * RSDP - Root System Description Pointer (Signature is "RSD PTR ")
+ *        Version 2
  *
  
******************************************************************************/
 
@@ -133,6 +145,7 @@ struct acpi_table_rsdp {
 
/*******************************************************************************
  *
  * RSDT/XSDT - Root System Description Tables
+ *             Version 1 (both)
  *
  
******************************************************************************/
 
@@ -161,21 +174,29 @@ struct acpi_table_facs {
        u32 flags;
        u64 xfirmware_waking_vector;    /* 64-bit version of the Firmware 
Waking Vector (ACPI 2.0+) */
        u8 version;             /* Version of this table (ACPI 2.0+) */
-       u8 reserved[31];        /* Reserved, must be zero */
+       u8 reserved[3];         /* Reserved, must be zero */
+       u32 ospm_flags;         /* Flags to be set by OSPM (ACPI 4.0) */
+       u8 reserved1[24];       /* Reserved, must be zero */
 };
 
-/* Flag macros */
+/* Masks for global_lock flag field above */
+
+#define ACPI_GLOCK_PENDING          (1)        /* 00: Pending global lock 
ownership */
+#define ACPI_GLOCK_OWNED            (1<<1)     /* 01: Global lock is owned */
 
-#define ACPI_FACS_S4_BIOS_PRESENT (1)  /* 00: S4BIOS support is present */
+/* Masks for Flags field above  */
 
-/* Global lock flags */
+#define ACPI_FACS_S4_BIOS_PRESENT   (1)        /* 00: S4BIOS support is 
present */
+#define ACPI_FACS_64BIT_WAKE        (1<<1)     /* 01: 64-bit wake vector 
supported (ACPI 4.0) */
 
-#define ACPI_GLOCK_PENDING      0x01   /* 00: Pending global lock ownership */
-#define ACPI_GLOCK_OWNED        0x02   /* 01: Global lock is owned */
+/* Masks for ospm_flags field above */
+
+#define ACPI_FACS_64BIT_ENVIRONMENT (1)        /* 00: 64-bit wake environment 
is required (ACPI 4.0) */
 
 
/*******************************************************************************
  *
  * FADT - Fixed ACPI Description Table (Signature "FACP")
+ *        Version 4
  *
  
******************************************************************************/
 
@@ -214,11 +235,11 @@ struct acpi_table_fadt {
        u16 flush_size;         /* Processor's memory cache line width, in 
bytes */
        u16 flush_stride;       /* Number of flush strides that need to be read 
*/
        u8 duty_offset;         /* Processor duty cycle index in processor's 
P_CNT reg */
-       u8 duty_width;          /* Processor duty cycle value bit width in 
P_CNT register. */
+       u8 duty_width;          /* Processor duty cycle value bit width in 
P_CNT register */
        u8 day_alarm;           /* Index to day-of-month alarm in RTC CMOS RAM 
*/
        u8 month_alarm;         /* Index to month-of-year alarm in RTC CMOS RAM 
*/
        u8 century;             /* Index to century in RTC CMOS RAM */
-       u16 boot_flags;         /* IA-PC Boot Architecture Flags. See Table 
5-10 for description */
+       u16 boot_flags;         /* IA-PC Boot Architecture Flags (see below for 
individual flags) */
        u8 reserved;            /* Reserved, must be zero */
        u32 flags;              /* Miscellaneous flag bits (see below for 
individual flags) */
        struct acpi_generic_address reset_register;     /* 64-bit address of 
the Reset register */
@@ -236,32 +257,41 @@ struct acpi_table_fadt {
        struct acpi_generic_address xgpe1_block;        /* 64-bit Extended 
General Purpose Event 1 Reg Blk address */
 };
 
-/* FADT flags */
+/* Masks for FADT Boot Architecture Flags (boot_flags) */
 
-#define ACPI_FADT_WBINVD            (1)        /* 00: The wbinvd instruction 
works properly */
-#define ACPI_FADT_WBINVD_FLUSH      (1<<1)     /* 01: The wbinvd flushes but 
does not invalidate */
-#define ACPI_FADT_C1_SUPPORTED      (1<<2)     /* 02: All processors support 
C1 state */
-#define ACPI_FADT_C2_MP_SUPPORTED   (1<<3)     /* 03: C2 state works on MP 
system */
-#define ACPI_FADT_POWER_BUTTON      (1<<4)     /* 04: Power button is handled 
as a generic feature */
-#define ACPI_FADT_SLEEP_BUTTON      (1<<5)     /* 05: Sleep button is handled 
as a generic feature, or  not present */
-#define ACPI_FADT_FIXED_RTC         (1<<6)     /* 06: RTC wakeup stat not in 
fixed register space */
-#define ACPI_FADT_S4_RTC_WAKE       (1<<7)     /* 07: RTC wakeup stat not 
possible from S4 */
-#define ACPI_FADT_32BIT_TIMER       (1<<8)     /* 08: tmr_val is 32 bits 
0=24-bits */
-#define ACPI_FADT_DOCKING_SUPPORTED (1<<9)     /* 09: Docking supported */
-#define ACPI_FADT_RESET_REGISTER    (1<<10)    /* 10: System reset via the 
FADT RESET_REG supported */
-#define ACPI_FADT_SEALED_CASE       (1<<11)    /* 11: No internal expansion 
capabilities and case is sealed */
-#define ACPI_FADT_HEADLESS          (1<<12)    /* 12: No local video 
capabilities or local input devices */
-#define ACPI_FADT_SLEEP_TYPE        (1<<13)    /* 13: Must execute native 
instruction after writing  SLP_TYPx register */
-#define ACPI_FADT_PCI_EXPRESS_WAKE  (1<<14)    /* 14: System supports 
PCIEXP_WAKE (STS/EN) bits (ACPI 3.0) */
-#define ACPI_FADT_PLATFORM_CLOCK    (1<<15)    /* 15: OSPM should use 
platform-provided timer (ACPI 3.0) */
-#define ACPI_FADT_S4_RTC_VALID      (1<<16)    /* 16: Contents of RTC_STS 
valid after S4 wake (ACPI 3.0) */
-#define ACPI_FADT_REMOTE_POWER_ON   (1<<17)    /* 17: System is compatible 
with remote power on (ACPI 3.0) */
-#define ACPI_FADT_APIC_CLUSTER      (1<<18)    /* 18: All local APICs must use 
cluster model (ACPI 3.0) */
-#define ACPI_FADT_APIC_PHYSICAL     (1<<19)    /* 19: All local x_aPICs must 
use physical dest mode (ACPI 3.0) */
+#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 */
+#define ACPI_FADT_NO_VGA            (1<<2)     /* 02: [V4] It is not safe to 
probe for VGA hardware */
+#define ACPI_FADT_NO_MSI            (1<<3)     /* 03: [V4] Message Signaled 
Interrupts (MSI) must not be enabled */
+#define ACPI_FADT_NO_ASPM           (1<<4)     /* 04: [V4] PCIe ASPM control 
must not be enabled */
+
+#define FADT2_REVISION_ID               3
+
+/* Masks for FADT flags */
+
+#define ACPI_FADT_WBINVD            (1)        /* 00: [V1] The wbinvd 
instruction works properly */
+#define ACPI_FADT_WBINVD_FLUSH      (1<<1)     /* 01: [V1] wbinvd flushes but 
does not invalidate caches */
+#define ACPI_FADT_C1_SUPPORTED      (1<<2)     /* 02: [V1] All processors 
support C1 state */
+#define ACPI_FADT_C2_MP_SUPPORTED   (1<<3)     /* 03: [V1] C2 state works on 
MP system */
+#define ACPI_FADT_POWER_BUTTON      (1<<4)     /* 04: [V1] Power button is 
handled as a control method device */
+#define ACPI_FADT_SLEEP_BUTTON      (1<<5)     /* 05: [V1] Sleep button is 
handled as a control method device */
+#define ACPI_FADT_FIXED_RTC         (1<<6)     /* 06: [V1] RTC wakeup status 
not in fixed register space */
+#define ACPI_FADT_S4_RTC_WAKE       (1<<7)     /* 07: [V1] RTC alarm can wake 
system from S4 */
+#define ACPI_FADT_32BIT_TIMER       (1<<8)     /* 08: [V1] ACPI timer width is 
32-bit (0=24-bit) */
+#define ACPI_FADT_DOCKING_SUPPORTED (1<<9)     /* 09: [V1] Docking supported */
+#define ACPI_FADT_RESET_REGISTER    (1<<10)    /* 10: [V2] System reset via 
the FADT RESET_REG supported */
+#define ACPI_FADT_SEALED_CASE       (1<<11)    /* 11: [V3] No internal 
expansion capabilities and case is sealed */
+#define ACPI_FADT_HEADLESS          (1<<12)    /* 12: [V3] No local video 
capabilities or local input devices */
+#define ACPI_FADT_SLEEP_TYPE        (1<<13)    /* 13: [V3] Must execute native 
instruction after writing  SLP_TYPx register */
+#define ACPI_FADT_PCI_EXPRESS_WAKE  (1<<14)    /* 14: [V4] System supports 
PCIEXP_WAKE (STS/EN) bits (ACPI 3.0) */
+#define ACPI_FADT_PLATFORM_CLOCK    (1<<15)    /* 15: [V4] OSPM should use 
platform-provided timer (ACPI 3.0) */
+#define ACPI_FADT_S4_RTC_VALID      (1<<16)    /* 16: [V4] Contents of RTC_STS 
valid after S4 wake (ACPI 3.0) */
+#define ACPI_FADT_REMOTE_POWER_ON   (1<<17)    /* 17: [V4] System is 
compatible with remote power on (ACPI 3.0) */
+#define ACPI_FADT_APIC_CLUSTER      (1<<18)    /* 18: [V4] All local APICs 
must use cluster model (ACPI 3.0) */
+#define ACPI_FADT_APIC_PHYSICAL     (1<<19)    /* 19: [V4] All local x_aPICs 
must use physical dest mode (ACPI 3.0) */
+
+/* Values for preferred_profile (Preferred Power Management Profiles) */
 
-/*
- * FADT Prefered Power Management Profiles
- */
 enum acpi_prefered_pm_profiles {
        PM_UNSPECIFIED = 0,
        PM_DESKTOP = 1,
@@ -272,15 +302,6 @@ enum acpi_prefered_pm_profiles {
        PM_APPLIANCE_PC = 6
 };
 
-/* FADT Boot Arch Flags */
-
-#define BAF_LEGACY_DEVICES              0x0001
-#define BAF_8042_KEYBOARD_CONTROLLER    0x0002
-#define BAF_MSI_NOT_SUPPORTED           0x0008
-
-#define FADT2_REVISION_ID               3
-#define FADT2_MINUS_REVISION_ID         2
-
 /* Reset to default packing */
 
 #pragma pack()
@@ -292,5 +313,22 @@ enum acpi_prefered_pm_profiles {
  */
 
 #include <acpi/actbl1.h>
+#include <acpi/actbl2.h>
+
+/*
+ * Sizes of the various flavors of FADT. We need to look closely
+ * at the FADT length because the version number essentially tells
+ * us nothing because of many BIOS bugs where the version does not
+ * match the expected length. In other words, the length of the
+ * FADT is the bottom line as to what the version really is.
+ *
+ * For reference, the values below are as follows:
+ *     FADT V1  size: 0x74
+ *     FADT V2  size: 0x84
+ *     FADT V3+ size: 0xF4
+ */
+#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_V3_SIZE       (u32) (sizeof (struct acpi_table_fadt))
 
 #endif                         /* __ACTBL_H__ */
--- a/xen/include/acpi/actbl1.h
+++ b/xen/include/acpi/actbl1.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,34 +46,31 @@
 
 
/*******************************************************************************
  *
- * Additional ACPI Tables
+ * Additional ACPI Tables (1)
  *
  * These tables are not consumed directly by the ACPICA subsystem, but are
  * included here to support device drivers and the AML disassembler.
  *
+ * The tables in this file are fully defined within the ACPI specification.
+ *
  
******************************************************************************/
 
 /*
- * Values for description table header signatures. Useful because they make
- * it more difficult to inadvertently type in the wrong signature.
+ * Values for description table header signatures for tables defined in this
+ * file. Useful because they make it more difficult to inadvertently type in
+ * the wrong signature.
  */
-#define ACPI_SIG_ASF            "ASF!" /* Alert Standard Format table */
-#define ACPI_SIG_BOOT           "BOOT" /* Simple Boot Flag Table */
+#define ACPI_SIG_BERT           "BERT" /* Boot Error Record Table */
 #define ACPI_SIG_CPEP           "CPEP" /* Corrected Platform Error Polling 
table */
-#define ACPI_SIG_ERST           "ERST"  /* Error Record Serialization Table */
-#define ACPI_SIG_DBGP           "DBGP" /* Debug Port table */
-#define ACPI_SIG_DMAR           "DMAR" /* DMA Remapping table */
 #define ACPI_SIG_ECDT           "ECDT" /* Embedded Controller Boot Resources 
Table */
-#define ACPI_SIG_HPET           "HPET" /* High Precision Event Timer table */
+#define ACPI_SIG_EINJ           "EINJ" /* Error Injection table */
+#define ACPI_SIG_ERST           "ERST" /* Error Record Serialization Table */
+#define ACPI_SIG_HEST           "HEST" /* Hardware Error Source Table */
 #define ACPI_SIG_MADT           "APIC" /* Multiple APIC Description Table */
-#define ACPI_SIG_MCFG           "MCFG" /* PCI Memory Mapped Configuration 
table */
+#define ACPI_SIG_MSCT           "MSCT" /* Maximum System Characteristics Table 
*/
 #define ACPI_SIG_SBST           "SBST" /* Smart Battery Specification Table */
 #define ACPI_SIG_SLIT           "SLIT" /* System Locality Distance Information 
Table */
-#define ACPI_SIG_SPCR           "SPCR" /* Serial Port Console Redirection 
table */
-#define ACPI_SIG_SPMI           "SPMI" /* Server Platform Management Interface 
table */
 #define ACPI_SIG_SRAT           "SRAT" /* System Resource Affinity Table */
-#define ACPI_SIG_TCPA           "TCPA" /* Trusted Computing Platform Alliance 
table */
-#define ACPI_SIG_WDRT           "WDRT" /* Watchdog Resource Table */
 
 /*
  * All tables must be byte-packed to match the ACPI specification, since
@@ -87,7 +84,13 @@
  * portable, so do not use any other bitfield types.
  */
 
-/* Common Sub-table header (used in MADT, SRAT, etc.) */
+/*******************************************************************************
+ *
+ * Common subtable headers
+ *
+ 
******************************************************************************/
+
+/* Generic subtable header (used in MADT, SRAT, etc.) */
 
 struct acpi_subtable_header {
        u8 type;
@@ -108,128 +111,54 @@ struct acpi_whea_header {
 
 
/*******************************************************************************
  *
- * ASF - Alert Standard Format table (Signature "ASF!")
- *
- * Conforms to the Alert Standard Format Specification V2.0, 23 April 2003
+ * BERT - Boot Error Record Table (ACPI 4.0)
+ *        Version 1
  *
  
******************************************************************************/
 
-struct acpi_table_asf {
+struct acpi_table_bert {
        struct acpi_table_header header;        /* Common ACPI table header */
+       u32 region_length;      /* Length of the boot error region */
+       u64 address;            /* Physical address of the error region */
 };
 
-/* ASF subtable header */
-
-struct acpi_asf_header {
-       u8 type;
-       u8 reserved;
-       u16 length;
-};
-
-/* Values for Type field above */
+/* Boot Error Region (not a subtable, pointed to by Address field above) */
 
-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
+struct acpi_bert_region {
+       u32 block_status;       /* Type of error information */
+       u32 raw_data_offset;    /* Offset to raw error data */
+       u32 raw_data_length;    /* Length of raw error data */
+       u32 data_length;        /* Length of generic error data */
+       u32 error_severity;     /* Severity code */
 };
 
-/*
- * ASF subtables
- */
+/* Values for block_status flags above */
 
-/* 0: ASF Information */
+#define ACPI_BERT_UNCORRECTABLE             (1)
+#define ACPI_BERT_CORRECTABLE               (1<<1)
+#define ACPI_BERT_MULTIPLE_UNCORRECTABLE    (1<<2)
+#define ACPI_BERT_MULTIPLE_CORRECTABLE      (1<<3)
+#define ACPI_BERT_ERROR_ENTRY_COUNT         (0xFF<<4)  /* 8 bits, error count 
*/
 
-struct acpi_asf_info {
-       struct acpi_asf_header header;
-       u8 min_reset_value;
-       u8 min_poll_interval;
-       u16 system_id;
-       u32 mfg_id;
-       u8 flags;
-       u8 reserved2[3];
-};
-
-/* 1: ASF Alerts */
+/* Values for error_severity above */
 
-struct acpi_asf_alert {
-       struct acpi_asf_header header;
-       u8 assert_mask;
-       u8 deassert_mask;
-       u8 alerts;
-       u8 data_length;
-};
-
-struct acpi_asf_alert_data {
-       u8 address;
-       u8 command;
-       u8 mask;
-       u8 value;
-       u8 sensor_type;
-       u8 type;
-       u8 offset;
-       u8 source_type;
-       u8 severity;
-       u8 sensor_number;
-       u8 entity;
-       u8 instance;
+enum acpi_bert_error_severity {
+       ACPI_BERT_ERROR_CORRECTABLE = 0,
+       ACPI_BERT_ERROR_FATAL = 1,
+       ACPI_BERT_ERROR_CORRECTED = 2,
+       ACPI_BERT_ERROR_NONE = 3,
+       ACPI_BERT_ERROR_RESERVED = 4    /* 4 and greater are reserved */
 };
 
-/* 2: ASF Remote Control */
-
-struct acpi_asf_remote {
-       struct acpi_asf_header header;
-       u8 controls;
-       u8 data_length;
-       u16 reserved2;
-};
-
-struct acpi_asf_control_data {
-       u8 function;
-       u8 address;
-       u8 command;
-       u8 value;
-};
-
-/* 3: ASF RMCP Boot Options */
-
-struct acpi_asf_rmcp {
-       struct acpi_asf_header header;
-       u8 capabilities[7];
-       u8 completion_code;
-       u32 enterprise_id;
-       u8 command;
-       u16 parameter;
-       u16 boot_options;
-       u16 oem_parameters;
-};
-
-/* 4: ASF Address */
-
-struct acpi_asf_address {
-       struct acpi_asf_header header;
-       u8 eprom_address;
-       u8 devices;
-};
-
-/*******************************************************************************
- *
- * BOOT - Simple Boot Flag Table
- *
- 
******************************************************************************/
-
-struct acpi_table_boot {
-       struct acpi_table_header header;        /* Common ACPI table header */
-       u8 cmos_index;          /* Index in CMOS RAM for the boot register */
-       u8 reserved[3];
-};
+/*
+ * Note: The generic error data that follows the error_severity field above
+ * uses the struct acpi_hest_generic_data defined under the HEST table below
+ */
 
 
/*******************************************************************************
  *
- * CPEP - Corrected Platform Error Polling table
+ * CPEP - Corrected Platform Error Polling table (ACPI 4.0)
+ *        Version 1
  *
  
******************************************************************************/
 
@@ -241,8 +170,7 @@ struct acpi_table_cpep {
 /* Subtable */
 
 struct acpi_cpep_polling {
-       u8 type;
-       u8 length;
+       struct acpi_subtable_header header;
        u8 id;                  /* Processor ID */
        u8 eid;                 /* Processor EID */
        u32 interval;           /* Polling interval (msec) */
@@ -250,116 +178,103 @@ struct acpi_cpep_polling {
 
 
/*******************************************************************************
  *
- * DBGP - Debug Port table
+ * ECDT - Embedded Controller Boot Resources Table
+ *        Version 1
  *
  
******************************************************************************/
 
-struct acpi_table_dbgp {
+struct acpi_table_ecdt {
        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;
+       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;                 /* The GPE for the EC */
+       u8 id[1];               /* Full namepath of the EC in the ACPI 
namespace */
 };
 
 
/*******************************************************************************
  *
- * DMAR - DMA Remapping table
+ * EINJ - Error Injection Table (ACPI 4.0)
+ *        Version 1
  *
  
******************************************************************************/
 
-struct acpi_table_dmar {
+struct acpi_table_einj {
        struct acpi_table_header header;        /* Common ACPI table header */
-       u8 width;               /* Host Address Width */
+       u32 header_length;
        u8 flags;
-       u8 reserved[10];
-};
-
-/* DMAR subtable header */
-
-struct acpi_dmar_header {
-       u16 type;
-       u16 length;
-};
-
-/* Values for subtable type in 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_TYPE_RESERVED = 3     /* 3 and greater are reserved */
-};
-
-struct acpi_dmar_device_scope {
-       u8 entry_type;
-       u8 length;
-       u16 reserved;
-       u8 enumeration_id;
-       u8 bus;
+       u8 reserved[3];
+       u32 entries;
 };
 
-/* Values for entry_type in struct acpi_dmar_device_scope */
+/* EINJ Injection Instruction Entries (actions) */
 
-enum acpi_dmar_scope_type {
-       ACPI_DMAR_SCOPE_TYPE_NOT_USED = 0,
-       ACPI_DMAR_SCOPE_TYPE_ENDPOINT = 1,
-       ACPI_DMAR_SCOPE_TYPE_BRIDGE = 2,
-       ACPI_DMAR_SCOPE_TYPE_IOAPIC = 3,
-       ACPI_DMAR_SCOPE_TYPE_HPET = 4,
-       ACPI_DMAR_SCOPE_TYPE_RESERVED = 5       /* 5 and greater are reserved */
+struct acpi_einj_entry {
+       struct acpi_whea_header whea_header;    /* Common header for WHEA 
tables */
 };
 
-struct acpi_dmar_pci_path {
-       u8 dev;
-       u8 fn;
-};
+/* Masks for Flags field above */
 
-/*
- * DMAR Sub-tables, correspond to Type in struct acpi_dmar_header
- */
+#define ACPI_EINJ_PRESERVE          (1)
 
-/* 0: Hardware Unit Definition */
+/* Values for Action field above */
 
-struct acpi_dmar_hardware_unit {
-       struct acpi_dmar_header header;
-       u8 flags;
-       u8 reserved;
-       u16 segment;
-       u64 address;            /* Register Base Address */
+enum acpi_einj_actions {
+       ACPI_EINJ_BEGIN_OPERATION = 0,
+       ACPI_EINJ_GET_TRIGGER_TABLE = 1,
+       ACPI_EINJ_SET_ERROR_TYPE = 2,
+       ACPI_EINJ_GET_ERROR_TYPE = 3,
+       ACPI_EINJ_END_OPERATION = 4,
+       ACPI_EINJ_EXECUTE_OPERATION = 5,
+       ACPI_EINJ_CHECK_BUSY_STATUS = 6,
+       ACPI_EINJ_GET_COMMAND_STATUS = 7,
+       ACPI_EINJ_ACTION_RESERVED = 8,  /* 8 and greater are reserved */
+       ACPI_EINJ_TRIGGER_ERROR = 0xFF  /* Except for this value */
 };
 
-/* Flags */
-
-#define ACPI_DMAR_INCLUDE_ALL       (1)
-
-/* 1: Reserved Memory Defininition */
+/* Values for Instruction field above */
 
-struct acpi_dmar_reserved_memory {
-       struct acpi_dmar_header header;
-       u16 reserved;
-       u16 segment;
-       u64 base_address;               /* 4_k aligned base address */
-       u64 end_address;        /* 4_k aligned limit address */
+enum acpi_einj_instructions {
+       ACPI_EINJ_READ_REGISTER = 0,
+       ACPI_EINJ_READ_REGISTER_VALUE = 1,
+       ACPI_EINJ_WRITE_REGISTER = 2,
+       ACPI_EINJ_WRITE_REGISTER_VALUE = 3,
+       ACPI_EINJ_NOOP = 4,
+       ACPI_EINJ_INSTRUCTION_RESERVED = 5      /* 5 and greater are reserved */
+};
+
+/* EINJ Trigger Error Action Table */
+
+struct acpi_einj_trigger {
+       u32 header_size;
+       u32 revision;
+       u32 table_size;
+       u32 entry_count;
 };
 
-/* Flags */
+/* Command status return values */
 
-#define ACPI_DMAR_ALLOW_ALL         (1)
-
-/*******************************************************************************
- *
- * ECDT - Embedded Controller Boot Resources Table
- *
- 
******************************************************************************/
-
-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;                 /* The GPE for the EC */
-       u8 id[1];               /* Full namepath of the EC in the ACPI 
namespace */
-};
+enum acpi_einj_command_status {
+       ACPI_EINJ_SUCCESS = 0,
+       ACPI_EINJ_FAILURE = 1,
+       ACPI_EINJ_INVALID_ACCESS = 2,
+       ACPI_EINJ_STATUS_RESERVED = 3   /* 3 and greater are reserved */
+};
+
+/* Error types returned from ACPI_EINJ_GET_ERROR_TYPE (bitfield) */
+
+#define ACPI_EINJ_PROCESSOR_CORRECTABLE     (1)
+#define ACPI_EINJ_PROCESSOR_UNCORRECTABLE   (1<<1)
+#define ACPI_EINJ_PROCESSOR_FATAL           (1<<2)
+#define ACPI_EINJ_MEMORY_CORRECTABLE        (1<<3)
+#define ACPI_EINJ_MEMORY_UNCORRECTABLE      (1<<4)
+#define ACPI_EINJ_MEMORY_FATAL              (1<<5)
+#define ACPI_EINJ_PCIX_CORRECTABLE          (1<<6)
+#define ACPI_EINJ_PCIX_UNCORRECTABLE        (1<<7)
+#define ACPI_EINJ_PCIX_FATAL                (1<<8)
+#define ACPI_EINJ_PLATFORM_CORRECTABLE      (1<<9)
+#define ACPI_EINJ_PLATFORM_UNCORRECTABLE    (1<<10)
+#define ACPI_EINJ_PLATFORM_FATAL            (1<<11)
 
 
/*******************************************************************************
  *
@@ -453,30 +368,237 @@ struct acpi_erst_info {
 
 
/*******************************************************************************
  *
- * HPET - High Precision Event Timer table
+ * HEST - Hardware Error Source Table (ACPI 4.0)
+ *        Version 1
  *
  
******************************************************************************/
 
-struct acpi_table_hpet {
+struct acpi_table_hest {
        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 */
+       u32 error_source_count;
+};
+
+/* HEST subtable header */
+
+struct acpi_hest_header {
+       u16 type;
+       u16 source_id;
+};
+
+/* Values for Type field above for subtables */
+
+enum acpi_hest_types {
+       ACPI_HEST_TYPE_IA32_CHECK = 0,
+       ACPI_HEST_TYPE_IA32_CORRECTED_CHECK = 1,
+       ACPI_HEST_TYPE_IA32_NMI = 2,
+       ACPI_HEST_TYPE_NOT_USED3 = 3,
+       ACPI_HEST_TYPE_NOT_USED4 = 4,
+       ACPI_HEST_TYPE_NOT_USED5 = 5,
+       ACPI_HEST_TYPE_AER_ROOT_PORT = 6,
+       ACPI_HEST_TYPE_AER_ENDPOINT = 7,
+       ACPI_HEST_TYPE_AER_BRIDGE = 8,
+       ACPI_HEST_TYPE_GENERIC_ERROR = 9,
+       ACPI_HEST_TYPE_RESERVED = 10    /* 10 and greater are reserved */
+};
+
+/*
+ * HEST substructures contained in subtables
+ */
+
+/*
+ * IA32 Error Bank(s) - Follows the struct acpi_hest_ia_machine_check and
+ * struct acpi_hest_ia_corrected structures.
+ */
+struct acpi_hest_ia_error_bank {
+       u8 bank_number;
+       u8 clear_status_on_init;
+       u8 status_format;
+       u8 reserved;
+       u32 control_register;
+       u64 control_data;
+       u32 status_register;
+       u32 address_register;
+       u32 misc_register;
+};
+
+/* Common HEST sub-structure for PCI/AER structures below (6,7,8) */
+
+struct acpi_hest_aer_common {
+       u16 reserved1;
        u8 flags;
+       u8 enabled;
+       u32 records_to_preallocate;
+       u32 max_sections_per_record;
+       u32 bus;
+       u16 device;
+       u16 function;
+       u16 device_control;
+       u16 reserved2;
+       u32 uncorrectable_mask;
+       u32 uncorrectable_severity;
+       u32 correctable_mask;
+       u32 advanced_capabilities;
 };
 
-/*! Flags */
+/* Masks for HEST Flags fields */
+
+#define ACPI_HEST_FIRMWARE_FIRST        (1)
+#define ACPI_HEST_GLOBAL                (1<<1)
 
-#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 */
+/* Hardware Error Notification */
 
-/*! [End] no source code translation !*/
+struct acpi_hest_notify {
+       u8 type;
+       u8 length;
+       u16 config_write_enable;
+       u32 poll_interval;
+       u32 vector;
+       u32 polling_threshold_value;
+       u32 polling_threshold_window;
+       u32 error_threshold_value;
+       u32 error_threshold_window;
+};
+
+/* Values for Notify Type field above */
+
+enum acpi_hest_notify_types {
+       ACPI_HEST_NOTIFY_POLLED = 0,
+       ACPI_HEST_NOTIFY_EXTERNAL = 1,
+       ACPI_HEST_NOTIFY_LOCAL = 2,
+       ACPI_HEST_NOTIFY_SCI = 3,
+       ACPI_HEST_NOTIFY_NMI = 4,
+       ACPI_HEST_NOTIFY_RESERVED = 5   /* 5 and greater are reserved */
+};
+
+/* Values for config_write_enable bitfield above */
+
+#define ACPI_HEST_TYPE                  (1)
+#define ACPI_HEST_POLL_INTERVAL         (1<<1)
+#define ACPI_HEST_POLL_THRESHOLD_VALUE  (1<<2)
+#define ACPI_HEST_POLL_THRESHOLD_WINDOW (1<<3)
+#define ACPI_HEST_ERR_THRESHOLD_VALUE   (1<<4)
+#define ACPI_HEST_ERR_THRESHOLD_WINDOW  (1<<5)
+
+/*
+ * HEST subtables
+ */
+
+/* 0: IA32 Machine Check Exception */
+
+struct acpi_hest_ia_machine_check {
+       struct acpi_hest_header header;
+       u16 reserved1;
+       u8 flags;
+       u8 enabled;
+       u32 records_to_preallocate;
+       u32 max_sections_per_record;
+       u64 global_capability_data;
+       u64 global_control_data;
+       u8 num_hardware_banks;
+       u8 reserved3[7];
+};
+
+/* 1: IA32 Corrected Machine Check */
+
+struct acpi_hest_ia_corrected {
+       struct acpi_hest_header header;
+       u16 reserved1;
+       u8 flags;
+       u8 enabled;
+       u32 records_to_preallocate;
+       u32 max_sections_per_record;
+       struct acpi_hest_notify notify;
+       u8 num_hardware_banks;
+       u8 reserved2[3];
+};
+
+/* 2: IA32 Non-Maskable Interrupt */
+
+struct acpi_hest_ia_nmi {
+       struct acpi_hest_header header;
+       u32 reserved;
+       u32 records_to_preallocate;
+       u32 max_sections_per_record;
+       u32 max_raw_data_length;
+};
+
+/* 3,4,5: Not used */
+
+/* 6: PCI Express Root Port AER */
+
+struct acpi_hest_aer_root {
+       struct acpi_hest_header header;
+       struct acpi_hest_aer_common aer;
+       u32 root_error_command;
+};
+
+/* 7: PCI Express AER (AER Endpoint) */
+
+struct acpi_hest_aer {
+       struct acpi_hest_header header;
+       struct acpi_hest_aer_common aer;
+};
+
+/* 8: PCI Express/PCI-X Bridge AER */
+
+struct acpi_hest_aer_bridge {
+       struct acpi_hest_header header;
+       struct acpi_hest_aer_common aer;
+       u32 uncorrectable_mask2;
+       u32 uncorrectable_severity2;
+       u32 advanced_capabilities2;
+};
+
+/* 9: Generic Hardware Error Source */
+
+struct acpi_hest_generic {
+       struct acpi_hest_header header;
+       u16 related_source_id;
+       u8 reserved;
+       u8 enabled;
+       u32 records_to_preallocate;
+       u32 max_sections_per_record;
+       u32 max_raw_data_length;
+       struct acpi_generic_address error_status_address;
+       struct acpi_hest_notify notify;
+       u32 error_block_length;
+};
+
+/* Generic Error Status block */
+
+struct acpi_hest_generic_status {
+       u32 block_status;
+       u32 raw_data_offset;
+       u32 raw_data_length;
+       u32 data_length;
+       u32 error_severity;
+};
+
+/* Values for block_status flags above */
+
+#define ACPI_HEST_UNCORRECTABLE             (1)
+#define ACPI_HEST_CORRECTABLE               (1<<1)
+#define ACPI_HEST_MULTIPLE_UNCORRECTABLE    (1<<2)
+#define ACPI_HEST_MULTIPLE_CORRECTABLE      (1<<3)
+#define ACPI_HEST_ERROR_ENTRY_COUNT         (0xFF<<4)  /* 8 bits, error count 
*/
+
+/* Generic Error Data entry */
+
+struct acpi_hest_generic_data {
+       u8 section_type[16];
+       u32 error_severity;
+       u16 revision;
+       u8 validation_bits;
+       u8 flags;
+       u32 error_data_length;
+       u8 fru_id[16];
+       u8 fru_text[20];
+};
 
 
/*******************************************************************************
  *
  * MADT - Multiple APIC Description Table
+ *        Version 3
  *
  
******************************************************************************/
 
@@ -486,7 +608,7 @@ struct acpi_table_madt {
        u32 flags;
 };
 
-/* Flags */
+/* Masks for Flags field above */
 
 #define ACPI_MADT_PCAT_COMPAT       (1)        /* 00:    System also has dual 
8259s */
 
@@ -495,7 +617,7 @@ struct acpi_table_madt {
 #define ACPI_MADT_DUAL_PIC          0
 #define ACPI_MADT_MULTIPLE_APIC     1
 
-/* Values for subtable type in struct acpi_subtable_header */
+/* Values for MADT subtable type in struct acpi_subtable_header */
 
 enum acpi_madt_type {
        ACPI_MADT_TYPE_LOCAL_APIC = 0,
@@ -606,7 +728,7 @@ struct acpi_madt_interrupt_source {
        u32 flags;              /* Interrupt Source Flags */
 };
 
-/* Flags field above */
+/* Masks for Flags field above */
 
 #define ACPI_MADT_CPEI_OVERRIDE     (1)
 
@@ -615,9 +737,9 @@ struct acpi_madt_interrupt_source {
 struct acpi_madt_local_x2apic {
        struct acpi_subtable_header header;
        u16 reserved;           /* Reserved - must be zero */
-       u32 local_apic_id;      /* Processor X2_APIC ID  */
+       u32 local_apic_id;      /* Processor x2APIC ID  */
        u32 lapic_flags;
-       u32 uid;                /* Extended X2_APIC processor ID */
+       u32 uid;                /* ACPI processor UID */
 };
 
 /* 10: Local X2APIC NMI (ACPI 4.0) */
@@ -625,7 +747,7 @@ struct acpi_madt_local_x2apic {
 struct acpi_madt_local_x2apic_nmi {
        struct acpi_subtable_header header;
        u16 inti_flags;
-       u32 uid;                /* Processor X2_APIC ID */
+       u32 uid;                /* ACPI processor UID */
        u8 lint;                /* LINTn to which NMI is connected */
        u8 reserved[3];
 };
@@ -657,28 +779,34 @@ struct acpi_madt_local_x2apic_nmi {
 
 
/*******************************************************************************
  *
- * MCFG - PCI Memory Mapped Configuration table and sub-table
+ * MSCT - Maximum System Characteristics Table (ACPI 4.0)
+ *        Version 1
  *
  
******************************************************************************/
 
-struct acpi_table_mcfg {
+struct acpi_table_msct {
        struct acpi_table_header header;        /* Common ACPI table header */
-       u8 reserved[8];
+       u32 proximity_offset;   /* Location of proximity info struct(s) */
+       u32 max_proximity_domains;      /* Max number of proximity domains */
+       u32 max_clock_domains;  /* Max number of clock domains */
+       u64 max_address;        /* Max physical address in system */
 };
 
-/* Subtable */
+/* Subtable - Maximum Proximity Domain Information. Version 1 */
 
-struct acpi_mcfg_allocation {
-       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;
+struct acpi_msct_proximity {
+       u8 revision;
+       u8 length;
+       u32 range_start;        /* Start of domain range */
+       u32 range_end;          /* End of domain range */
+       u32 processor_capacity;
+       u64 memory_capacity;    /* In bytes */
 };
 
 
/*******************************************************************************
  *
  * SBST - Smart Battery Specification Table
+ *        Version 1
  *
  
******************************************************************************/
 
@@ -692,6 +820,7 @@ struct acpi_table_sbst {
 
/*******************************************************************************
  *
  * SLIT - System Locality Distance Information Table
+ *        Version 1
  *
  
******************************************************************************/
 
@@ -703,60 +832,8 @@ struct acpi_table_slit {
 
 
/*******************************************************************************
  *
- * SPCR - Serial Port Console Redirection table
- *
- 
******************************************************************************/
-
-struct acpi_table_spcr {
-       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;
-       u8 pc_interrupt;
-       u32 interrupt;
-       u8 baud_rate;
-       u8 parity;
-       u8 stop_bits;
-       u8 flow_control;
-       u8 terminal_type;
-       u8 reserved1;
-       u16 pci_device_id;
-       u16 pci_vendor_id;
-       u8 pci_bus;
-       u8 pci_device;
-       u8 pci_function;
-       u32 pci_flags;
-       u8 pci_segment;
-       u32 reserved2;
-};
-
-/*******************************************************************************
- *
- * SPMI - Server Platform Management Interface table
- *
- 
******************************************************************************/
-
-struct acpi_table_spmi {
-       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 reserved1;
-       u8 pci_device_flag;
-       u32 interrupt;
-       struct acpi_generic_address ipmi_register;
-       u8 pci_segment;
-       u8 pci_bus;
-       u8 pci_device;
-       u8 pci_function;
-};
-
-/*******************************************************************************
- *
  * SRAT - System Resource Affinity Table
+ *        Version 3
  *
  
******************************************************************************/
 
@@ -775,7 +852,9 @@ enum acpi_srat_type {
        ACPI_SRAT_TYPE_RESERVED = 3     /* 3 and greater are reserved */
 };
 
-/* SRAT sub-tables */
+/*
+ * SRAT Sub-tables, correspond to Type in struct acpi_subtable_header
+ */
 
 /* 0: Processor Local APIC/SAPIC Affinity */
 
@@ -789,6 +868,10 @@ struct acpi_srat_cpu_affinity {
        u32 reserved;           /* Reserved, must be zero */
 };
 
+/* Flags */
+
+#define ACPI_SRAT_CPU_USE_AFFINITY  (1)        /* 00: Use affinity structure */
+
 /* 1: Memory Affinity */
 
 struct acpi_srat_mem_affinity {
@@ -797,9 +880,9 @@ struct acpi_srat_mem_affinity {
        u16 reserved;           /* Reserved, must be zero */
        u64 base_address;
        u64 length;
-       u32 memory_type;        /* See acpi_address_range_id */
+       u32 reserved1;
        u32 flags;
-       u64 reserved1;          /* Reserved, must be zero */
+       u64 reserved2;          /* Reserved, must be zero */
 };
 
 /* Flags */
@@ -824,44 +907,6 @@ struct acpi_srat_x2apic_cpu_affinity {
 
 #define ACPI_SRAT_CPU_ENABLED       (1)        /* 00: Use affinity structure */
 
-/*******************************************************************************
- *
- * TCPA - Trusted Computing Platform Alliance table
- *
- 
******************************************************************************/
-
-struct acpi_table_tcpa {
-       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 */
-};
-
-/*******************************************************************************
- *
- * WDRT - Watchdog Resource Table
- *
- 
******************************************************************************/
-
-struct acpi_table_wdrt {
-       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 */
-       u8 pci_function;        /* PCI Function number */
-       u32 timer_period;       /* Period of one timer count (msec) */
-       u32 max_count;          /* Maximum counter value supported */
-       u32 min_count;          /* Minimum counter value */
-       u8 flags;
-       u8 reserved[3];
-       u32 entries;            /* Number of watchdog entries that follow */
-};
-
-/* Flags */
-
-#define ACPI_WDRT_TIMER_ENABLED     (1)        /* 00: Timer enabled */
-
 /* Reset to default packing */
 
 #pragma pack()
--- /dev/null
+++ a/xen/include/acpi/actbl2.h
@@ -0,0 +1,1050 @@
+/******************************************************************************
+ *
+ * Name: actbl2.h - ACPI Table Definitions (tables not in ACPI spec)
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2011, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef __ACTBL2_H__
+#define __ACTBL2_H__
+
+/*******************************************************************************
+ *
+ * Additional ACPI Tables (2)
+ *
+ * These tables are not consumed directly by the ACPICA subsystem, but are
+ * included here to support device drivers and the AML disassembler.
+ *
+ * The tables in this file are defined by third-party specifications, and are
+ * not defined directly by the ACPI specification itself.
+ *
+ 
******************************************************************************/
+
+/*
+ * Values for description table header signatures for tables defined in this
+ * file. Useful because they make it more difficult to inadvertently type in
+ * the wrong signature.
+ */
+#define ACPI_SIG_ASF            "ASF!" /* Alert Standard Format table */
+#define ACPI_SIG_BOOT           "BOOT" /* Simple Boot Flag Table */
+#define ACPI_SIG_DBGP           "DBGP" /* Debug Port table */
+#define ACPI_SIG_DMAR           "DMAR" /* DMA Remapping table */
+#define ACPI_SIG_HPET           "HPET" /* High Precision Event Timer table */
+#define ACPI_SIG_IBFT           "IBFT" /* i_sCSI Boot Firmware Table */
+#define ACPI_SIG_IVRS           "IVRS" /* I/O Virtualization Reporting 
Structure */
+#define ACPI_SIG_MCFG           "MCFG" /* PCI Memory Mapped Configuration 
table */
+#define ACPI_SIG_MCHI           "MCHI" /* Management Controller Host Interface 
table */
+#define ACPI_SIG_SLIC           "SLIC" /* Software Licensing Description Table 
*/
+#define ACPI_SIG_SPCR           "SPCR" /* Serial Port Console Redirection 
table */
+#define ACPI_SIG_SPMI           "SPMI" /* Server Platform Management Interface 
table */
+#define ACPI_SIG_TCPA           "TCPA" /* Trusted Computing Platform Alliance 
table */
+#define ACPI_SIG_UEFI           "UEFI" /* Uefi Boot Optimization Table */
+#define ACPI_SIG_WAET           "WAET" /* Windows ACPI Emulated devices Table 
*/
+#define ACPI_SIG_WDAT           "WDAT" /* Watchdog Action Table */
+#define ACPI_SIG_WDDT           "WDDT" /* Watchdog Timer Description Table */
+#define ACPI_SIG_WDRT           "WDRT" /* Watchdog Resource Table */
+
+#ifdef ACPI_UNDEFINED_TABLES
+/*
+ * These tables have been seen in the field, but no definition has been found
+ */
+#define ACPI_SIG_ATKG           "ATKG"
+#define ACPI_SIG_GSCI           "GSCI" /* GMCH SCI table */
+#define ACPI_SIG_IEIT           "IEIT"
+#endif
+
+/*
+ * All tables must be byte-packed to match the ACPI specification, since
+ * the tables are provided by the system BIOS.
+ */
+#pragma pack(1)
+
+/*
+ * Note about bitfields: The u8 type is used for bitfields in ACPI tables.
+ * This is the only type that is even remotely portable. Anything else is not
+ * portable, so do not use any other bitfield types.
+ */
+
+/*******************************************************************************
+ *
+ * ASF - Alert Standard Format table (Signature "ASF!")
+ *       Revision 0x10
+ *
+ * Conforms to the Alert Standard Format Specification V2.0, 23 April 2003
+ *
+ 
******************************************************************************/
+
+struct acpi_table_asf {
+       struct acpi_table_header header;        /* Common ACPI table header */
+};
+
+/* ASF subtable header */
+
+struct acpi_asf_header {
+       u8 type;
+       u8 reserved;
+       u16 length;
+};
+
+/* Values for Type field above */
+
+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
+ */
+
+/* 0: ASF Information */
+
+struct acpi_asf_info {
+       struct acpi_asf_header header;
+       u8 min_reset_value;
+       u8 min_poll_interval;
+       u16 system_id;
+       u32 mfg_id;
+       u8 flags;
+       u8 reserved2[3];
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_ASF_SMBUS_PROTOCOLS    (1)
+
+/* 1: ASF Alerts */
+
+struct acpi_asf_alert {
+       struct acpi_asf_header header;
+       u8 assert_mask;
+       u8 deassert_mask;
+       u8 alerts;
+       u8 data_length;
+};
+
+struct acpi_asf_alert_data {
+       u8 address;
+       u8 command;
+       u8 mask;
+       u8 value;
+       u8 sensor_type;
+       u8 type;
+       u8 offset;
+       u8 source_type;
+       u8 severity;
+       u8 sensor_number;
+       u8 entity;
+       u8 instance;
+};
+
+/* 2: ASF Remote Control */
+
+struct acpi_asf_remote {
+       struct acpi_asf_header header;
+       u8 controls;
+       u8 data_length;
+       u16 reserved2;
+};
+
+struct acpi_asf_control_data {
+       u8 function;
+       u8 address;
+       u8 command;
+       u8 value;
+};
+
+/* 3: ASF RMCP Boot Options */
+
+struct acpi_asf_rmcp {
+       struct acpi_asf_header header;
+       u8 capabilities[7];
+       u8 completion_code;
+       u32 enterprise_id;
+       u8 command;
+       u16 parameter;
+       u16 boot_options;
+       u16 oem_parameters;
+};
+
+/* 4: ASF Address */
+
+struct acpi_asf_address {
+       struct acpi_asf_header header;
+       u8 eprom_address;
+       u8 devices;
+};
+
+/*******************************************************************************
+ *
+ * BOOT - Simple Boot Flag Table
+ *        Version 1
+ *
+ * Conforms to the "Simple Boot Flag Specification", Version 2.1
+ *
+ 
******************************************************************************/
+
+struct acpi_table_boot {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 cmos_index;          /* Index in CMOS RAM for the boot register */
+       u8 reserved[3];
+};
+
+/*******************************************************************************
+ *
+ * DBGP - Debug Port table
+ *        Version 1
+ *
+ * Conforms to the "Debug Port Specification", Version 1.00, 2/9/2000
+ *
+ 
******************************************************************************/
+
+struct acpi_table_dbgp {
+       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;
+};
+
+/*******************************************************************************
+ *
+ * DMAR - DMA Remapping table
+ *        Version 1
+ *
+ * Conforms to "Intel Virtualization Technology for Directed I/O",
+ * Version 1.2, Sept. 2008
+ *
+ 
******************************************************************************/
+
+struct acpi_table_dmar {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 width;               /* Host Address Width */
+       u8 flags;
+       u8 reserved[10];
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_DMAR_INTR_REMAP        (1)
+#define ACPI_DMAR_X2APIC_OPT_OUT    (1<<1)
+
+/* DMAR subtable header */
+
+struct acpi_dmar_header {
+       u16 type;
+       u16 length;
+};
+
+/* Values for subtable type in 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_RESERVED = 4     /* 4 and greater are reserved */
+};
+
+/* DMAR Device Scope structure */
+
+struct acpi_dmar_device_scope {
+       u8 entry_type;
+       u8 length;
+       u16 reserved;
+       u8 enumeration_id;
+       u8 bus;
+};
+
+/* Values for entry_type in struct acpi_dmar_device_scope */
+
+enum acpi_dmar_scope_type {
+       ACPI_DMAR_SCOPE_TYPE_NOT_USED = 0,
+       ACPI_DMAR_SCOPE_TYPE_ENDPOINT = 1,
+       ACPI_DMAR_SCOPE_TYPE_BRIDGE = 2,
+       ACPI_DMAR_SCOPE_TYPE_IOAPIC = 3,
+       ACPI_DMAR_SCOPE_TYPE_HPET = 4,
+       ACPI_DMAR_SCOPE_TYPE_RESERVED = 5       /* 5 and greater are reserved */
+};
+
+struct acpi_dmar_pci_path {
+       u8 dev;
+       u8 fn;
+};
+
+/*
+ * DMAR Sub-tables, correspond to Type in struct acpi_dmar_header
+ */
+
+/* 0: Hardware Unit Definition */
+
+struct acpi_dmar_hardware_unit {
+       struct acpi_dmar_header header;
+       u8 flags;
+       u8 reserved;
+       u16 segment;
+       u64 address;            /* Register Base Address */
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_DMAR_INCLUDE_ALL       (1)
+
+/* 1: Reserved Memory Defininition */
+
+struct acpi_dmar_reserved_memory {
+       struct acpi_dmar_header header;
+       u16 reserved;
+       u16 segment;
+       u64 base_address;       /* 4_k aligned base address */
+       u64 end_address;        /* 4_k aligned limit address */
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_DMAR_ALLOW_ALL         (1)
+
+/* 2: Root Port ATS Capability Reporting Structure */
+
+struct acpi_dmar_atsr {
+       struct acpi_dmar_header header;
+       u8 flags;
+       u8 reserved;
+       u16 segment;
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_DMAR_ALL_PORTS         (1)
+
+/* 3: Remapping Hardware Static Affinity Structure */
+
+struct acpi_dmar_rhsa {
+       struct acpi_dmar_header header;
+       u32 reserved;
+       u64 base_address;
+       u32 proximity_domain;
+};
+
+/*******************************************************************************
+ *
+ * HPET - High Precision Event Timer table
+ *        Version 1
+ *
+ * Conforms to "IA-PC HPET (High Precision Event Timers) Specification",
+ * Version 1.0a, October 2004
+ *
+ 
******************************************************************************/
+
+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;
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_HPET_PAGE_PROTECT_MASK (3)
+
+/* Values for Page Protect flags */
+
+enum acpi_hpet_page_protect {
+       ACPI_HPET_NO_PAGE_PROTECT = 0,
+       ACPI_HPET_PAGE_PROTECT4 = 1,
+       ACPI_HPET_PAGE_PROTECT64 = 2
+};
+
+/*******************************************************************************
+ *
+ * IBFT - Boot Firmware Table
+ *        Version 1
+ *
+ * Conforms to "iSCSI Boot Firmware Table (iBFT) as Defined in ACPI 3.0b
+ * Specification", Version 1.01, March 1, 2007
+ *
+ * Note: It appears that this table is not intended to appear in the RSDT/XSDT.
+ * Therefore, it is not currently supported by the disassembler.
+ *
+ 
******************************************************************************/
+
+struct acpi_table_ibft {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 reserved[12];
+};
+
+/* IBFT common subtable header */
+
+struct acpi_ibft_header {
+       u8 type;
+       u8 version;
+       u16 length;
+       u8 index;
+       u8 flags;
+};
+
+/* Values for Type field above */
+
+enum acpi_ibft_type {
+       ACPI_IBFT_TYPE_NOT_USED = 0,
+       ACPI_IBFT_TYPE_CONTROL = 1,
+       ACPI_IBFT_TYPE_INITIATOR = 2,
+       ACPI_IBFT_TYPE_NIC = 3,
+       ACPI_IBFT_TYPE_TARGET = 4,
+       ACPI_IBFT_TYPE_EXTENSIONS = 5,
+       ACPI_IBFT_TYPE_RESERVED = 6     /* 6 and greater are reserved */
+};
+
+/* IBFT subtables */
+
+struct acpi_ibft_control {
+       struct acpi_ibft_header header;
+       u16 extensions;
+       u16 initiator_offset;
+       u16 nic0_offset;
+       u16 target0_offset;
+       u16 nic1_offset;
+       u16 target1_offset;
+};
+
+struct acpi_ibft_initiator {
+       struct acpi_ibft_header header;
+       u8 sns_server[16];
+       u8 slp_server[16];
+       u8 primary_server[16];
+       u8 secondary_server[16];
+       u16 name_length;
+       u16 name_offset;
+};
+
+struct acpi_ibft_nic {
+       struct acpi_ibft_header header;
+       u8 ip_address[16];
+       u8 subnet_mask_prefix;
+       u8 origin;
+       u8 gateway[16];
+       u8 primary_dns[16];
+       u8 secondary_dns[16];
+       u8 dhcp[16];
+       u16 vlan;
+       u8 mac_address[6];
+       u16 pci_address;
+       u16 name_length;
+       u16 name_offset;
+};
+
+struct acpi_ibft_target {
+       struct acpi_ibft_header header;
+       u8 target_ip_address[16];
+       u16 target_ip_socket;
+       u8 target_boot_lun[8];
+       u8 chap_type;
+       u8 nic_association;
+       u16 target_name_length;
+       u16 target_name_offset;
+       u16 chap_name_length;
+       u16 chap_name_offset;
+       u16 chap_secret_length;
+       u16 chap_secret_offset;
+       u16 reverse_chap_name_length;
+       u16 reverse_chap_name_offset;
+       u16 reverse_chap_secret_length;
+       u16 reverse_chap_secret_offset;
+};
+
+/*******************************************************************************
+ *
+ * IVRS - I/O Virtualization Reporting Structure
+ *        Version 1
+ *
+ * Conforms to "AMD I/O Virtualization Technology (IOMMU) Specification",
+ * Revision 1.26, February 2009.
+ *
+ 
******************************************************************************/
+
+struct acpi_table_ivrs {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u32 info;               /* Common virtualization info */
+       u64 reserved;
+};
+
+/* Values for Info field above */
+
+#define ACPI_IVRS_PHYSICAL_SIZE     0x00007F00 /* 7 bits, physical address 
size */
+#define ACPI_IVRS_VIRTUAL_SIZE      0x003F8000 /* 7 bits, virtual address size 
*/
+#define ACPI_IVRS_ATS_RESERVED      0x00400000 /* ATS address translation 
range reserved */
+
+/* IVRS subtable header */
+
+struct acpi_ivrs_header {
+       u8 type;                /* Subtable type */
+       u8 flags;
+       u16 length;             /* Subtable length */
+       u16 device_id;          /* ID of IOMMU */
+};
+
+/* Values for subtable Type above */
+
+enum acpi_ivrs_type {
+       ACPI_IVRS_TYPE_HARDWARE = 0x10,
+       ACPI_IVRS_TYPE_MEMORY_ALL /* _MEMORY1 */ = 0x20,
+       ACPI_IVRS_TYPE_MEMORY_ONE /* _MEMORY2 */ = 0x21,
+       ACPI_IVRS_TYPE_MEMORY_RANGE /* _MEMORY3 */ = 0x22,
+       ACPI_IVRS_TYPE_MEMORY_IOMMU = 0x23
+};
+
+/* Masks for Flags field above for IVHD subtable */
+
+#define ACPI_IVHD_TT_ENABLE         (1)
+#define ACPI_IVHD_PASS_PW           (1<<1)
+#define ACPI_IVHD_RES_PASS_PW       (1<<2)
+#define ACPI_IVHD_ISOC              (1<<3)
+#define ACPI_IVHD_IOTLB             (1<<4)
+
+/* Masks for Flags field above for IVMD subtable */
+
+#define ACPI_IVMD_UNITY             (1)
+#define ACPI_IVMD_READ              (1<<1)
+#define ACPI_IVMD_WRITE             (1<<2)
+#define ACPI_IVMD_EXCLUSION_RANGE   (1<<3)
+
+/*
+ * IVRS subtables, correspond to Type in struct acpi_ivrs_header
+ */
+
+/* 0x10: I/O Virtualization Hardware Definition Block (IVHD) */
+
+struct acpi_ivrs_hardware {
+       struct acpi_ivrs_header header;
+       u16 capability_offset;  /* Offset for IOMMU control fields */
+       u64 base_address;       /* IOMMU control registers */
+       u16 pci_segment_group;
+       u16 info;               /* MSI number and unit ID */
+       u32 reserved;
+};
+
+/* Masks for Info field above */
+
+#define ACPI_IVHD_MSI_NUMBER_MASK   0x001F     /* 5 bits, MSI message number */
+#define ACPI_IVHD_UNIT_ID_MASK      0x1F00     /* 5 bits, unit_iD */
+
+/*
+ * Device Entries for IVHD subtable, appear after struct acpi_ivrs_hardware 
structure.
+ * Upper two bits of the Type field are the (encoded) length of the structure.
+ * Currently, only 4 and 8 byte entries are defined. 16 and 32 byte entries
+ * are reserved for future use but not defined.
+ */
+struct acpi_ivrs_de_header {
+       u8 type;
+       u16 id;
+       u8 data_setting;
+};
+
+/* Length of device entry is in the top two bits of Type field above */
+
+#define ACPI_IVHD_ENTRY_LENGTH      0xC0
+
+/* Values for device entry Type field above */
+
+enum acpi_ivrs_device_entry_type {
+       /* 4-byte device entries, all use struct acpi_ivrs_device4 */
+
+       ACPI_IVRS_TYPE_PAD4 = 0,
+       ACPI_IVRS_TYPE_ALL = 1,
+       ACPI_IVRS_TYPE_SELECT = 2,
+       ACPI_IVRS_TYPE_START = 3,
+       ACPI_IVRS_TYPE_END = 4,
+
+       /* 8-byte device entries */
+
+       ACPI_IVRS_TYPE_PAD8 = 64,
+       ACPI_IVRS_TYPE_NOT_USED = 65,
+       ACPI_IVRS_TYPE_ALIAS_SELECT = 66,       /* Uses struct 
acpi_ivrs_device8a */
+       ACPI_IVRS_TYPE_ALIAS_START = 67,        /* Uses struct 
acpi_ivrs_device8a */
+       ACPI_IVRS_TYPE_EXT_SELECT = 70, /* Uses struct acpi_ivrs_device8b */
+       ACPI_IVRS_TYPE_EXT_START = 71,  /* Uses struct acpi_ivrs_device8b */
+       ACPI_IVRS_TYPE_SPECIAL = 72     /* Uses struct acpi_ivrs_device8c */
+};
+
+/* Values for Data field above */
+
+#define ACPI_IVHD_INIT_PASS         (1)
+#define ACPI_IVHD_EINT_PASS         (1<<1)
+#define ACPI_IVHD_NMI_PASS          (1<<2)
+#define ACPI_IVHD_SYSTEM_MGMT       (3<<4)
+#define ACPI_IVHD_LINT0_PASS        (1<<6)
+#define ACPI_IVHD_LINT1_PASS        (1<<7)
+
+/* Types 0-4: 4-byte device entry */
+
+struct acpi_ivrs_device4 {
+       struct acpi_ivrs_de_header header;
+};
+
+/* Types 66-67: 8-byte device entry */
+
+struct acpi_ivrs_device8a {
+       struct acpi_ivrs_de_header header;
+       u8 reserved1;
+       u16 used_id;
+       u8 reserved2;
+};
+
+/* Types 70-71: 8-byte device entry */
+
+struct acpi_ivrs_device8b {
+       struct acpi_ivrs_de_header header;
+       u32 extended_data;
+};
+
+/* Values for extended_data above */
+
+#define ACPI_IVHD_ATS_DISABLED      (1<<31)
+
+/* Type 72: 8-byte device entry */
+
+struct acpi_ivrs_device8c {
+       struct acpi_ivrs_de_header header;
+       u8 handle;
+       u16 used_id;
+       u8 variety;
+};
+
+/* Values for Variety field above */
+
+#define ACPI_IVHD_IOAPIC            1
+#define ACPI_IVHD_HPET              2
+
+/* 0x20, 0x21, 0x22: I/O Virtualization Memory Definition Block (IVMD) */
+
+struct acpi_ivrs_memory {
+       struct acpi_ivrs_header header;
+       u16 aux_data;
+       u64 reserved;
+       u64 start_address;
+       u64 memory_length;
+};
+
+/*******************************************************************************
+ *
+ * MCFG - PCI Memory Mapped Configuration table and sub-table
+ *        Version 1
+ *
+ * Conforms to "PCI Firmware Specification", Revision 3.0, June 20, 2005
+ *
+ 
******************************************************************************/
+
+struct acpi_table_mcfg {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 reserved[8];
+};
+
+/* Subtable */
+
+struct acpi_mcfg_allocation {
+       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;
+};
+
+/*******************************************************************************
+ *
+ * MCHI - Management Controller Host Interface Table
+ *        Version 1
+ *
+ * Conforms to "Management Component Transport Protocol (MCTP) Host
+ * Interface Specification", Revision 1.0.0a, October 13, 2009
+ *
+ 
******************************************************************************/
+
+struct acpi_table_mchi {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 interface_type;
+       u8 protocol;
+       u64 protocol_data;
+       u8 interrupt_type;
+       u8 gpe;
+       u8 pci_device_flag;
+       u32 global_interrupt;
+       struct acpi_generic_address control_register;
+       u8 pci_segment;
+       u8 pci_bus;
+       u8 pci_device;
+       u8 pci_function;
+};
+
+/*******************************************************************************
+ *
+ * SLIC - Software Licensing Description Table
+ *        Version 1
+ *
+ * Conforms to "OEM Activation 2.0 for Windows Vista Operating Systems",
+ * Copyright 2006
+ *
+ 
******************************************************************************/
+
+/* Basic SLIC table is only the common ACPI header */
+
+struct acpi_table_slic {
+       struct acpi_table_header header;        /* Common ACPI table header */
+};
+
+/* Common SLIC subtable header */
+
+struct acpi_slic_header {
+       u32 type;
+       u32 length;
+};
+
+/* Values for Type field above */
+
+enum acpi_slic_type {
+       ACPI_SLIC_TYPE_PUBLIC_KEY = 0,
+       ACPI_SLIC_TYPE_WINDOWS_MARKER = 1,
+       ACPI_SLIC_TYPE_RESERVED = 2     /* 2 and greater are reserved */
+};
+
+/*
+ * SLIC Sub-tables, correspond to Type in struct acpi_slic_header
+ */
+
+/* 0: Public Key Structure */
+
+struct acpi_slic_key {
+       struct acpi_slic_header header;
+       u8 key_type;
+       u8 version;
+       u16 reserved;
+       u32 algorithm;
+       char magic[4];
+       u32 bit_length;
+       u32 exponent;
+       u8 modulus[128];
+};
+
+/* 1: Windows Marker Structure */
+
+struct acpi_slic_marker {
+       struct acpi_slic_header header;
+       u32 version;
+       char oem_id[ACPI_OEM_ID_SIZE];  /* ASCII OEM identification */
+       char oem_table_id[ACPI_OEM_TABLE_ID_SIZE];      /* ASCII OEM table 
identification */
+       char windows_flag[8];
+       u32 slic_version;
+       u8 reserved[16];
+       u8 signature[128];
+};
+
+/*******************************************************************************
+ *
+ * SPCR - Serial Port Console Redirection table
+ *        Version 1
+ *
+ * Conforms to "Serial Port Console Redirection Table",
+ * Version 1.00, January 11, 2002
+ *
+ 
******************************************************************************/
+
+struct acpi_table_spcr {
+       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;
+       u8 pc_interrupt;
+       u32 interrupt;
+       u8 baud_rate;
+       u8 parity;
+       u8 stop_bits;
+       u8 flow_control;
+       u8 terminal_type;
+       u8 reserved1;
+       u16 pci_device_id;
+       u16 pci_vendor_id;
+       u8 pci_bus;
+       u8 pci_device;
+       u8 pci_function;
+       u32 pci_flags;
+       u8 pci_segment;
+       u32 reserved2;
+};
+
+/* Masks for pci_flags field above */
+
+#define ACPI_SPCR_DO_NOT_DISABLE    (1)
+
+/*******************************************************************************
+ *
+ * SPMI - Server Platform Management Interface table
+ *        Version 5
+ *
+ * Conforms to "Intelligent Platform Management Interface Specification
+ * Second Generation v2.0", Document Revision 1.0, February 12, 2004 with
+ * June 12, 2009 markup.
+ *
+ 
******************************************************************************/
+
+struct acpi_table_spmi {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 interface_type;
+       u8 reserved;            /* Must be 1 */
+       u16 spec_revision;      /* Version of IPMI */
+       u8 interrupt_type;
+       u8 gpe_number;          /* GPE assigned */
+       u8 reserved1;
+       u8 pci_device_flag;
+       u32 interrupt;
+       struct acpi_generic_address ipmi_register;
+       u8 pci_segment;
+       u8 pci_bus;
+       u8 pci_device;
+       u8 pci_function;
+       u8 reserved2;
+};
+
+/* Values for interface_type above */
+
+enum acpi_spmi_interface_types {
+       ACPI_SPMI_NOT_USED = 0,
+       ACPI_SPMI_KEYBOARD = 1,
+       ACPI_SPMI_SMI = 2,
+       ACPI_SPMI_BLOCK_TRANSFER = 3,
+       ACPI_SPMI_SMBUS = 4,
+       ACPI_SPMI_RESERVED = 5  /* 5 and above are reserved */
+};
+
+/*******************************************************************************
+ *
+ * TCPA - Trusted Computing Platform Alliance table
+ *        Version 1
+ *
+ * Conforms to "TCG PC Specific Implementation Specification",
+ * Version 1.1, August 18, 2003
+ *
+ 
******************************************************************************/
+
+struct acpi_table_tcpa {
+       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 */
+};
+
+/*******************************************************************************
+ *
+ * UEFI - UEFI Boot optimization Table
+ *        Version 1
+ *
+ * Conforms to "Unified Extensible Firmware Interface Specification",
+ * Version 2.3, May 8, 2009
+ *
+ 
******************************************************************************/
+
+struct acpi_table_uefi {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u8 identifier[16];      /* UUID identifier */
+       u16 data_offset;        /* Offset of remaining data in table */
+};
+
+/*******************************************************************************
+ *
+ * WAET - Windows ACPI Emulated devices Table
+ *        Version 1
+ *
+ * Conforms to "Windows ACPI Emulated Devices Table", version 1.0, April 6, 
2009
+ *
+ 
******************************************************************************/
+
+struct acpi_table_waet {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u32 flags;
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_WAET_RTC_NO_ACK        (1)        /* RTC requires no int 
acknowledge */
+#define ACPI_WAET_TIMER_ONE_READ    (1<<1)     /* PM timer requires only one 
read */
+
+/*******************************************************************************
+ *
+ * WDAT - Watchdog Action Table
+ *        Version 1
+ *
+ * Conforms to "Hardware Watchdog Timers Design Specification",
+ * Copyright 2006 Microsoft Corporation.
+ *
+ 
******************************************************************************/
+
+struct acpi_table_wdat {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u32 header_length;      /* Watchdog Header Length */
+       u16 pci_segment;        /* PCI Segment number */
+       u8 pci_bus;             /* PCI Bus number */
+       u8 pci_device;          /* PCI Device number */
+       u8 pci_function;        /* PCI Function number */
+       u8 reserved[3];
+       u32 timer_period;       /* Period of one timer count (msec) */
+       u32 max_count;          /* Maximum counter value supported */
+       u32 min_count;          /* Minimum counter value */
+       u8 flags;
+       u8 reserved2[3];
+       u32 entries;            /* Number of watchdog entries that follow */
+};
+
+/* Masks for Flags field above */
+
+#define ACPI_WDAT_ENABLED           (1)
+#define ACPI_WDAT_STOPPED           0x80
+
+/* WDAT Instruction Entries (actions) */
+
+struct acpi_wdat_entry {
+       u8 action;
+       u8 instruction;
+       u16 reserved;
+       struct acpi_generic_address register_region;
+       u32 value;              /* Value used with Read/Write register */
+       u32 mask;               /* Bitmask required for this register 
instruction */
+};
+
+/* Values for Action field above */
+
+enum acpi_wdat_actions {
+       ACPI_WDAT_RESET = 1,
+       ACPI_WDAT_GET_CURRENT_COUNTDOWN = 4,
+       ACPI_WDAT_GET_COUNTDOWN = 5,
+       ACPI_WDAT_SET_COUNTDOWN = 6,
+       ACPI_WDAT_GET_RUNNING_STATE = 8,
+       ACPI_WDAT_SET_RUNNING_STATE = 9,
+       ACPI_WDAT_GET_STOPPED_STATE = 10,
+       ACPI_WDAT_SET_STOPPED_STATE = 11,
+       ACPI_WDAT_GET_REBOOT = 16,
+       ACPI_WDAT_SET_REBOOT = 17,
+       ACPI_WDAT_GET_SHUTDOWN = 18,
+       ACPI_WDAT_SET_SHUTDOWN = 19,
+       ACPI_WDAT_GET_STATUS = 32,
+       ACPI_WDAT_SET_STATUS = 33,
+       ACPI_WDAT_ACTION_RESERVED = 34  /* 34 and greater are reserved */
+};
+
+/* Values for Instruction field above */
+
+enum acpi_wdat_instructions {
+       ACPI_WDAT_READ_VALUE = 0,
+       ACPI_WDAT_READ_COUNTDOWN = 1,
+       ACPI_WDAT_WRITE_VALUE = 2,
+       ACPI_WDAT_WRITE_COUNTDOWN = 3,
+       ACPI_WDAT_INSTRUCTION_RESERVED = 4,     /* 4 and greater are reserved */
+       ACPI_WDAT_PRESERVE_REGISTER = 0x80      /* Except for this value */
+};
+
+/*******************************************************************************
+ *
+ * WDDT - Watchdog Descriptor Table
+ *        Version 1
+ *
+ * Conforms to "Using the Intel ICH Family Watchdog Timer (WDT)",
+ * Version 001, September 2002
+ *
+ 
******************************************************************************/
+
+struct acpi_table_wddt {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       u16 spec_version;
+       u16 table_version;
+       u16 pci_vendor_id;
+       struct acpi_generic_address address;
+       u16 max_count;          /* Maximum counter value supported */
+       u16 min_count;          /* Minimum counter value supported */
+       u16 period;
+       u16 status;
+       u16 capability;
+};
+
+/* Flags for Status field above */
+
+#define ACPI_WDDT_AVAILABLE     (1)
+#define ACPI_WDDT_ACTIVE        (1<<1)
+#define ACPI_WDDT_TCO_OS_OWNED  (1<<2)
+#define ACPI_WDDT_USER_RESET    (1<<11)
+#define ACPI_WDDT_WDT_RESET     (1<<12)
+#define ACPI_WDDT_POWER_FAIL    (1<<13)
+#define ACPI_WDDT_UNKNOWN_RESET (1<<14)
+
+/* Flags for Capability field above */
+
+#define ACPI_WDDT_AUTO_RESET    (1)
+#define ACPI_WDDT_ALERT_SUPPORT (1<<1)
+
+/*******************************************************************************
+ *
+ * WDRT - Watchdog Resource Table
+ *        Version 1
+ *
+ * Conforms to "Watchdog Timer Hardware Requirements for Windows Server 2003",
+ * Version 1.01, August 28, 2006
+ *
+ 
******************************************************************************/
+
+struct acpi_table_wdrt {
+       struct acpi_table_header header;        /* Common ACPI table header */
+       struct acpi_generic_address control_register;
+       struct acpi_generic_address count_register;
+       u16 pci_device_id;
+       u16 pci_vendor_id;
+       u8 pci_bus;             /* PCI Bus number */
+       u8 pci_device;          /* PCI Device number */
+       u8 pci_function;        /* PCI Function number */
+       u8 pci_segment;         /* PCI Segment number */
+       u16 max_count;          /* Maximum counter value supported */
+       u8 units;
+};
+
+/* Reset to default packing */
+
+#pragma pack()
+
+#endif                         /* __ACTBL2_H__ */


Attachment: acpi-update-structs.patch
Description: Text document

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.