ACPI: ACPICA 20060331

Implemented header file support for the following
additional ACPI tables: ASF!, BOOT, CPEP, DBGP, MCFG, SPCR,
SPMI, TCPA, and WDRT. With this support, all current and
known ACPI tables are now defined in the ACPICA headers and
are available for use by device drivers and other software.

Implemented support to allow tables that contain ACPI
names with invalid characters to be loaded. Previously,
this would cause the table load to fail, but since
there are several known cases of such tables on
existing machines, this change was made to enable
ACPI support for them. Also, this matches the
behavior of the Microsoft ACPI implementation.
https://bugzilla.novell.com/show_bug.cgi?id=147621

Fixed a couple regressions introduced during the memory
optimization in the 20060317 release. The namespace
node definition required additional reorganization and
an internal datatype that had been changed to 8-bit was
restored to 32-bit. (Valery Podrezov)

Fixed a problem where a null pointer passed to
acpi_ut_delete_generic_state() could be passed through
to acpi_os_release_object which is unexpected. Such
null pointers are now trapped and ignored, matching
the behavior of the previous implementation before the
deployment of acpi_os_release_object().  (Valery Podrezov,
Fiodor Suietov)

Fixed a memory mapping leak during the deletion of
a SystemMemory operation region where a cached memory
mapping was not deleted. This became a noticeable problem
for operation regions that are defined within frequently
used control methods. (Dana Meyers)

Reorganized the ACPI table header files into two main
files: one for the ACPI tables consumed by the ACPICA core,
and another for the miscellaneous ACPI tables that are
consumed by the drivers and other software. The various
FADT definitions were merged into one common section and
three different tables (ACPI 1.0, 1.0+, and 2.0)

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 227 insertions, 173 deletions

diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index ed53f842dad4..e1a40135f707 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Name: actbl.h - Table data structures defined in ACPI specification
+ * Name: actbl.h - Basic ACPI Table Definitions
  *
  *****************************************************************************/
 
@@ -45,66 +45,45 @@
 #define __ACTBL_H__
 
 /*
- * 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.
- */
-
-/*
- *  Values for description table header signatures
+ * Values for description table header signatures. Useful because they make
+ * it more difficult to inadvertently type in the wrong signature.
  */
-#define RSDP_NAME               "RSDP"
-#define RSDP_SIG                "RSD PTR "      /* RSDT Pointer signature */
-#define APIC_SIG                "APIC"  /* Multiple APIC Description Table */
 #define DSDT_SIG                "DSDT"  /* Differentiated System Description Table */
 #define FADT_SIG                "FACP"  /* Fixed ACPI Description Table */
 #define FACS_SIG                "FACS"  /* Firmware ACPI Control Structure */
 #define PSDT_SIG                "PSDT"  /* Persistent System Description Table */
+#define RSDP_SIG                "RSD PTR "      /* Root System Description Pointer */
 #define RSDT_SIG                "RSDT"  /* Root System Description Table */
 #define XSDT_SIG                "XSDT"  /* Extended  System Description Table */
 #define SSDT_SIG                "SSDT"  /* Secondary System Description Table */
-#define SBST_SIG                "SBST"  /* Smart Battery Specification Table */
-#define SPIC_SIG                "SPIC"  /* IOSAPIC table */
-#define BOOT_SIG                "BOOT"  /* Boot table */
-
-#define GL_OWNED                0x02    /* Ownership of global lock is bit 1 */
+#define RSDP_NAME               "RSDP"
 
 /*
- * Common table types.  The base code can remain
- * constant if the underlying tables are changed
+ * All tables and structures must be byte-packed to match the ACPI
+ * specification, since the tables are provided by the system BIOS
  */
-#define RSDT_DESCRIPTOR         struct rsdt_descriptor_rev2
-#define XSDT_DESCRIPTOR         struct xsdt_descriptor_rev2
-#define FACS_DESCRIPTOR         struct facs_descriptor_rev2
-#define FADT_DESCRIPTOR         struct fadt_descriptor_rev2
-
 #pragma pack(1)
 
 /*
- * ACPI Version-independent tables
+ * 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: The tables that are specific to ACPI versions (1.0, 2.0, etc.)
- * are in separate files.
+ * 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.
  */
-struct rsdp_descriptor {        /* Root System Descriptor Pointer */
-        char signature[8];      /* ACPI signature, contains "RSD PTR " */
-        u8 checksum;            /* ACPI 1.0 checksum */
-        char oem_id[6];         /* OEM identification */
-        u8 revision;            /* Must be (0) for ACPI 1.0 or (2) for ACPI 2.0+ */
-        u32 rsdt_physical_address;      /* 32-bit physical address of the RSDT */
-        u32 length;             /* XSDT Length in bytes, including header */
-        u64 xsdt_physical_address;      /* 64-bit physical address of the XSDT */
-        u8 extended_checksum;   /* Checksum of entire table (ACPI 2.0) */
-        char reserved[3];       /* Reserved, must be zero */
-};
 
-struct acpi_common_facs {       /* Common FACS for internal use */
-        u32 *global_lock;
-        u64 *firmware_waking_vector;
-        u8 vector_width;
-};
+/*******************************************************************************
+ *
+ * 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
+ *
+ ******************************************************************************/
 
-#define ACPI_TABLE_HEADER_DEF   /* ACPI common table header */ \
+#define ACPI_TABLE_HEADER_DEF \
         char                            signature[4];           /* ASCII table signature */\
         u32                             length;                 /* Length of table in bytes, including this header */\
         u8                              revision;               /* ACPI Specification minor version # */\
@@ -112,154 +91,239 @@ struct acpi_common_facs {	/* Common FACS for internal use */
         char                            oem_id[6];              /* ASCII OEM identification */\
         char                            oem_table_id[8];        /* ASCII OEM table identification */\
         u32                             oem_revision;           /* OEM revision number */\
-        char                            asl_compiler_id [4];    /* ASCII ASL compiler vendor ID */\
+        char                            asl_compiler_id[4];     /* ASCII ASL compiler vendor ID */\
         u32                             asl_compiler_revision;  /* ASL compiler version */
 
-struct acpi_table_header {      /* ACPI common table header */
+struct acpi_table_header {
 ACPI_TABLE_HEADER_DEF};
 
 /*
- * MADT values and structures
+ * GAS - Generic Address Structure (ACPI 2.0+)
  */
+struct acpi_generic_address {
+        u8 address_space_id;    /* Address space where struct or register exists */
+        u8 register_bit_width;  /* Size in bits of given register */
+        u8 register_bit_offset; /* Bit offset within the register */
+        u8 access_width;        /* Minimum Access size (ACPI 3.0) */
+        u64 address;            /* 64-bit address of struct or register */
+};
 
-/* Values for MADT PCATCompat */
+/*******************************************************************************
+ *
+ * RSDP - Root System Description Pointer (Signature is "RSD PTR ")
+ *
+ ******************************************************************************/
+
+struct rsdp_descriptor {
+        char signature[8];      /* ACPI signature, contains "RSD PTR " */
+        u8 checksum;            /* ACPI 1.0 checksum */
+        char oem_id[6];         /* OEM identification */
+        u8 revision;            /* Must be (0) for ACPI 1.0 or (2) for ACPI 2.0+ */
+        u32 rsdt_physical_address;      /* 32-bit physical address of the RSDT */
+        u32 length;             /* Table length in bytes, including header (ACPI 2.0+) */
+        u64 xsdt_physical_address;      /* 64-bit physical address of the XSDT (ACPI 2.0+) */
+        u8 extended_checksum;   /* Checksum of entire table (ACPI 2.0+) */
+        u8 reserved[3];         /* Reserved, must be zero */
+};
 
-#define DUAL_PIC                0
-#define MULTIPLE_APIC           1
+#define ACPI_RSDP_REV0_SIZE     20      /* Size of original ACPI 1.0 RSDP */
 
-/* Master MADT */
+/*******************************************************************************
+ *
+ * RSDT/XSDT - Root System Description Tables
+ *
+ ******************************************************************************/
 
-struct multiple_apic_table {
-        ACPI_TABLE_HEADER_DEF   /* ACPI common table header */
-        u32 local_apic_address; /* Physical address of local APIC */
+struct rsdt_descriptor {
+        ACPI_TABLE_HEADER_DEF u32 table_offset_entry[1];        /* Array of pointers to ACPI tables */
+};
+
+struct xsdt_descriptor {
+        ACPI_TABLE_HEADER_DEF u64 table_offset_entry[1];        /* Array of pointers to ACPI tables */
+};
+
+/*******************************************************************************
+ *
+ * FACS - Firmware ACPI Control Structure (FACS)
+ *
+ ******************************************************************************/
+
+struct facs_descriptor {
+        char signature[4];      /* ASCII table signature */
+        u32 length;             /* Length of structure, in bytes */
+        u32 hardware_signature; /* Hardware configuration signature */
+        u32 firmware_waking_vector;     /* 32-bit physical address of the Firmware Waking Vector */
+        u32 global_lock;        /* Global Lock for shared hardware resources */
 
         /* Flags (32 bits) */
 
-        u8 PCATcompat:1;        /* 00:    System also has dual 8259s */
+        u8 S4bios_f:1;          /* 00:    S4BIOS support is present */
          u8:7;                  /* 01-07: Reserved, must be zero */
         u8 reserved1[3];        /* 08-31: Reserved, must be zero */
-};
 
-/* Values for Type in APIC_HEADER_DEF */
+        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 */
+};
 
-#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_GLOCK_PENDING      0x01    /* 00: Pending global lock ownership */
+#define ACPI_GLOCK_OWNED        0x02    /* 01: Global lock is owned */
 
 /*
- * MADT sub-structures (Follow MULTIPLE_APIC_DESCRIPTION_TABLE)
+ * Common FACS - This is a version-independent FACS structure used for internal use only
  */
-#define APIC_HEADER_DEF                     /* Common APIC sub-structure header */\
-        u8                              type; \
-        u8                              length;
-
-struct apic_header {
-APIC_HEADER_DEF};
-
-/* 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
-
-/* Common flag definitions (16 bits each) */
-
-#define MPS_INTI_FLAGS \
-        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 LOCAL_APIC_FLAGS \
-        u8                              processor_enabled: 1;   /* 00:    Processor is usable if set */\
-        u8                                              : 7;    /* 01-07: Reserved, must be zero */\
-        u8                              reserved2;      /* 08-15: Reserved, must be zero */
-
-/* Sub-structures for MADT */
-
-struct madt_processor_apic {
-        APIC_HEADER_DEF u8 processor_id;        /* ACPI processor id */
-        u8 local_apic_id;       /* Processor's local APIC id */
- LOCAL_APIC_FLAGS};
-
-struct madt_io_apic {
-        APIC_HEADER_DEF u8 io_apic_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 */
+struct acpi_common_facs {
+        u32 *global_lock;
+        u64 *firmware_waking_vector;
+        u8 vector_width;
 };
 
-struct madt_interrupt_override {
-        APIC_HEADER_DEF u8 bus; /* 0 - ISA */
-        u8 source;              /* Interrupt source (IRQ) */
-        u32 interrupt;          /* Global system interrupt */
- MPS_INTI_FLAGS};
+/*******************************************************************************
+ *
+ * FADT - Fixed ACPI Description Table (Signature "FACP")
+ *
+ ******************************************************************************/
+
+/* Fields common to all versions of the FADT */
+
+#define ACPI_FADT_COMMON \
+        ACPI_TABLE_HEADER_DEF \
+        u32                             V1_firmware_ctrl;   /* 32-bit physical address of FACS */ \
+        u32                             V1_dsdt;            /* 32-bit physical address of DSDT */ \
+        u8                              reserved1;          /* System Interrupt Model isn't used in ACPI 2.0*/ \
+        u8                              prefer_PM_profile;  /* Conveys preferred power management profile to OSPM. */ \
+        u16                             sci_int;            /* System vector of SCI interrupt */ \
+        u32                             smi_cmd;            /* Port address of SMI command port */ \
+        u8                              acpi_enable;        /* Value to write to smi_cmd to enable ACPI */ \
+        u8                              acpi_disable;       /* Value to write to smi_cmd to disable ACPI */ \
+        u8                              S4bios_req;         /* Value to write to SMI CMD to enter S4BIOS state */ \
+        u8                              pstate_cnt;         /* Processor performance state control*/ \
+        u32                             V1_pm1a_evt_blk;    /* Port address of Power Mgt 1a Event Reg Blk */ \
+        u32                             V1_pm1b_evt_blk;    /* Port address of Power Mgt 1b Event Reg Blk */ \
+        u32                             V1_pm1a_cnt_blk;    /* Port address of Power Mgt 1a Control Reg Blk */ \
+        u32                             V1_pm1b_cnt_blk;    /* Port address of Power Mgt 1b Control Reg Blk */ \
+        u32                             V1_pm2_cnt_blk;     /* Port address of Power Mgt 2 Control Reg Blk */ \
+        u32                             V1_pm_tmr_blk;      /* Port address of Power Mgt Timer Ctrl Reg Blk */ \
+        u32                             V1_gpe0_blk;        /* Port addr of General Purpose acpi_event 0 Reg Blk */ \
+        u32                             V1_gpe1_blk;        /* Port addr of General Purpose acpi_event 1 Reg Blk */ \
+        u8                              pm1_evt_len;        /* Byte length of ports at pm1_x_evt_blk */ \
+        u8                              pm1_cnt_len;        /* Byte length of ports at pm1_x_cnt_blk */ \
+        u8                              pm2_cnt_len;        /* Byte Length of ports at pm2_cnt_blk */ \
+        u8                              pm_tm_len;          /* Byte Length of ports at pm_tm_blk */ \
+        u8                              gpe0_blk_len;       /* Byte Length of ports at gpe0_blk */ \
+        u8                              gpe1_blk_len;       /* Byte Length of ports at gpe1_blk */ \
+        u8                              gpe1_base;          /* Offset in gpe model where gpe1 events start */ \
+        u8                              cst_cnt;            /* Support for the _CST object and C States change notification.*/ \
+        u16                             plvl2_lat;          /* Worst case HW latency to enter/exit C2 state */ \
+        u16                             plvl3_lat;          /* Worst case HW latency to enter/exit C3 state */ \
+        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's duty cycle index in processor's P_CNT reg*/ \
+        u8                              duty_width;         /* Processor's duty cycle value bit width in P_CNT register.*/ \
+        u8                              day_alrm;           /* Index to day-of-month alarm in RTC CMOS RAM */ \
+        u8                              mon_alrm;           /* Index to month-of-year alarm in RTC CMOS RAM */ \
+        u8                              century;            /* Index to century in RTC CMOS RAM */ \
+        u16                             iapc_boot_arch;     /* IA-PC Boot Architecture Flags. See Table 5-10 for description*/ \
+        u8                              reserved2;          /* Reserved, must be zero */
 
-struct madt_nmi_source {
-        APIC_HEADER_DEF MPS_INTI_FLAGS u32 interrupt;   /* Global system interrupt */
+/*
+ * ACPI 2.0+ FADT
+ */
+struct fadt_descriptor {
+        ACPI_FADT_COMMON
+            /* Flags (32 bits) */
+        u8 wb_invd:1;           /* 00:    The wbinvd instruction works properly */
+        u8 wb_invd_flush:1;     /* 01:    The wbinvd flushes but does not invalidate */
+        u8 proc_c1:1;           /* 02:    All processors support C1 state */
+        u8 plvl2_up:1;          /* 03:    C2 state works on MP system */
+        u8 pwr_button:1;        /* 04:    Power button is handled as a generic feature */
+        u8 sleep_button:1;      /* 05:    Sleep button is handled as a generic feature, or not present */
+        u8 fixed_rTC:1;         /* 06:    RTC wakeup stat not in fixed register space */
+        u8 rtcs4:1;             /* 07:    RTC wakeup stat not possible from S4 */
+        u8 tmr_val_ext:1;       /* 08:    tmr_val is 32 bits 0=24-bits */
+        u8 dock_cap:1;          /* 09:    Docking supported */
+        u8 reset_reg_sup:1;     /* 10:    System reset via the FADT RESET_REG supported */
+        u8 sealed_case:1;       /* 11:    No internal expansion capabilities and case is sealed */
+        u8 headless:1;          /* 12:    No local video capabilities or local input devices */
+        u8 cpu_sw_sleep:1;      /* 13:    Must execute native instruction after writing SLP_TYPx register */
+
+        u8 pci_exp_wak:1;       /* 14:    System supports PCIEXP_WAKE (STS/EN) bits (ACPI 3.0) */
+        u8 use_platform_clock:1;        /* 15:    OSPM should use platform-provided timer (ACPI 3.0) */
+        u8 S4rtc_sts_valid:1;   /* 16:    Contents of RTC_STS valid after S4 wake (ACPI 3.0) */
+        u8 remote_power_on_capable:1;   /* 17:    System is compatible with remote power on (ACPI 3.0) */
+        u8 force_apic_cluster_model:1;  /* 18:    All local APICs must use cluster model (ACPI 3.0) */
+        u8 force_apic_physical_destination_mode:1;      /* 19:   all local x_aPICs must use physical dest mode (ACPI 3.0) */
+         u8:4;                  /* 20-23: Reserved, must be zero */
+        u8 reserved3;           /* 24-31: Reserved, must be zero */
+
+        struct acpi_generic_address reset_register;     /* Reset register address in GAS format */
+        u8 reset_value;         /* Value to write to the reset_register port to reset the system */
+        u8 reserved4[3];        /* These three bytes must be zero */
+        u64 xfirmware_ctrl;     /* 64-bit physical address of FACS */
+        u64 Xdsdt;              /* 64-bit physical address of DSDT */
+        struct acpi_generic_address xpm1a_evt_blk;      /* Extended Power Mgt 1a acpi_event Reg Blk address */
+        struct acpi_generic_address xpm1b_evt_blk;      /* Extended Power Mgt 1b acpi_event Reg Blk address */
+        struct acpi_generic_address xpm1a_cnt_blk;      /* Extended Power Mgt 1a Control Reg Blk address */
+        struct acpi_generic_address xpm1b_cnt_blk;      /* Extended Power Mgt 1b Control Reg Blk address */
+        struct acpi_generic_address xpm2_cnt_blk;       /* Extended Power Mgt 2 Control Reg Blk address */
+        struct acpi_generic_address xpm_tmr_blk;        /* Extended Power Mgt Timer Ctrl Reg Blk address */
+        struct acpi_generic_address xgpe0_blk;  /* Extended General Purpose acpi_event 0 Reg Blk address */
+        struct acpi_generic_address xgpe1_blk;  /* Extended General Purpose acpi_event 1 Reg Blk address */
 };
 
-struct madt_local_apic_nmi {
-        APIC_HEADER_DEF u8 processor_id;        /* ACPI processor id */
-        MPS_INTI_FLAGS u8 lint; /* LINTn to which NMI is connected */
+/*
+ * "Down-revved" ACPI 2.0 FADT descriptor
+ * Defined here to allow compiler to generate the length of the struct
+ */
+struct fadt_descriptor_rev2_minus {
+        ACPI_FADT_COMMON u32 flags;
+        struct acpi_generic_address reset_register;     /* Reset register address in GAS format */
+        u8 reset_value;         /* Value to write to the reset_register port to reset the system. */
+        u8 reserved7[3];        /* Reserved, must be zero */
 };
 
-struct madt_address_override {
-        APIC_HEADER_DEF u16 reserved;   /* Reserved, must be zero */
-        u64 address;            /* APIC physical address */
+/*
+ * ACPI 1.0 FADT
+ * Defined here to allow compiler to generate the length of the struct
+ */
+struct fadt_descriptor_rev1 {
+        ACPI_FADT_COMMON u32 flags;
 };
 
-struct madt_io_sapic {
-        APIC_HEADER_DEF u8 io_sapic_id; /* I/O SAPIC ID */
-        u8 reserved;            /* Reserved, must be zero */
-        u32 interrupt_base;     /* Glocal interrupt for SAPIC start */
-        u64 address;            /* SAPIC physical address */
-};
+/* FADT: Prefered Power Management Profiles */
 
-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 */
-        u8 reserved[3];         /* Reserved, must be zero */
-         LOCAL_APIC_FLAGS u32 processor_uID;    /* Numeric UID - ACPI 3.0 */
-        char processor_uIDstring[1];    /* String UID  - ACPI 3.0 */
-};
+#define PM_UNSPECIFIED                  0
+#define PM_DESKTOP                      1
+#define PM_MOBILE                       2
+#define PM_WORKSTATION                  3
+#define PM_ENTERPRISE_SERVER            4
+#define PM_SOHO_SERVER                  5
+#define PM_APPLIANCE_PC                 6
 
-struct madt_interrupt_source {
-        APIC_HEADER_DEF MPS_INTI_FLAGS u8 interrupt_type;       /* 1=PMI, 2=INIT, 3=corrected */
-        u8 processor_id;        /* Processor ID */
-        u8 processor_eid;       /* Processor EID */
-        u8 io_sapic_vector;     /* Vector value for PMI interrupts */
-        u32 interrupt;          /* Global system interrupt */
-        u32 flags;              /* Interrupt Source Flags */
-};
+/* FADT: Boot Arch Flags */
 
-/*
- * Smart Battery
- */
-struct smart_battery_table {
-        ACPI_TABLE_HEADER_DEF u32 warning_level;
-        u32 low_level;
-        u32 critical_level;
-};
+#define BAF_LEGACY_DEVICES              0x0001
+#define BAF_8042_KEYBOARD_CONTROLLER    0x0002
+
+#define FADT2_REVISION_ID               3
+#define FADT2_MINUS_REVISION_ID         2
+
+/* Reset to default packing */
 
 #pragma pack()
 
 /*
+ * This macro is temporary until the table bitfield flag definitions
+ * are removed and replaced by a Flags field.
+ */
+#define ACPI_FLAG_OFFSET(d,f,o)         (u8) (ACPI_OFFSET (d,f) + \
+                          sizeof(((d *)0)->f) + o)
+/*
+ * Get the remaining ACPI tables
+ */
+#include "actbl1.h"
+
+/*
  * ACPI Table information.  We save the table address, length,
  * and type of memory allocation (mapped or allocated) for each
  * table for 1) when we exit, and 2) if a new table is installed
@@ -290,27 +354,17 @@ struct acpi_table_support {
         u8 flags;
 };
 
-/*
- * Get the ACPI version-specific tables
- */
-#include "actbl1.h"             /* Acpi 1.0 table definitions */
-#include "actbl2.h"             /* Acpi 2.0 table definitions */
-
 extern u8 acpi_fadt_is_v1;      /* is set to 1 if FADT is revision 1,
                                  * needed for certain workarounds */
+/* Macros used to generate offsets to specific table fields */
 
-#pragma pack(1)
-/*
- * High performance timer
- */
-struct hpet_table {
-        ACPI_TABLE_HEADER_DEF u32 hardware_id;
-        struct acpi_generic_address base_address;
-        u8 hpet_number;
-        u16 clock_tick;
-        u8 attributes;
-};
+#define ACPI_FACS_OFFSET(f)             (u8) ACPI_OFFSET (struct facs_descriptor,f)
+#define ACPI_FADT_OFFSET(f)             (u8) ACPI_OFFSET (struct fadt_descriptor, f)
+#define ACPI_GAS_OFFSET(f)              (u8) ACPI_OFFSET (struct acpi_generic_address,f)
+#define ACPI_HDR_OFFSET(f)              (u8) ACPI_OFFSET (struct acpi_table_header,f)
+#define ACPI_RSDP_OFFSET(f)             (u8) ACPI_OFFSET (struct rsdp_descriptor,f)
 
-#pragma pack()
+#define ACPI_FADT_FLAG_OFFSET(f,o)      ACPI_FLAG_OFFSET (struct fadt_descriptor,f,o)
+#define ACPI_FACS_FLAG_OFFSET(f,o)      ACPI_FLAG_OFFSET (struct facs_descriptor,f,o)
 
 #endif                          /* __ACTBL_H__ */