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 | |
parent | b69d3987f4360a5e7e9e55465b3cdd0cc204b79e (diff) |
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')
-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) | |||
192 | } | 192 | } |
193 | } | 193 | } |
194 | 194 | ||
195 | /* | ||
196 | * Complete the GPE initialization for the GPE blocks defined in the FADT | ||
197 | * (GPE block 0 and 1). | ||
198 | * | ||
199 | * Note1: This is where the _PRW methods are executed for the GPEs. These | ||
200 | * methods can only be executed after the SCI and Global Lock handlers are | ||
201 | * installed and initialized. | ||
202 | * | ||
203 | * Note2: Currently, there seems to be no need to run the _REG methods | ||
204 | * before execution of the _PRW methods and enabling of the GPEs. | ||
205 | */ | ||
206 | if (!(flags & ACPI_NO_EVENT_INIT)) { | ||
207 | status = acpi_ev_install_fadt_gpes(); | ||
208 | if (ACPI_FAILURE(status)) { | ||
209 | return (status); | ||
210 | } | ||
211 | } | ||
212 | |||
213 | return_ACPI_STATUS(status); | 195 | return_ACPI_STATUS(status); |
214 | } | 196 | } |
215 | 197 | ||
@@ -280,6 +262,23 @@ acpi_status acpi_initialize_objects(u32 flags) | |||
280 | } | 262 | } |
281 | 263 | ||
282 | /* | 264 | /* |
265 | * Complete the GPE initialization for the GPE blocks defined in the FADT | ||
266 | * (GPE block 0 and 1). | ||
267 | * | ||
268 | * Note1: This is where the _PRW methods are executed for the GPEs. These | ||
269 | * methods can only be executed after the SCI and Global Lock handlers are | ||
270 | * installed and initialized. | ||
271 | * | ||
272 | * Note2: Currently, there seems to be no need to run the _REG methods | ||
273 | * before execution of the _PRW methods and enabling of the GPEs. | ||
274 | */ | ||
275 | if (!(flags & ACPI_NO_EVENT_INIT)) { | ||
276 | status = acpi_ev_install_fadt_gpes(); | ||
277 | if (ACPI_FAILURE(status)) | ||
278 | return (status); | ||
279 | } | ||
280 | |||
281 | /* | ||
283 | * Empty the caches (delete the cached objects) on the assumption that | 282 | * Empty the caches (delete the cached objects) on the assumption that |
284 | * the table load filled them up more than they will be at runtime -- | 283 | * the table load filled them up more than they will be at runtime -- |
285 | * thus wasting non-paged memory. | 284 | * thus wasting non-paged memory. |