ACPI: Interpreter update to 20030328

- Add APIs to add and remove GPE Block devices
- Clean up problems with semaphore acquisition from the ISR

6 files changed, 49 insertions, 22 deletions

diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index c68b7280ba47..2a8c7f85d2f7 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -72,7 +72,7 @@
 
 /* Version string */
 
-#define ACPI_CA_VERSION                 0x20030321
+#define ACPI_CA_VERSION                 0x20030328
 
 /* Version of ACPI supported */
 
diff --git a/include/acpi/acevents.h b/include/acpi/acevents.h
index 9071567435a6..f23360115e83 100644
--- a/include/acpi/acevents.h
+++ b/include/acpi/acevents.h
@@ -126,6 +126,19 @@ acpi_status
 acpi_ev_gpe_initialize (
 	void);
 
+acpi_status
+acpi_ev_create_gpe_block (
+	struct acpi_namespace_node      *gpe_device,
+	struct acpi_generic_address     *gpe_block_address,
+	u32                             register_count,
+	u8                              gpe_block_base_number,
+	u32                             interrupt_level,
+	struct acpi_gpe_block_info      **return_gpe_block);
+
+acpi_status
+acpi_ev_delete_gpe_block (
+	struct acpi_gpe_block_info      *gpe_block);
+
 u32
 acpi_ev_gpe_dispatch (
 	struct acpi_gpe_event_info      *gpe_event_info,
diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h
index f9f80c0e61e1..911283ffed90 100644
--- a/include/acpi/aclocal.h
+++ b/include/acpi/aclocal.h
@@ -340,6 +340,7 @@ struct acpi_gpe_block_info
 {
 	struct acpi_gpe_block_info              *previous;
 	struct acpi_gpe_block_info              *next;
+	struct acpi_gpe_xrupt_info              *xrupt_block;   /* Backpointer to interrupt block */
 	struct acpi_gpe_register_info           *register_info; /* One per GPE register pair */
 	struct acpi_gpe_event_info              *event_info;    /* One for each GPE */
 	struct acpi_generic_address             block_address;  /* Base address of the block */
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 356e34ac98c4..58c6d1500417 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -77,19 +77,6 @@ struct acpi_signal_fatal_info
 
 
 /*
- * Types specific to the OS service interfaces
- */
-
-typedef u32
-(ACPI_SYSTEM_XFACE *OSD_HANDLER) (
-	void                            *context);
-
-typedef void
-(ACPI_SYSTEM_XFACE *OSD_EXECUTION_CALLBACK) (
-	void                            *context);
-
-
-/*
  * OSL Initialization and shutdown primitives
  */
 
@@ -165,9 +152,6 @@ acpi_os_release_lock (
 	acpi_handle                     handle,
 	u32                             flags);
 
-#define ACPI_NOT_ISR        1
-#define ACPI_ISR            0
-
 
 /*
  * Memory allocation and mapping
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 8809b85beb9b..aa97e22aeb0d 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -348,14 +348,28 @@ acpi_disable_gpe (
 acpi_status
 acpi_clear_gpe (
 	acpi_handle                     gpe_device,
-	u32                             gpe_number);
+	u32                             gpe_number,
+	u32                             flags);
 
 acpi_status
 acpi_get_gpe_status (
 	acpi_handle                     gpe_device,
 	u32                             gpe_number,
+	u32                             flags,
 	acpi_event_status               *event_status);
 
+acpi_status
+acpi_install_gpe_block (
+	acpi_handle                     gpe_device,
+	struct acpi_generic_address     *gpe_block_address,
+	u32                             register_count,
+	u32                             interrupt_level);
+
+acpi_status
+acpi_remove_gpe_block (
+	acpi_handle                     gpe_device);
+
+
 /*
  * Resource interfaces
  */
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 02fc0054a286..d19ff567b92f 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -516,7 +516,7 @@ typedef u32                                     acpi_object_type;
 
 
 /*
- * acpi_event Types: Fixed & General Purpose
+ * Acpi Event Types: Fixed & General Purpose
  */
 typedef u32                                     acpi_event_type;
 
@@ -539,10 +539,13 @@ typedef u32                                     acpi_event_type;
 #define ACPI_EVENT_EDGE_TRIGGERED       2
 
 /*
- * GPEs
+ * Flags for GPE and Lock interfaces
  */
-#define ACPI_EVENT_WAKE_ENABLE          0x1
-#define ACPI_EVENT_WAKE_DISABLE         0x1
+#define ACPI_EVENT_WAKE_ENABLE          0x2
+#define ACPI_EVENT_WAKE_DISABLE         0x2
+
+#define ACPI_NOT_ISR                    0x1
+#define ACPI_ISR                        0x0
 
 
 /*
@@ -749,6 +752,18 @@ struct acpi_system_info
 
 
 /*
+ * Types specific to the OS service interfaces
+ */
+
+typedef u32
+(ACPI_SYSTEM_XFACE *OSD_HANDLER) (
+	void                            *context);
+
+typedef void
+(ACPI_SYSTEM_XFACE *OSD_EXECUTION_CALLBACK) (
+	void                            *context);
+
+/*
  * Various handlers and callback procedures
  */
 typedef