ACPICA: Store GPE number instead of bitmask

[linux-2.6-omap-h63xx.git] / drivers / acpi / utilities / utinit.c

diff --git a/drivers/acpi/utilities/utinit.c b/drivers/acpi/utilities/utinit.c
index ba771b4f39bcde6b64b005705bf4ab4f628d9f8b..2d2c4a3aeaae4a0a08bf85e961192a825c92b0d7 100644 (file)
--- a/drivers/acpi/utilities/utinit.c
+++ b/drivers/acpi/utilities/utinit.c
@@ -44,13 +44,14 @@
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
+#include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utinit")
 
 /* Local prototypes */
 static void
-acpi_ut_fadt_register_error(char *register_name, u32 value, acpi_size offset);
+acpi_ut_fadt_register_error(char *register_name, u32 value, u8 offset);
 
 static void acpi_ut_terminate(void);
 
@@ -69,12 +70,12 @@ static void acpi_ut_terminate(void);
  ******************************************************************************/
 
 static void
-acpi_ut_fadt_register_error(char *register_name, u32 value, acpi_size offset)
+acpi_ut_fadt_register_error(char *register_name, u32 value, u8 offset)
 {
 
        ACPI_WARNING((AE_INFO,
-                     "Invalid FADT value %s=%X at offset %X FADT=%p",
-                     register_name, value, (u32) offset, acpi_gbl_FADT));
+                     "Invalid FADT value %s=%X at offset %X in FADT=%p",
+                     register_name, value, offset, &acpi_gbl_FADT));
 }
 
 /******************************************************************************
@@ -96,62 +97,70 @@ acpi_status acpi_ut_validate_fadt(void)
         * Verify Fixed ACPI Description Table fields,
         * but don't abort on any problems, just display error
         */
-       if (acpi_gbl_FADT->pm1_evt_len < 4) {
+       if (acpi_gbl_FADT.pm1_event_length < 4) {
                acpi_ut_fadt_register_error("PM1_EVT_LEN",
-                                           (u32) acpi_gbl_FADT->pm1_evt_len,
-                                           ACPI_FADT_OFFSET(pm1_evt_len));
+                                           (u32) acpi_gbl_FADT.
+                                           pm1_event_length,
+                                           ACPI_FADT_OFFSET(pm1_event_length));
        }
 
-       if (!acpi_gbl_FADT->pm1_cnt_len) {
+       if (!acpi_gbl_FADT.pm1_control_length) {
                acpi_ut_fadt_register_error("PM1_CNT_LEN", 0,
-                                           ACPI_FADT_OFFSET(pm1_cnt_len));
+                                           ACPI_FADT_OFFSET
+                                           (pm1_control_length));
        }
 
-       if (!acpi_gbl_FADT->xpm1a_evt_blk.address) {
+       if (!acpi_gbl_FADT.xpm1a_event_block.address) {
                acpi_ut_fadt_register_error("X_PM1a_EVT_BLK", 0,
-                                           ACPI_FADT_OFFSET(xpm1a_evt_blk.
+                                           ACPI_FADT_OFFSET(xpm1a_event_block.
                                                             address));
        }
 
-       if (!acpi_gbl_FADT->xpm1a_cnt_blk.address) {
+       if (!acpi_gbl_FADT.xpm1a_control_block.address) {
                acpi_ut_fadt_register_error("X_PM1a_CNT_BLK", 0,
-                                           ACPI_FADT_OFFSET(xpm1a_cnt_blk.
-                                                            address));
+                                           ACPI_FADT_OFFSET
+                                           (xpm1a_control_block.address));
        }
 
-       if (!acpi_gbl_FADT->xpm_tmr_blk.address) {
+       if (!acpi_gbl_FADT.xpm_timer_block.address) {
                acpi_ut_fadt_register_error("X_PM_TMR_BLK", 0,
-                                           ACPI_FADT_OFFSET(xpm_tmr_blk.
+                                           ACPI_FADT_OFFSET(xpm_timer_block.
                                                             address));
        }
 
-       if ((acpi_gbl_FADT->xpm2_cnt_blk.address &&
-            !acpi_gbl_FADT->pm2_cnt_len)) {
+       if ((acpi_gbl_FADT.xpm2_control_block.address &&
+            !acpi_gbl_FADT.pm2_control_length)) {
                acpi_ut_fadt_register_error("PM2_CNT_LEN",
-                                           (u32) acpi_gbl_FADT->pm2_cnt_len,
-                                           ACPI_FADT_OFFSET(pm2_cnt_len));
+                                           (u32) acpi_gbl_FADT.
+                                           pm2_control_length,
+                                           ACPI_FADT_OFFSET
+                                           (pm2_control_length));
        }
 
-       if (acpi_gbl_FADT->pm_tm_len < 4) {
+       if (acpi_gbl_FADT.pm_timer_length < 4) {
                acpi_ut_fadt_register_error("PM_TM_LEN",
-                                           (u32) acpi_gbl_FADT->pm_tm_len,
-                                           ACPI_FADT_OFFSET(pm_tm_len));
+                                           (u32) acpi_gbl_FADT.pm_timer_length,
+                                           ACPI_FADT_OFFSET(pm_timer_length));
        }
 
        /* Length of GPE blocks must be a multiple of 2 */
 
-       if (acpi_gbl_FADT->xgpe0_blk.address &&
-           (acpi_gbl_FADT->gpe0_blk_len & 1)) {
+       if (acpi_gbl_FADT.xgpe0_block.address &&
+           (acpi_gbl_FADT.gpe0_block_length & 1)) {
                acpi_ut_fadt_register_error("(x)GPE0_BLK_LEN",
-                                           (u32) acpi_gbl_FADT->gpe0_blk_len,
-                                           ACPI_FADT_OFFSET(gpe0_blk_len));
+                                           (u32) acpi_gbl_FADT.
+                                           gpe0_block_length,
+                                           ACPI_FADT_OFFSET
+                                           (gpe0_block_length));
        }
 
-       if (acpi_gbl_FADT->xgpe1_blk.address &&
-           (acpi_gbl_FADT->gpe1_blk_len & 1)) {
+       if (acpi_gbl_FADT.xgpe1_block.address &&
+           (acpi_gbl_FADT.gpe1_block_length & 1)) {
                acpi_ut_fadt_register_error("(x)GPE1_BLK_LEN",
-                                           (u32) acpi_gbl_FADT->gpe1_blk_len,
-                                           ACPI_FADT_OFFSET(gpe1_blk_len));
+                                           (u32) acpi_gbl_FADT.
+                                           gpe1_block_length,
+                                           ACPI_FADT_OFFSET
+                                           (gpe1_block_length));
        }
 
        return (AE_OK);
@@ -176,9 +185,8 @@ static void acpi_ut_terminate(void)
        struct acpi_gpe_xrupt_info *gpe_xrupt_info;
        struct acpi_gpe_xrupt_info *next_gpe_xrupt_info;
 
-       ACPI_FUNCTION_TRACE("ut_terminate");
+       ACPI_FUNCTION_TRACE(ut_terminate);
 
-       /* Free global tables, etc. */
        /* Free global GPE blocks and related info structures */
 
        gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;
@@ -186,14 +194,14 @@ static void acpi_ut_terminate(void)
                gpe_block = gpe_xrupt_info->gpe_block_list_head;
                while (gpe_block) {
                        next_gpe_block = gpe_block->next;
-                       ACPI_MEM_FREE(gpe_block->event_info);
-                       ACPI_MEM_FREE(gpe_block->register_info);
-                       ACPI_MEM_FREE(gpe_block);
+                       ACPI_FREE(gpe_block->event_info);
+                       ACPI_FREE(gpe_block->register_info);
+                       ACPI_FREE(gpe_block);
 
                        gpe_block = next_gpe_block;
                }
                next_gpe_xrupt_info = gpe_xrupt_info->next;
-               ACPI_MEM_FREE(gpe_xrupt_info);
+               ACPI_FREE(gpe_xrupt_info);
                gpe_xrupt_info = next_gpe_xrupt_info;
        }
 
@@ -216,7 +224,7 @@ static void acpi_ut_terminate(void)
 void acpi_ut_subsystem_shutdown(void)
 {
 
-       ACPI_FUNCTION_TRACE("ut_subsystem_shutdown");
+       ACPI_FUNCTION_TRACE(ut_subsystem_shutdown);
 
        /* Just exit if subsystem is already shutdown */
 
@@ -228,6 +236,7 @@ void acpi_ut_subsystem_shutdown(void)
        /* Subsystem appears active, go ahead and shut it down */
 
        acpi_gbl_shutdown = TRUE;
+       acpi_gbl_startup_flags = 0;
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
 
        /* Close the acpi_event Handling */
@@ -238,6 +247,10 @@ void acpi_ut_subsystem_shutdown(void)
 
        acpi_ns_terminate();
 
+       /* Delete the ACPI tables */
+
+       acpi_tb_terminate();
+
        /* Close the globals */
 
        acpi_ut_terminate();
@@ -245,12 +258,5 @@ void acpi_ut_subsystem_shutdown(void)
        /* Purge the local caches */
 
        (void)acpi_ut_delete_caches();
-
-       /* Debug only - display leftover memory allocation, if any */
-
-#ifdef ACPI_DBG_TRACK_ALLOCATIONS
-       acpi_ut_dump_allocations(ACPI_UINT32_MAX, NULL);
-#endif
-
        return_VOID;
 }