ACPICA: minimal patch to integrate new tables into Linux

Signed-off-by: Len Brown <len.brown@intel.com>

5 files changed, 8 insertions, 185 deletions

diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h
index 82d42b82594a..bd0fe7c6b384 100644
--- a/include/acpi/acglobal.h
+++ b/include/acpi/acglobal.h
@@ -147,6 +147,8 @@ ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_leave_wake_gpes_disabled, TRUE);
  */
 ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list;
 ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT;
+#define acpi_fadt acpi_gbl_FADT
+extern acpi_native_uint acpi_gbl_permanent_mmap;
 
 /*
  * Handle both ACPI 1.0 and ACPI 2.0 Integer widths. The integer width is
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index fdd10953b2b6..aef0e55253a9 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -59,7 +59,6 @@ acpi_evaluate_reference(acpi_handle handle,
 
 #define ACPI_BUS_FILE_ROOT      "acpi"
 extern struct proc_dir_entry *acpi_root_dir;
-extern struct fadt_descriptor acpi_fadt;
 
 enum acpi_bus_removal_type {
         ACPI_BUS_REMOVAL_NORMAL = 0,
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index aed49a5d5838..6f63b3bbc3fb 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -236,6 +236,9 @@ struct acpi_table_fadt {
         struct acpi_generic_address xgpe1_block;        /* 64-bit Extended General Purpose Event 1 Reg Blk address */
 };
 
+#define fadt_descriptor acpi_table_fadt
+#define sci_int sci_interrupt
+
 /* FADT flags */
 
 #define ACPI_FADT_WBINVD            (1) /* 00: The wbinvd instruction works properly */
@@ -289,6 +292,8 @@ enum acpi_prefered_pm_profiles {
 /*
  * Get the remaining ACPI tables
  */
+/*
+ Don't include any new tables definitions for now.
 #include <acpi/actbl1.h>
-
+*/
 #endif                          /* __ACTBL_H__ */
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
deleted file mode 100644
index 67efe6cad27b..000000000000
--- a/include/acpi/actbl2.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************
- *
- * Name: actbl2.h - ACPI Specification Revision 2.0 Tables
- *
- *****************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2006, R. Byron Moore
- * 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__
-
-/* Code moved to both actbl.h and actbl1.h */
-
-#endif                          /* __ACTBL2_H__ */
diff --git a/include/acpi/actbl71.h b/include/acpi/actbl71.h
deleted file mode 100644
index 10ac05bb36bc..000000000000
--- a/include/acpi/actbl71.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/******************************************************************************
- *
- * Name: actbl71.h - IA-64 Extensions to the ACPI Spec Rev. 0.71
- *                   This file includes tables specific to this
- *                   specification revision.
- *
- *****************************************************************************/
-
-/*
- *  Copyright (C) 2000 - 2003, R. Byron Moore
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __ACTBL71_H__
-#define __ACTBL71_H__
-
-/* 0.71 FADT address_space data item bitmasks defines */
-/* If the associated bit is zero then it is in memory space else in io space */
-
-#define SMI_CMD_ADDRESS_SPACE       0x01
-#define PM1_BLK_ADDRESS_SPACE       0x02
-#define PM2_CNT_BLK_ADDRESS_SPACE   0x04
-#define PM_TMR_BLK_ADDRESS_SPACE    0x08
-#define GPE0_BLK_ADDRESS_SPACE      0x10
-#define GPE1_BLK_ADDRESS_SPACE      0x20
-
-/* Only for clarity in declarations */
-
-typedef u64 IO_ADDRESS;
-
-#pragma pack(1)
-struct {                        /* Root System Descriptor Pointer */
-        NATIVE_CHAR signature[8];       /* contains "RSD PTR " */
-        u8 checksum;            /* to make sum of struct == 0 */
-        NATIVE_CHAR oem_id[6];  /* OEM identification */
-        u8 reserved;            /* Must be 0 for 1.0, 2 for 2.0 */
-        u64 rsdt_physical_address;      /* 64-bit physical address of RSDT */
-};
-
-/*****************************************/
-/* IA64 Extensions to ACPI Spec Rev 0.71 */
-/* for the Root System Description Table */
-/*****************************************/
-struct {
-        struct acpi_table_header header;        /* Table header */
-        u32 reserved_pad;       /* IA64 alignment, must be 0 */
-        u64 table_offset_entry[1];      /* Array of pointers to other */
-        /* tables' headers */
-};
-
-/*******************************************/
-/* IA64 Extensions to ACPI Spec Rev 0.71   */
-/* for the Firmware ACPI Control Structure */
-/*******************************************/
-struct {
-        NATIVE_CHAR signature[4];       /* signature "FACS" */
-        u32 length;             /* length of structure, in bytes */
-        u32 hardware_signature; /* hardware configuration signature */
-        u32 reserved4;          /* must be 0 */
-        u64 firmware_waking_vector;     /* ACPI OS waking vector */
-        u64 global_lock;        /* Global Lock */
-        u32 S4bios_f:1;         /* Indicates if S4BIOS support is present */
-        u32 reserved1:31;       /* must be 0 */
-        u8 reserved3[28];       /* reserved - must be zero */
-};
-
-/******************************************/
-/* IA64 Extensions to ACPI Spec Rev 0.71  */
-/* for the Fixed ACPI Description Table   */
-/******************************************/
-struct {
-        struct acpi_table_header header;        /* table header */
-        u32 reserved_pad;       /* IA64 alignment, must be 0 */
-        u64 firmware_ctrl;      /* 64-bit Physical address of FACS */
-        u64 dsdt;               /* 64-bit Physical address of DSDT */
-        u8 model;               /* System Interrupt Model */
-        u8 address_space;       /* Address Space Bitmask */
-        u16 sci_int;            /* System vector of SCI interrupt */
-        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 reserved2;           /* reserved - must be zero */
-        u64 smi_cmd;            /* Port address of SMI command port */
-        u64 pm1a_evt_blk;       /* Port address of Power Mgt 1a acpi_event Reg Blk */
-        u64 pm1b_evt_blk;       /* Port address of Power Mgt 1b acpi_event Reg Blk */
-        u64 pm1a_cnt_blk;       /* Port address of Power Mgt 1a Control Reg Blk */
-        u64 pm1b_cnt_blk;       /* Port address of Power Mgt 1b Control Reg Blk */
-        u64 pm2_cnt_blk;        /* Port address of Power Mgt 2 Control Reg Blk */
-        u64 pm_tmr_blk;         /* Port address of Power Mgt Timer Ctrl Reg Blk */
-        u64 gpe0_blk;           /* Port addr of General Purpose acpi_event 0 Reg Blk */
-        u64 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 reserved3;           /* reserved */
-        u16 plvl2_lat;          /* worst case HW latency to enter/exit C2 state */
-        u16 plvl3_lat;          /* worst case HW latency to enter/exit C3 state */
-        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 */
-        u8 reserved4;           /* reserved */
-        u32 flush_cash:1;       /* PAL_FLUSH_CACHE is correctly supported */
-        u32 reserved5:1;        /* reserved - must be zero */
-        u32 proc_c1:1;          /* all processors support C1 state */
-        u32 plvl2_up:1;         /* C2 state works on MP system */
-        u32 pwr_button:1;       /* Power button is handled as a generic feature */
-        u32 sleep_button:1;     /* Sleep button is handled as a generic feature, or not present */
-        u32 fixed_rTC:1;        /* RTC wakeup stat not in fixed register space */
-        u32 rtcs4:1;            /* RTC wakeup stat not possible from S4 */
-        u32 tmr_val_ext:1;      /* tmr_val is 32 bits */
-        u32 dock_cap:1;         /* Supports Docking */
-        u32 reserved6:22;       /* reserved - must be zero */
-};
-
-#pragma pack()
-
-#endif                          /* __ACTBL71_H__ */