ACPICA: Implement simplified Table Manager

The Table Manager component has been completely
redesigned and reimplemented. The new design is much
simpler, and reduces the overall code and data size of
the kernel-resident ACPICA by approximately 5%. Also,
it is now possible to obtain the ACPI tables very early
during kernel initialization, even before dynamic memory
management is initialized.

Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

4 files changed, 88 insertions, 62 deletions

diff --git a/drivers/acpi/hardware/hwacpi.c b/drivers/acpi/hardware/hwacpi.c
index de50fab2a910..14e8111769a3 100644
--- a/drivers/acpi/hardware/hwacpi.c
+++ b/drivers/acpi/hardware/hwacpi.c
@@ -65,13 +65,6 @@ acpi_status acpi_hw_initialize(void)
 
         ACPI_FUNCTION_TRACE(hw_initialize);
 
-        /* We must have the ACPI tables by the time we get here */
-
-        if (!acpi_gbl_FADT) {
-                ACPI_ERROR((AE_INFO, "No FADT is present"));
-                return_ACPI_STATUS(AE_NO_ACPI_TABLES);
-        }
-
         /* Sanity check the FADT for valid values */
 
         status = acpi_ut_validate_fadt();
@@ -106,7 +99,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
          * ACPI 2.0 clarified that if SMI_CMD in FADT is zero,
          * system does not support mode transition.
          */
-        if (!acpi_gbl_FADT->smi_cmd) {
+        if (!acpi_gbl_FADT.smi_command) {
                 ACPI_ERROR((AE_INFO,
                             "No SMI_CMD in FADT, mode transition failed"));
                 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
@@ -119,7 +112,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
          * we make sure both the numbers are zero to determine these
          * transitions are not supported.
          */
-        if (!acpi_gbl_FADT->acpi_enable && !acpi_gbl_FADT->acpi_disable) {
+        if (!acpi_gbl_FADT.acpi_enable && !acpi_gbl_FADT.acpi_disable) {
                 ACPI_ERROR((AE_INFO,
                             "No ACPI mode transition supported in this system (enable/disable both zero)"));
                 return_ACPI_STATUS(AE_OK);
@@ -130,9 +123,8 @@ acpi_status acpi_hw_set_mode(u32 mode)
 
                 /* BIOS should have disabled ALL fixed and GP events */
 
-                status = acpi_os_write_port(acpi_gbl_FADT->smi_cmd,
-                                            (u32) acpi_gbl_FADT->acpi_enable,
-                                            8);
+                status = acpi_os_write_port(acpi_gbl_FADT.smi_command,
+                                            (u32) acpi_gbl_FADT.acpi_enable, 8);
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Attempting to enable ACPI mode\n"));
                 break;
@@ -143,8 +135,8 @@ acpi_status acpi_hw_set_mode(u32 mode)
                  * BIOS should clear all fixed status bits and restore fixed event
                  * enable bits to default
                  */
-                status = acpi_os_write_port(acpi_gbl_FADT->smi_cmd,
-                                            (u32) acpi_gbl_FADT->acpi_disable,
+                status = acpi_os_write_port(acpi_gbl_FADT.smi_command,
+                                            (u32) acpi_gbl_FADT.acpi_disable,
                                             8);
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Attempting to enable Legacy (non-ACPI) mode\n"));
@@ -204,7 +196,7 @@ u32 acpi_hw_get_mode(void)
          * ACPI 2.0 clarified that if SMI_CMD in FADT is zero,
          * system does not support mode transition.
          */
-        if (!acpi_gbl_FADT->smi_cmd) {
+        if (!acpi_gbl_FADT.smi_command) {
                 return_UINT32(ACPI_SYS_MODE_ACPI);
         }
 
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index fa58c1edce1e..9fe7adf21f8b 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.c
@@ -73,7 +73,7 @@ acpi_status acpi_hw_clear_acpi_status(u32 flags)
 
         ACPI_DEBUG_PRINT((ACPI_DB_IO, "About to write %04X to %04X\n",
                           ACPI_BITMASK_ALL_FIXED_STATUS,
-                          (u16) acpi_gbl_FADT->xpm1a_evt_blk.address));
+                          (u16) acpi_gbl_FADT.xpm1a_event_block.address));
 
         lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
 
@@ -86,10 +86,10 @@ acpi_status acpi_hw_clear_acpi_status(u32 flags)
 
         /* Clear the fixed events */
 
-        if (acpi_gbl_FADT->xpm1b_evt_blk.address) {
+        if (acpi_gbl_FADT.xpm1b_event_block.address) {
                 status =
                     acpi_hw_low_level_write(16, ACPI_BITMASK_ALL_FIXED_STATUS,
-                                            &acpi_gbl_FADT->xpm1b_evt_blk);
+                                            &acpi_gbl_FADT.xpm1b_event_block);
                 if (ACPI_FAILURE(status)) {
                         goto unlock_and_exit;
                 }
@@ -422,8 +422,9 @@ acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)
                 ACPI_DEBUG_PRINT((ACPI_DB_IO,
                                   "PM2 control: Read %X from %8.8X%8.8X\n",
                                   register_value,
-                                  ACPI_FORMAT_UINT64(acpi_gbl_FADT->
-                                                     xpm2_cnt_blk.address)));
+                                  ACPI_FORMAT_UINT64(acpi_gbl_FADT.
+                                                     xpm2_control_block.
+                                                     address)));
 
                 ACPI_REGISTER_INSERT_VALUE(register_value,
                                            bit_reg_info->bit_position,
@@ -433,8 +434,9 @@ acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)
                 ACPI_DEBUG_PRINT((ACPI_DB_IO,
                                   "About to write %4.4X to %8.8X%8.8X\n",
                                   register_value,
-                                  ACPI_FORMAT_UINT64(acpi_gbl_FADT->
-                                                     xpm2_cnt_blk.address)));
+                                  ACPI_FORMAT_UINT64(acpi_gbl_FADT.
+                                                     xpm2_control_block.
+                                                     address)));
 
                 status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
                                                 ACPI_REGISTER_PM2_CONTROL,
@@ -495,7 +497,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
 
                 status =
                     acpi_hw_low_level_read(16, &value1,
-                                           &acpi_gbl_FADT->xpm1a_evt_blk);
+                                           &acpi_gbl_FADT.xpm1a_event_block);
                 if (ACPI_FAILURE(status)) {
                         goto unlock_and_exit;
                 }
@@ -504,7 +506,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
 
                 status =
                     acpi_hw_low_level_read(16, &value2,
-                                           &acpi_gbl_FADT->xpm1b_evt_blk);
+                                           &acpi_gbl_FADT.xpm1b_event_block);
                 value1 |= value2;
                 break;
 
@@ -527,14 +529,14 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
 
                 status =
                     acpi_hw_low_level_read(16, &value1,
-                                           &acpi_gbl_FADT->xpm1a_cnt_blk);
+                                           &acpi_gbl_FADT.xpm1a_control_block);
                 if (ACPI_FAILURE(status)) {
                         goto unlock_and_exit;
                 }
 
                 status =
                     acpi_hw_low_level_read(16, &value2,
-                                           &acpi_gbl_FADT->xpm1b_cnt_blk);
+                                           &acpi_gbl_FADT.xpm1b_control_block);
                 value1 |= value2;
                 break;
 
@@ -542,19 +544,20 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
 
                 status =
                     acpi_hw_low_level_read(8, &value1,
-                                           &acpi_gbl_FADT->xpm2_cnt_blk);
+                                           &acpi_gbl_FADT.xpm2_control_block);
                 break;
 
         case ACPI_REGISTER_PM_TIMER:    /* 32-bit access */
 
                 status =
                     acpi_hw_low_level_read(32, &value1,
-                                           &acpi_gbl_FADT->xpm_tmr_blk);
+                                           &acpi_gbl_FADT.xpm_timer_block);
                 break;
 
         case ACPI_REGISTER_SMI_COMMAND_BLOCK:   /* 8-bit access */
 
-                status = acpi_os_read_port(acpi_gbl_FADT->smi_cmd, &value1, 8);
+                status =
+                    acpi_os_read_port(acpi_gbl_FADT.smi_command, &value1, 8);
                 break;
 
         default:
@@ -635,7 +638,7 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
 
                 status =
                     acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT->xpm1a_evt_blk);
+                                            &acpi_gbl_FADT.xpm1a_event_block);
                 if (ACPI_FAILURE(status)) {
                         goto unlock_and_exit;
                 }
@@ -644,7 +647,7 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
 
                 status =
                     acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT->xpm1b_evt_blk);
+                                            &acpi_gbl_FADT.xpm1b_event_block);
                 break;
 
         case ACPI_REGISTER_PM1_ENABLE:  /* 16-bit access */
@@ -682,49 +685,50 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
 
                 status =
                     acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT->xpm1a_cnt_blk);
+                                            &acpi_gbl_FADT.xpm1a_control_block);
                 if (ACPI_FAILURE(status)) {
                         goto unlock_and_exit;
                 }
 
                 status =
                     acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT->xpm1b_cnt_blk);
+                                            &acpi_gbl_FADT.xpm1b_control_block);
                 break;
 
         case ACPI_REGISTER_PM1A_CONTROL:        /* 16-bit access */
 
                 status =
                     acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT->xpm1a_cnt_blk);
+                                            &acpi_gbl_FADT.xpm1a_control_block);
                 break;
 
         case ACPI_REGISTER_PM1B_CONTROL:        /* 16-bit access */
 
                 status =
                     acpi_hw_low_level_write(16, value,
-                                            &acpi_gbl_FADT->xpm1b_cnt_blk);
+                                            &acpi_gbl_FADT.xpm1b_control_block);
                 break;
 
         case ACPI_REGISTER_PM2_CONTROL: /* 8-bit access */
 
                 status =
                     acpi_hw_low_level_write(8, value,
-                                            &acpi_gbl_FADT->xpm2_cnt_blk);
+                                            &acpi_gbl_FADT.xpm2_control_block);
                 break;
 
         case ACPI_REGISTER_PM_TIMER:    /* 32-bit access */
 
                 status =
                     acpi_hw_low_level_write(32, value,
-                                            &acpi_gbl_FADT->xpm_tmr_blk);
+                                            &acpi_gbl_FADT.xpm_timer_block);
                 break;
 
         case ACPI_REGISTER_SMI_COMMAND_BLOCK:   /* 8-bit access */
 
                 /* SMI_CMD is currently always in IO space */
 
-                status = acpi_os_write_port(acpi_gbl_FADT->smi_cmd, value, 8);
+                status =
+                    acpi_os_write_port(acpi_gbl_FADT.smi_command, value, 8);
                 break;
 
         default:
@@ -783,7 +787,7 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
          * Two address spaces supported: Memory or IO.
          * PCI_Config is not supported here because the GAS struct is insufficient
          */
-        switch (reg->address_space_id) {
+        switch (reg->space_id) {
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
 
                 status = acpi_os_read_memory((acpi_physical_address) address,
@@ -798,8 +802,7 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
 
         default:
                 ACPI_ERROR((AE_INFO,
-                            "Unsupported address space: %X",
-                            reg->address_space_id));
+                            "Unsupported address space: %X", reg->space_id));
                 return (AE_BAD_PARAMETER);
         }
 
@@ -807,7 +810,7 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
                           "Read:  %8.8X width %2d from %8.8X%8.8X (%s)\n",
                           *value, width,
                           ACPI_FORMAT_UINT64(address),
-                          acpi_ut_get_region_name(reg->address_space_id)));
+                          acpi_ut_get_region_name(reg->space_id)));
 
         return (status);
 }
@@ -854,7 +857,7 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
          * Two address spaces supported: Memory or IO.
          * PCI_Config is not supported here because the GAS struct is insufficient
          */
-        switch (reg->address_space_id) {
+        switch (reg->space_id) {
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
 
                 status = acpi_os_write_memory((acpi_physical_address) address,
@@ -869,8 +872,7 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
 
         default:
                 ACPI_ERROR((AE_INFO,
-                            "Unsupported address space: %X",
-                            reg->address_space_id));
+                            "Unsupported address space: %X", reg->space_id));
                 return (AE_BAD_PARAMETER);
         }
 
@@ -878,7 +880,7 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
                           "Wrote: %8.8X width %2d   to %8.8X%8.8X (%s)\n",
                           value, width,
                           ACPI_FORMAT_UINT64(address),
-                          acpi_ut_get_region_name(reg->address_space_id)));
+                          acpi_ut_get_region_name(reg->space_id)));
 
         return (status);
 }
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 8bb43cae60c2..6faa76bdc3d5 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -43,6 +43,7 @@
  */
 
 #include <acpi/acpi.h>
+#include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwsleep")
@@ -62,17 +63,32 @@ ACPI_MODULE_NAME("hwsleep")
 acpi_status
 acpi_set_firmware_waking_vector(acpi_physical_address physical_address)
 {
+        struct acpi_table_facs *facs;
+        acpi_status status;
 
         ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector);
 
+        /* Get the FACS */
+
+        status =
+            acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+                                    (struct acpi_table_header **)&facs);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
         /* Set the vector */
 
-        if (acpi_gbl_common_fACS.vector_width == 32) {
-                *(ACPI_CAST_PTR
-                  (u32, acpi_gbl_common_fACS.firmware_waking_vector))
-                    = (u32) physical_address;
+        if ((facs->length < 32) || (!(facs->xfirmware_waking_vector))) {
+                /*
+                 * ACPI 1.0 FACS or short table or optional X_ field is zero
+                 */
+                facs->firmware_waking_vector = (u32) physical_address;
         } else {
-                *acpi_gbl_common_fACS.firmware_waking_vector = physical_address;
+                /*
+                 * ACPI 2.0 FACS with valid X_ field
+                 */
+                facs->xfirmware_waking_vector = physical_address;
         }
 
         return_ACPI_STATUS(AE_OK);
@@ -97,6 +113,8 @@ ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)
 acpi_status
 acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)
 {
+        struct acpi_table_facs *facs;
+        acpi_status status;
 
         ACPI_FUNCTION_TRACE(acpi_get_firmware_waking_vector);
 
@@ -104,16 +122,29 @@ acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
+        /* Get the FACS */
+
+        status =
+            acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+                                    (struct acpi_table_header **)&facs);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
         /* Get the vector */
 
-        if (acpi_gbl_common_fACS.vector_width == 32) {
-                *physical_address = (acpi_physical_address)
-                    *
-                    (ACPI_CAST_PTR
-                     (u32, acpi_gbl_common_fACS.firmware_waking_vector));
+        if ((facs->length < 32) || (!(facs->xfirmware_waking_vector))) {
+                /*
+                 * ACPI 1.0 FACS or short table or optional X_ field is zero
+                 */
+                *physical_address =
+                    (acpi_physical_address) facs->firmware_waking_vector;
         } else {
+                /*
+                 * ACPI 2.0 FACS with valid X_ field
+                 */
                 *physical_address =
-                    *acpi_gbl_common_fACS.firmware_waking_vector;
+                    (acpi_physical_address) facs->xfirmware_waking_vector;
         }
 
         return_ACPI_STATUS(AE_OK);
@@ -429,8 +460,8 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)
 
         ACPI_FLUSH_CPU_CACHE();
 
-        status = acpi_os_write_port(acpi_gbl_FADT->smi_cmd,
-                                    (u32) acpi_gbl_FADT->S4bios_req, 8);
+        status = acpi_os_write_port(acpi_gbl_FADT.smi_command,
+                                    (u32) acpi_gbl_FADT.S4bios_request, 8);
 
         do {
                 acpi_os_stall(1000);
diff --git a/drivers/acpi/hardware/hwtimer.c b/drivers/acpi/hardware/hwtimer.c
index c4ec47c939fd..abd86e8d6287 100644
--- a/drivers/acpi/hardware/hwtimer.c
+++ b/drivers/acpi/hardware/hwtimer.c
@@ -66,7 +66,7 @@ acpi_status acpi_get_timer_resolution(u32 * resolution)
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        if (acpi_gbl_FADT->tmr_val_ext == 0) {
+        if ((acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER) == 0) {
                 *resolution = 24;
         } else {
                 *resolution = 32;
@@ -98,7 +98,8 @@ acpi_status acpi_get_timer(u32 * ticks)
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        status = acpi_hw_low_level_read(32, ticks, &acpi_gbl_FADT->xpm_tmr_blk);
+        status =
+            acpi_hw_low_level_read(32, ticks, &acpi_gbl_FADT.xpm_timer_block);
 
         return_ACPI_STATUS(status);
 }
@@ -153,7 +154,7 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed)
         if (start_ticks < end_ticks) {
                 delta_ticks = end_ticks - start_ticks;
         } else if (start_ticks > end_ticks) {
-                if (acpi_gbl_FADT->tmr_val_ext == 0) {
+                if ((acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER) == 0) {
 
                         /* 24-bit Timer */