ACPICA: Tables: make default region accessible during the table load

ACPICA commit 016b2a0917cca9cf0d40c38a1541017d9cf569dd

It is proven that the default regions should be accessible during the
table loading in order to execute module level AML code.
This patch moves default region handler installation code earlier in
order to make this happen.
Note that by putting the code here, we actually allow OSPMs to override
default region handlers between acpi_initialize_subsystem() and
acpi_load_tables(), without the need to introduce region handler override
mechanism in acpi_install_address_space_handler(). OSPMs are also couraged
to check acpi_install_address_space_handler() return value to determine if
acpi_remove_address_space_handler() should be invoked before installing new
address space handler. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/016b2a09
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c
index c89943b3ff3ccf2fe577058ec1ec26f3acb1f660..9496b84476a4fe2394e3f40f48a70fa96eb80040 100644 (file)
--- a/drivers/acpi/acpica/tbxfload.c
+++ b/drivers/acpi/acpica/tbxfload.c
@@ -47,6 +47,7 @@
 #include "accommon.h"
 #include "acnamesp.h"
 #include "actables.h"
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbxfload")
@@ -68,6 +69,27 @@ acpi_status __init acpi_load_tables(void)
 
        ACPI_FUNCTION_TRACE(acpi_load_tables);
 
+       /*
+        * Install the default operation region handlers. These are the
+        * handlers that are defined by the ACPI specification to be
+        * "always accessible" -- namely, system_memory, system_IO, and
+        * PCI_Config. This also means that no _REG methods need to be
+        * run for these address spaces. We need to have these handlers
+        * installed before any AML code can be executed, especially any
+        * module-level code (11/2015).
+        * Note that we allow OSPMs to install their own region handlers
+        * between acpi_initialize_subsystem() and acpi_load_tables() to use
+        * their customized default region handlers.
+        */
+       if (acpi_gbl_group_module_level_code) {
+               status = acpi_ev_install_region_handlers();
+               if (ACPI_FAILURE(status) && status != AE_ALREADY_EXISTS) {
+                       ACPI_EXCEPTION((AE_INFO, status,
+                                       "During Region initialization"));
+                       return_ACPI_STATUS(status);
+               }
+       }
+
        /* Load the namespace from the tables */
 
        status = acpi_tb_load_namespace();

diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c
index 721b87cce90865c8c3d20295b664cf2665de84b6..e1ffd7a125bb2df07c328911a7662aaeb17a75c7 100644 (file)
--- a/drivers/acpi/acpica/utxfinit.c
+++ b/drivers/acpi/acpica/utxfinit.c
@@ -163,11 +163,13 @@ acpi_status __init acpi_enable_subsystem(u32 flags)
         * installed before any AML code can be executed, especially any
         * module-level code (11/2015).
         */
-       status = acpi_ev_install_region_handlers();
-       if (ACPI_FAILURE(status)) {
-               ACPI_EXCEPTION((AE_INFO, status,
-                               "During Region initialization"));
-               return_ACPI_STATUS(status);
+       if (!acpi_gbl_group_module_level_code) {
+               status = acpi_ev_install_region_handlers();
+               if (ACPI_FAILURE(status)) {
+                       ACPI_EXCEPTION((AE_INFO, status,
+                                       "During Region initialization"));
+                       return_ACPI_STATUS(status);
+               }
        }
 #if (!ACPI_REDUCED_HARDWARE)