diff options
| author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-03-11 17:17:08 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-04-24 19:55:20 -0400 |
| commit | 204470272c3b055b352d5f127d5d5c7dce5fa597 (patch) | |
| tree | ca0d220cfd866a0672861301f3c758b913395e08 /drivers/acpi | |
| parent | b69d3987f4360a5e7e9e55465b3cdd0cc204b79e (diff) | |
| download | linux-204470272c3b055b352d5f127d5d5c7dce5fa597.tar.gz linux-204470272c3b055b352d5f127d5d5c7dce5fa597.tar.bz2 linux-204470272c3b055b352d5f127d5d5c7dce5fa597.zip | |
ACPI: GPE enabling should happen after EC installation
GPE could try to access EC region, so should not be enabled before
EC is installed
http://bugzilla.kernel.org/show_bug.cgi?id=9916
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/utilities/utxface.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c index 2d496918b3cd..df41312733c2 100644 --- a/drivers/acpi/utilities/utxface.c +++ b/drivers/acpi/utilities/utxface.c @@ -192,24 +192,6 @@ acpi_status acpi_enable_subsystem(u32 flags) } } - /* - * Complete the GPE initialization for the GPE blocks defined in the FADT - * (GPE block 0 and 1). - * - * Note1: This is where the _PRW methods are executed for the GPEs. These - * methods can only be executed after the SCI and Global Lock handlers are - * installed and initialized. - * - * Note2: Currently, there seems to be no need to run the _REG methods - * before execution of the _PRW methods and enabling of the GPEs. - */ - if (!(flags & ACPI_NO_EVENT_INIT)) { - status = acpi_ev_install_fadt_gpes(); - if (ACPI_FAILURE(status)) { - return (status); - } - } - return_ACPI_STATUS(status); } @@ -280,6 +262,23 @@ acpi_status acpi_initialize_objects(u32 flags) } /* + * Complete the GPE initialization for the GPE blocks defined in the FADT + * (GPE block 0 and 1). + * + * Note1: This is where the _PRW methods are executed for the GPEs. These + * methods can only be executed after the SCI and Global Lock handlers are + * installed and initialized. + * + * Note2: Currently, there seems to be no need to run the _REG methods + * before execution of the _PRW methods and enabling of the GPEs. + */ + if (!(flags & ACPI_NO_EVENT_INIT)) { + status = acpi_ev_install_fadt_gpes(); + if (ACPI_FAILURE(status)) + return (status); + } + + /* * Empty the caches (delete the cached objects) on the assumption that * the table load filled them up more than they will be at runtime -- * thus wasting non-paged memory. |