54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
|
From: Rafael J. Wysocki <rjw@sisk.pl>
|
||
|
|
Date: Tue, 8 Jun 2010 08:50:20 +0000 (+0200)
|
||
|
|
Subject: ACPI / ACPICA: Fix GPE initialization
|
||
|
|
X-Git-Tag: v2.6.35-rc4~72^2~6^2~1
|
||
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ce43ace02320a3fb9614ddb27edc3a8700d68b26
|
||
|
|
|
||
|
|
ACPI / ACPICA: Fix GPE initialization
|
||
|
|
|
||
|
|
While developing the GPE reference counting code we overlooked the
|
||
|
|
fact that acpi_ev_update_gpes() could have enabled GPEs before
|
||
|
|
acpi_ev_initialize_gpe_block() was called. As a result, some GPEs
|
||
|
|
are enabled twice during the initialization.
|
||
|
|
|
||
|
|
To fix this issue avoid calling acpi_enable_gpe() from
|
||
|
|
acpi_ev_initialize_gpe_block() for the GPEs that have nonzero
|
||
|
|
runtime reference counters.
|
||
|
|
|
||
|
|
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
|
||
|
|
Signed-off-by: Len Brown <len.brown@intel.com>
|
||
|
|
---
|
||
|
|
|
||
|
|
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
|
||
|
|
index 85ded1f..79048de 100644
|
||
|
|
--- a/drivers/acpi/acpica/evgpeblk.c
|
||
|
|
+++ b/drivers/acpi/acpica/evgpeblk.c
|
||
|
|
@@ -1024,6 +1024,19 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
|
||
|
|
|
||
|
|
gpe_index = (i * ACPI_GPE_REGISTER_WIDTH) + j;
|
||
|
|
gpe_event_info = &gpe_block->event_info[gpe_index];
|
||
|
|
+ gpe_number = gpe_index + gpe_block->block_base_number;
|
||
|
|
+
|
||
|
|
+ /*
|
||
|
|
+ * If the GPE has already been enabled for runtime
|
||
|
|
+ * signaling, make sure it remains enabled, but do not
|
||
|
|
+ * increment its reference counter.
|
||
|
|
+ */
|
||
|
|
+ if (gpe_event_info->runtime_count) {
|
||
|
|
+ acpi_set_gpe(gpe_device, gpe_number,
|
||
|
|
+ ACPI_GPE_ENABLE);
|
||
|
|
+ gpe_enabled_count++;
|
||
|
|
+ continue;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if (gpe_event_info->flags & ACPI_GPE_CAN_WAKE) {
|
||
|
|
wake_gpe_count++;
|
||
|
|
@@ -1040,7 +1053,6 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
|
||
|
|
|
||
|
|
/* Enable this GPE */
|
||
|
|
|
||
|
|
- gpe_number = gpe_index + gpe_block->block_base_number;
|
||
|
|
status = acpi_enable_gpe(gpe_device, gpe_number,
|
||
|
|
ACPI_GPE_TYPE_RUNTIME);
|
||
|
|
if (ACPI_FAILURE(status)) {
|