* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
@ 2010-02-19 21:23 Moore, Robert
2010-02-19 23:14 ` Rafael J. Wysocki
` (2 more replies)
0 siblings, 3 replies; 23+ messages in thread
From: Moore, Robert @ 2010-02-19 21:23 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Matthew Garrett, linux-acpi, Lin, Ming M, Brown, Len
Here's some comments and questions on the GPE changes in ACPICA.
Overall, looks good.
Bob
Acpi_set_gpe - looks ok
Acpi_enable_gpe
+ if (type & ACPI_GPE_TYPE_RUNTIME) {
+ if (++gpe_event_info->runtime_count == 1)
+ status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
+ if (ACPI_FAILURE(status))
+ gpe_event_info->runtime_count--;
+ }
I would think the status check should be grouped like this:
+ if (type & ACPI_GPE_TYPE_RUNTIME) {
+ if (++gpe_event_info->runtime_count == 1) {
+ status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
+ if (ACPI_FAILURE(status))
+ gpe_event_info->runtime_count--;
+ }
+ }
Acpi_disable_gpe
+ acpi_ev_disable_gpe(gpe_event_info);
There is a status returned by this function, should get it.
Should do a switch(type) and handle the bad type case.
+++ linux-2.6/drivers/acpi/ec.c
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
Think you should have some comments here as to why exactly the code is
Forcing a H/W disable/enable (in all places these functions are used)
acpi_ev_update_gpe_enable_masks.
My understanding is that this function changes to update the masks based upon the reference counters, instead of an input parameter.
acpi_ev_enable_gpe:
1) I think we may not need the "write_to_hardware" parameter anymore. The calls to ev_enable_gpe that use FALSE for this parameter look like they could be simply replaced with a call to acpi_ev_update_gpe_enable_masks.
2) The GPE is only enabled if the runtime_count is non-zero. Would there ever be a situation where we might want to enable a GPE when the runtime_count is zero?
acpi_ev_disable_gpe: OK, just removing the obsolete flags
acpi_ev_save_method_info:
Default is still "runtime" gpe, unless _PRW is found later and then ACPI_GPE_CAN_WAKE is set, correct?
acpi_ev_initialize_gpe_block:
Probably should still get the status from WalkNamespace and emit an ACPI_ERROR if this fails, since this would probably be a serious error if we could not get the _PRW methods.
acpi_ev_initialize_gpe_block:
I wonder if we still need Boolean acpi_gbl_leave_wake_gpes_disabled.
Why remove call to acpi_hw_enable_runtime_gpe_block? It is much more efficient to do entire registers at once instead of repeatedly calling ev_enable_gpe.
+++ linux-2.6/include/acpi/actypes.h
#define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x06
#define ACPI_GPE_TYPE_WAKE (u8) 0x02
#define ACPI_GPE_TYPE_RUNTIME (u8) 0x04 /* Default */
These are obsolete and can be removed, yes?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-19 21:23 [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs Moore, Robert
@ 2010-02-19 23:14 ` Rafael J. Wysocki
2010-02-24 22:05 ` Moore, Robert
2010-02-25 15:14 ` Alexey Starikovskiy
2010-02-19 23:18 ` Rafael J. Wysocki
2010-02-19 23:18 ` Rafael J. Wysocki
2 siblings, 2 replies; 23+ messages in thread
From: Rafael J. Wysocki @ 2010-02-19 23:14 UTC (permalink / raw)
To: Moore, Robert; +Cc: Matthew Garrett, linux-acpi, Lin, Ming M, Brown, Len
On Friday 19 February 2010, Moore, Robert wrote:
>
> Here's some comments and questions on the GPE changes in ACPICA.
> Overall, looks good.
First of all, thanks a lot for the review.
> Acpi_set_gpe - looks ok
>
> Acpi_enable_gpe
>
> + if (type & ACPI_GPE_TYPE_RUNTIME) {
> + if (++gpe_event_info->runtime_count == 1)
> + status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
>
> + if (ACPI_FAILURE(status))
> + gpe_event_info->runtime_count--;
> + }
>
> I would think the status check should be grouped like this:
>
> + if (type & ACPI_GPE_TYPE_RUNTIME) {
> + if (++gpe_event_info->runtime_count == 1) {
> + status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
>
> + if (ACPI_FAILURE(status))
> + gpe_event_info->runtime_count--;
> + }
> + }
Yes. It doesn't affect correctness, but it should be like that.
> Acpi_disable_gpe
>
> + acpi_ev_disable_gpe(gpe_event_info);
>
> There is a status returned by this function, should get it.
OK, although there doesn't seem to be any sensible action we
can perform if this acpi_ev_disable_gpe() returns failure.
> Should do a switch(type) and handle the bad type case.
Well, it seems sufficient to do
if (type & ~ACPI_TYPE_WAKE_RUN)
return_ACPI_STATUS(AE_BAD_PARAMETER);
In acpi_enable_gpe() too, BTW.
> +++ linux-2.6/drivers/acpi/ec.c
> + acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
> + acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
>
> Think you should have some comments here as to why exactly the code is
> Forcing a H/W disable/enable (in all places these functions are used)
Comments added.
> acpi_ev_update_gpe_enable_masks.
>
> My understanding is that this function changes to update the masks based upon the reference counters, instead of an input parameter.
That's correct.
> acpi_ev_enable_gpe:
>
> 1) I think we may not need the "write_to_hardware" parameter anymore.
Right.
> The calls to ev_enable_gpe that use FALSE for this parameter look like they
> could be simply replaced with a call to acpi_ev_update_gpe_enable_masks.
There's only one of them as far as I can see.
> 2) The GPE is only enabled if the runtime_count is non-zero. Would there
> ever be a situation where we might want to enable a GPE when the
> runtime_count is zero?
Yes, that's the case if the GPE is only enabled for wake-up, but it's done
with the help of acpi_set_gpe() (in wakeup.c). We still need the wake-up
reference counting for that, though.
> acpi_ev_disable_gpe: OK, just removing the obsolete flags
>
>
> acpi_ev_save_method_info:
>
> Default is still "runtime" gpe, unless _PRW is found later and then ACPI_GPE_CAN_WAKE is set, correct?
Yes.
> acpi_ev_initialize_gpe_block:
>
> Probably should still get the status from WalkNamespace and emit an
> ACPI_ERROR if this fails, since this would probably be a serious error if we
> could not get the _PRW methods.
In fact the old code overwrote the return value of acpi_ns_walk_namespace()
with the status returned by acpi_hw_enable_runtime_gpe_block() so we never
used it.
> acpi_ev_initialize_gpe_block:
>
> I wonder if we still need Boolean acpi_gbl_leave_wake_gpes_disabled.
I'm not sure, but if we are to remove it, that should be done with a separate
patch anyway.
> Why remove call to acpi_hw_enable_runtime_gpe_block?
Because we need to get the reference counting right from the start.
> It is much more efficient to do entire registers at once instead of
> repeatedly calling ev_enable_gpe.
It is, but I don't think that would be worth the increased code complexity
needed to update the reference counters as appropriate.
> +++ linux-2.6/include/acpi/actypes.h
>
> #define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x06
> #define ACPI_GPE_TYPE_WAKE (u8) 0x02
> #define ACPI_GPE_TYPE_RUNTIME (u8) 0x04 /* Default */
>
> These are obsolete and can be removed, yes?
No. We use them in acpi_[enable|disable]_gpe().
Updated patch is appended.
Rafael
---
Subject: ACPI: Use GPE reference counting to support shared GPEs (rev. 2)
From: Rafael J. Wysocki <rjw@sisk.pl>
ACPI GPEs may map to multiple devices. The current GPE interface
only provides a mechanism for enabling and disabling GPEs, making
it difficult to change the state of GPEs at runtime without extensive
cooperation between devices.
Add an API to allow devices to indicate whether or not they want
their device's GPE to be enabled for both runtime and wakeup events.
Remove the old GPE type handling entirely, which gets rid of various
quirks, like the implicit disabling with GPE type setting. This
requires a small amount of rework in order to ensure that non-wake
GPEs are enabled by default to preserve existing behaviour.
Based on patches from Matthew Garrett <mjg@redhat.com>.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/acpi/acpica/acevents.h | 10 --
drivers/acpi/acpica/aclocal.h | 2
drivers/acpi/acpica/evgpe.c | 161 ++++-------------------------------------
drivers/acpi/acpica/evgpeblk.c | 87 ++++++++--------------
drivers/acpi/acpica/evxface.c | 14 ---
drivers/acpi/acpica/evxfevnt.c | 95 +++++++++++++++++-------
drivers/acpi/button.c | 13 ++-
drivers/acpi/ec.c | 28 ++++---
drivers/acpi/sleep.c | 15 +++
drivers/acpi/system.c | 4 -
drivers/acpi/wakeup.c | 81 ++++++--------------
include/acpi/acpixf.h | 6 -
include/acpi/actypes.h | 28 ++-----
13 files changed, 207 insertions(+), 337 deletions(-)
Index: linux-2.6/drivers/acpi/acpica/aclocal.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/aclocal.h
+++ linux-2.6/drivers/acpi/acpica/aclocal.h
@@ -426,6 +426,8 @@ struct acpi_gpe_event_info {
struct acpi_gpe_register_info *register_info; /* Backpointer to register info */
u8 flags; /* Misc info about this GPE */
u8 gpe_number; /* This GPE */
+ u8 runtime_count;
+ u8 wakeup_count;
};
/* Information about a GPE register pair, one per each status/enable pair in an array */
Index: linux-2.6/drivers/acpi/acpica/evxfevnt.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evxfevnt.c
+++ linux-2.6/drivers/acpi/acpica/evxfevnt.c
@@ -201,23 +201,27 @@ ACPI_EXPORT_SYMBOL(acpi_enable_event)
/*******************************************************************************
*
- * FUNCTION: acpi_set_gpe_type
+ * FUNCTION: acpi_set_gpe
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Type - New GPE type
+ * action - Enable or disable
+ * Called from ISR or not
*
* RETURN: Status
*
- * DESCRIPTION: Set the type of an individual GPE
+ * DESCRIPTION: Enable or disable an ACPI event (general purpose)
*
******************************************************************************/
-acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type)
+acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action)
{
acpi_status status = AE_OK;
+ acpi_cpu_flags flags;
struct acpi_gpe_event_info *gpe_event_info;
- ACPI_FUNCTION_TRACE(acpi_set_gpe_type);
+ ACPI_FUNCTION_TRACE(acpi_set_gpe);
+
+ flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -227,19 +231,29 @@ acpi_status acpi_set_gpe_type(acpi_handl
goto unlock_and_exit;
}
- if ((gpe_event_info->flags & ACPI_GPE_TYPE_MASK) == type) {
- return_ACPI_STATUS(AE_OK);
- }
+ /* Perform the action */
- /* Set the new type (will disable GPE if currently enabled) */
+ switch (action) {
+ case ACPI_GPE_ENABLE:
+ status = acpi_ev_enable_gpe(gpe_event_info);
+ break;
+
+ case ACPI_GPE_DISABLE:
+ status = acpi_ev_disable_gpe(gpe_event_info);
+ break;
- status = acpi_ev_set_gpe_type(gpe_event_info, type);
+ default:
+ ACPI_ERROR((AE_INFO, "Invalid action\n"));
+ status = AE_BAD_PARAMETER;
+ break;
+ }
unlock_and_exit:
+ acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
+ACPI_EXPORT_SYMBOL(acpi_set_gpe)
/*******************************************************************************
*
@@ -247,15 +261,14 @@ ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Flags - Just enable, or also wake enable?
- * Called from ISR or not
+ * type - Purpose the GPE will be used for
*
* RETURN: Status
*
- * DESCRIPTION: Enable an ACPI event (general purpose)
+ * DESCRIPTION: Take a reference to a GPE and enable it if necessary
*
******************************************************************************/
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number)
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
{
acpi_status status = AE_OK;
acpi_cpu_flags flags;
@@ -263,6 +276,9 @@ acpi_status acpi_enable_gpe(acpi_handle
ACPI_FUNCTION_TRACE(acpi_enable_gpe);
+ if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
+ return_ACPI_STATUS(AE_BAD_PARAMETER);
+
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -273,15 +289,32 @@ acpi_status acpi_enable_gpe(acpi_handle
goto unlock_and_exit;
}
- /* Perform the enable */
+ if (type & ACPI_GPE_TYPE_RUNTIME) {
+ if (++gpe_event_info->runtime_count == 1) {
+ status = acpi_ev_enable_gpe(gpe_event_info);
+ if (ACPI_FAILURE(status))
+ gpe_event_info->runtime_count--;
+ }
+ }
+
+ if (type & ACPI_GPE_TYPE_WAKE) {
+ if (!(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
+ status = AE_BAD_PARAMETER;
+ goto unlock_and_exit;
+ }
- status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
+ /*
+ * Wake-up GPEs are only enabled right prior to putting the
+ * system into a sleep state.
+ */
+ if (++gpe_event_info->wakeup_count == 1)
+ acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ }
- unlock_and_exit:
+unlock_and_exit:
acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-
ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
/*******************************************************************************
@@ -290,15 +323,14 @@ ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Flags - Just disable, or also wake disable?
- * Called from ISR or not
+ * type - Purpose the GPE won't be used for any more
*
* RETURN: Status
*
- * DESCRIPTION: Disable an ACPI event (general purpose)
+ * DESCRIPTION: Release a reference to a GPE and disable it if necessary
*
******************************************************************************/
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number)
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
{
acpi_status status = AE_OK;
acpi_cpu_flags flags;
@@ -306,6 +338,9 @@ acpi_status acpi_disable_gpe(acpi_handle
ACPI_FUNCTION_TRACE(acpi_disable_gpe);
+ if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
+ return_ACPI_STATUS(AE_BAD_PARAMETER);
+
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -315,13 +350,23 @@ acpi_status acpi_disable_gpe(acpi_handle
goto unlock_and_exit;
}
- status = acpi_ev_disable_gpe(gpe_event_info);
+ if ((type & ACPI_GPE_TYPE_WAKE) && gpe_event_info->runtime_count)
+ if (--gpe_event_info->runtime_count == 0)
+ status = acpi_ev_disable_gpe(gpe_event_info);
+
+ if ((type & ACPI_GPE_TYPE_RUNTIME) && gpe_event_info->wakeup_count) {
+ /*
+ * Wake-up GPEs are not enabled after leaving system sleep
+ * states, so we don't need to disable them here.
+ */
+ if (--gpe_event_info->wakeup_count == 0)
+ acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ }
unlock_and_exit:
acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-
ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
/*******************************************************************************
Index: linux-2.6/include/acpi/acpixf.h
===================================================================
--- linux-2.6.orig/include/acpi/acpixf.h
+++ linux-2.6/include/acpi/acpixf.h
@@ -281,11 +281,11 @@ acpi_status acpi_get_event_status(u32 ev
/*
* GPE Interfaces
*/
-acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type);
+acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action);
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number);
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type);
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number);
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type);
acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags);
Index: linux-2.6/drivers/acpi/button.c
===================================================================
--- linux-2.6.orig/drivers/acpi/button.c
+++ linux-2.6/drivers/acpi/button.c
@@ -422,11 +422,9 @@ static int acpi_button_add(struct acpi_d
if (device->wakeup.flags.valid) {
/* Button's GPE is run-wake GPE */
- acpi_set_gpe_type(device->wakeup.gpe_device,
- device->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
acpi_enable_gpe(device->wakeup.gpe_device,
- device->wakeup.gpe_number);
+ device->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE_RUN);
device->wakeup.state.enabled = 1;
}
@@ -446,6 +444,13 @@ static int acpi_button_remove(struct acp
{
struct acpi_button *button = acpi_driver_data(device);
+ if (device->wakeup.flags.valid) {
+ acpi_disable_gpe(device->wakeup.gpe_device,
+ device->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE_RUN);
+ device->wakeup.state.enabled = 0;
+ }
+
acpi_button_remove_fs(device);
input_unregister_device(button->input);
kfree(button);
Index: linux-2.6/drivers/acpi/ec.c
===================================================================
--- linux-2.6.orig/drivers/acpi/ec.c
+++ linux-2.6/drivers/acpi/ec.c
@@ -307,7 +307,11 @@ static int acpi_ec_transaction(struct ac
pr_debug(PREFIX "transaction start\n");
/* disable GPE during transaction if storm is detected */
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
- acpi_disable_gpe(NULL, ec->gpe);
+ /*
+ * It has to be disabled at the hardware level regardless of the
+ * GPE reference counting, so that it doesn't trigger.
+ */
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
}
status = acpi_ec_transaction_unlocked(ec, t);
@@ -316,8 +320,12 @@ static int acpi_ec_transaction(struct ac
ec_check_sci_sync(ec, acpi_ec_read_status(ec));
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
msleep(1);
- /* it is safe to enable GPE outside of transaction */
- acpi_enable_gpe(NULL, ec->gpe);
+ /*
+ * It is safe to enable the GPE outside of the transaction. Use
+ * acpi_set_gpe() for that, since we used it to disable the GPE
+ * above.
+ */
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
} else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
pr_info(PREFIX "GPE storm detected, "
"transactions will use polling mode\n");
@@ -788,8 +796,8 @@ static int ec_install_handlers(struct ac
&acpi_ec_gpe_handler, ec);
if (ACPI_FAILURE(status))
return -ENODEV;
- acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
- acpi_enable_gpe(NULL, ec->gpe);
+
+ acpi_enable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
status = acpi_install_address_space_handler(ec->handle,
ACPI_ADR_SPACE_EC,
&acpi_ec_space_handler,
@@ -806,6 +814,7 @@ static int ec_install_handlers(struct ac
} else {
acpi_remove_gpe_handler(NULL, ec->gpe,
&acpi_ec_gpe_handler);
+ acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
return -ENODEV;
}
}
@@ -816,6 +825,7 @@ static int ec_install_handlers(struct ac
static void ec_remove_handlers(struct acpi_ec *ec)
{
+ acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
pr_err(PREFIX "failed to remove space handler\n");
@@ -1057,16 +1067,16 @@ error:
static int acpi_ec_suspend(struct acpi_device *device, pm_message_t state)
{
struct acpi_ec *ec = acpi_driver_data(device);
- /* Stop using GPE */
- acpi_disable_gpe(NULL, ec->gpe);
+ /* Stop using GPE, but keep it reference counted. */
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
return 0;
}
static int acpi_ec_resume(struct acpi_device *device)
{
struct acpi_ec *ec = acpi_driver_data(device);
- /* Enable use of GPE back */
- acpi_enable_gpe(NULL, ec->gpe);
+ /* Enable the GPE again, but don't reference count it once more. */
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
return 0;
}
Index: linux-2.6/drivers/acpi/sleep.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep.c
+++ linux-2.6/drivers/acpi/sleep.c
@@ -745,9 +745,18 @@ int acpi_pm_device_sleep_wake(struct dev
return -ENODEV;
}
- error = enable ?
- acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state) :
- acpi_disable_wakeup_device_power(adev);
+ if (enable) {
+ error = acpi_enable_wakeup_device_power(adev,
+ acpi_target_sleep_state);
+ if (!error)
+ acpi_enable_gpe(adev->wakeup.gpe_device,
+ adev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
+ } else {
+ acpi_disable_gpe(adev->wakeup.gpe_device, adev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
+ error = acpi_disable_wakeup_device_power(adev);
+ }
if (!error)
dev_info(dev, "wake-up capability %s by ACPI\n",
enable ? "enabled" : "disabled");
Index: linux-2.6/drivers/acpi/wakeup.c
===================================================================
--- linux-2.6.orig/drivers/acpi/wakeup.c
+++ linux-2.6/drivers/acpi/wakeup.c
@@ -21,12 +21,12 @@
ACPI_MODULE_NAME("wakeup_devices")
/**
- * acpi_enable_wakeup_device_prep - prepare wakeup devices
- * @sleep_state: ACPI state
- * Enable all wakup devices power if the devices' wakeup level
- * is higher than requested sleep level
+ * acpi_enable_wakeup_device_prep - Prepare wake-up devices.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * Enable all wake-up devices' power, unless the requested system sleep state is
+ * too deep.
*/
-
void acpi_enable_wakeup_device_prep(u8 sleep_state)
{
struct list_head *node, *next;
@@ -36,9 +36,8 @@ void acpi_enable_wakeup_device_prep(u8 s
struct acpi_device,
wakeup_list);
- if (!dev->wakeup.flags.valid ||
- !dev->wakeup.state.enabled ||
- (sleep_state > (u32) dev->wakeup.sleep_state))
+ if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
+ || (sleep_state > (u32) dev->wakeup.sleep_state))
continue;
acpi_enable_wakeup_device_power(dev, sleep_state);
@@ -46,9 +45,12 @@ void acpi_enable_wakeup_device_prep(u8 s
}
/**
- * acpi_enable_wakeup_device - enable wakeup devices
- * @sleep_state: ACPI state
- * Enable all wakup devices's GPE
+ * acpi_enable_wakeup_device - Enable wake-up device GPEs.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * Enable all wake-up devices' GPEs, with the assumption that
+ * acpi_disable_all_gpes() was executed before, so we don't need to disable any
+ * GPEs here.
*/
void acpi_enable_wakeup_device(u8 sleep_state)
{
@@ -65,29 +67,22 @@ void acpi_enable_wakeup_device(u8 sleep_
if (!dev->wakeup.flags.valid)
continue;
- /* If users want to disable run-wake GPE,
- * we only disable it for wake and leave it for runtime
- */
if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
- || sleep_state > (u32) dev->wakeup.sleep_state) {
- if (dev->wakeup.flags.run_wake) {
- /* set_gpe_type will disable GPE, leave it like that */
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_RUNTIME);
- }
+ || sleep_state > (u32) dev->wakeup.sleep_state)
continue;
- }
- if (!dev->wakeup.flags.run_wake)
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
+
+ /* The wake-up power should have been enabled already. */
+ acpi_set_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+ ACPI_GPE_ENABLE);
}
}
/**
- * acpi_disable_wakeup_device - disable devices' wakeup capability
- * @sleep_state: ACPI state
- * Disable all wakup devices's GPE and wakeup capability
+ * acpi_disable_wakeup_device - Disable devices' wakeup capability.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * This function only affects devices with wakeup.state.enabled set, which means
+ * that it reverses the changes made by acpi_enable_wakeup_device_prep().
*/
void acpi_disable_wakeup_device(u8 sleep_state)
{
@@ -97,30 +92,11 @@ void acpi_disable_wakeup_device(u8 sleep
struct acpi_device *dev =
container_of(node, struct acpi_device, wakeup_list);
- if (!dev->wakeup.flags.valid)
- continue;
-
- if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
- || sleep_state > (u32) dev->wakeup.sleep_state) {
- if (dev->wakeup.flags.run_wake) {
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
- /* Re-enable it, since set_gpe_type will disable it */
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
- }
+ if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
+ || (sleep_state > (u32) dev->wakeup.sleep_state))
continue;
- }
acpi_disable_wakeup_device_power(dev);
- /* Never disable run-wake GPE */
- if (!dev->wakeup.flags.run_wake) {
- acpi_disable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
- acpi_clear_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number, ACPI_NOT_ISR);
- }
}
}
@@ -136,11 +112,8 @@ int __init acpi_wakeup_device_init(void)
/* In case user doesn't load button driver */
if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
continue;
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
+ acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
dev->wakeup.state.enabled = 1;
}
mutex_unlock(&acpi_device_lock);
Index: linux-2.6/drivers/acpi/acpica/acevents.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/acevents.h
+++ linux-2.6/drivers/acpi/acpica/acevents.h
@@ -76,12 +76,9 @@ acpi_ev_queue_notify_request(struct acpi
* evgpe - GPE handling and dispatch
*/
acpi_status
-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
- u8 type);
+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info);
-acpi_status
-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
- u8 write_to_hardware);
+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);
acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);
@@ -122,9 +119,6 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_eve
u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);
acpi_status
-acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type);
-
-acpi_status
acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info);
acpi_status acpi_ev_gpe_initialize(void);
Index: linux-2.6/drivers/acpi/acpica/evgpe.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpe.c
+++ linux-2.6/drivers/acpi/acpica/evgpe.c
@@ -54,54 +54,9 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
/*******************************************************************************
*
- * FUNCTION: acpi_ev_set_gpe_type
- *
- * PARAMETERS: gpe_event_info - GPE to set
- * Type - New type
- *
- * RETURN: Status
- *
- * DESCRIPTION: Sets the new type for the GPE (wake, run, or wake/run)
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type)
-{
- acpi_status status;
-
- ACPI_FUNCTION_TRACE(ev_set_gpe_type);
-
- /* Validate type and update register enable masks */
-
- switch (type) {
- case ACPI_GPE_TYPE_WAKE:
- case ACPI_GPE_TYPE_RUNTIME:
- case ACPI_GPE_TYPE_WAKE_RUN:
- break;
-
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
- }
-
- /* Disable the GPE if currently enabled */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
-
- /* Clear the type bits and insert the new Type */
-
- gpe_event_info->flags &= ~ACPI_GPE_TYPE_MASK;
- gpe_event_info->flags |= type;
- return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
* FUNCTION: acpi_ev_update_gpe_enable_masks
*
* PARAMETERS: gpe_event_info - GPE to update
- * Type - What to do: ACPI_GPE_DISABLE or
- * ACPI_GPE_ENABLE
*
* RETURN: Status
*
@@ -110,8 +65,7 @@ acpi_ev_set_gpe_type(struct acpi_gpe_eve
******************************************************************************/
acpi_status
-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
- u8 type)
+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info)
{
struct acpi_gpe_register_info *gpe_register_info;
u8 register_bit;
@@ -127,37 +81,14 @@ acpi_ev_update_gpe_enable_masks(struct a
(1 <<
(gpe_event_info->gpe_number - gpe_register_info->base_gpe_number));
- /* 1) Disable case. Simply clear all enable bits */
-
- if (type == ACPI_GPE_DISABLE) {
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
- register_bit);
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- return_ACPI_STATUS(AE_OK);
- }
-
- /* 2) Enable case. Set/Clear the appropriate enable bits */
+ ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake, register_bit);
+ ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
- ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
-
- case ACPI_GPE_TYPE_RUNTIME:
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
- register_bit);
+ if (gpe_event_info->runtime_count)
ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
- case ACPI_GPE_TYPE_WAKE_RUN:
+ if (gpe_event_info->wakeup_count)
ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
- ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
-
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
- }
return_ACPI_STATUS(AE_OK);
}
@@ -167,8 +98,6 @@ acpi_ev_update_gpe_enable_masks(struct a
* FUNCTION: acpi_ev_enable_gpe
*
* PARAMETERS: gpe_event_info - GPE to enable
- * write_to_hardware - Enable now, or just mark data structs
- * (WAKE GPEs should be deferred)
*
* RETURN: Status
*
@@ -176,9 +105,7 @@ acpi_ev_update_gpe_enable_masks(struct a
*
******************************************************************************/
-acpi_status
-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
- u8 write_to_hardware)
+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
{
acpi_status status;
@@ -186,47 +113,20 @@ acpi_ev_enable_gpe(struct acpi_gpe_event
/* Make sure HW enable masks are updated */
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info, ACPI_GPE_ENABLE);
- if (ACPI_FAILURE(status)) {
+ status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
- }
/* Mark wake-enabled or HW enable, or both */
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
- break;
-
- case ACPI_GPE_TYPE_WAKE_RUN:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
-
- /*lint -fallthrough */
-
- case ACPI_GPE_TYPE_RUNTIME:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
-
- if (write_to_hardware) {
-
- /* Clear the GPE (of stale events), then enable it */
-
- status = acpi_hw_clear_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- return_ACPI_STATUS(status);
- }
-
- /* Enable the requested runtime GPE */
-
- status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
- }
- break;
+ if (gpe_event_info->runtime_count) {
+ /* Clear the GPE (of stale events), then enable it */
+ status = acpi_hw_clear_gpe(gpe_event_info);
+ if (ACPI_FAILURE(status))
+ return_ACPI_STATUS(status);
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
+ /* Enable the requested runtime GPE */
+ status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
}
return_ACPI_STATUS(AE_OK);
@@ -252,34 +152,9 @@ acpi_status acpi_ev_disable_gpe(struct a
/* Make sure HW enable masks are updated */
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info, ACPI_GPE_DISABLE);
- if (ACPI_FAILURE(status)) {
+ status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
- }
-
- /* Clear the appropriate enabled flags for this GPE */
-
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
- break;
-
- case ACPI_GPE_TYPE_WAKE_RUN:
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
-
- /* fallthrough */
-
- case ACPI_GPE_TYPE_RUNTIME:
-
- /* Disable the requested runtime GPE */
-
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
- break;
-
- default:
- break;
- }
/*
* Even if we don't know the GPE type, make sure that we always
@@ -521,7 +396,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
/* Set the GPE flags for return to enabled state */
- (void)acpi_ev_enable_gpe(gpe_event_info, FALSE);
+ (void)acpi_ev_update_gpe_enable_masks(gpe_event_info);
/*
* Take a snapshot of the GPE info for this level - we copy the info to
Index: linux-2.6/drivers/acpi/acpica/evgpeblk.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpeblk.c
+++ linux-2.6/drivers/acpi/acpica/evgpeblk.c
@@ -258,7 +258,6 @@ acpi_ev_save_method_info(acpi_handle obj
u32 gpe_number;
char name[ACPI_NAME_SIZE + 1];
u8 type;
- acpi_status status;
ACPI_FUNCTION_TRACE(ev_save_method_info);
@@ -325,26 +324,20 @@ acpi_ev_save_method_info(acpi_handle obj
/*
* Now we can add this information to the gpe_event_info block for use
- * during dispatch of this GPE. Default type is RUNTIME, although this may
- * change when the _PRW methods are executed later.
+ * during dispatch of this GPE.
*/
gpe_event_info =
&gpe_block->event_info[gpe_number - gpe_block->block_base_number];
- gpe_event_info->flags = (u8)
- (type | ACPI_GPE_DISPATCH_METHOD | ACPI_GPE_TYPE_RUNTIME);
+ gpe_event_info->flags = (u8) (type | ACPI_GPE_DISPATCH_METHOD);
gpe_event_info->dispatch.method_node =
(struct acpi_namespace_node *)obj_handle;
- /* Update enable mask, but don't enable the HW GPE as of yet */
-
- status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
-
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
"Registered GPE method %s as GPE number 0x%.2X\n",
name, gpe_number));
- return_ACPI_STATUS(status);
+ return_ACPI_STATUS(AE_OK);
}
/*******************************************************************************
@@ -454,20 +447,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle ob
gpe_block->
block_base_number];
- /* Mark GPE for WAKE-ONLY but WAKE_DISABLED */
-
- gpe_event_info->flags &=
- ~(ACPI_GPE_WAKE_ENABLED | ACPI_GPE_RUN_ENABLED);
-
- status =
- acpi_ev_set_gpe_type(gpe_event_info, ACPI_GPE_TYPE_WAKE);
- if (ACPI_FAILURE(status)) {
- goto cleanup;
- }
-
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info,
- ACPI_GPE_DISABLE);
+ gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
}
cleanup:
@@ -989,7 +969,6 @@ acpi_status
acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
struct acpi_gpe_block_info *gpe_block)
{
- acpi_status status;
struct acpi_gpe_event_info *gpe_event_info;
struct acpi_gpe_walk_info gpe_info;
u32 wake_gpe_count;
@@ -1019,42 +998,50 @@ acpi_ev_initialize_gpe_block(struct acpi
gpe_info.gpe_block = gpe_block;
gpe_info.gpe_device = gpe_device;
- status =
- acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+ acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, ACPI_NS_WALK_UNLOCK,
acpi_ev_match_prw_and_gpe, NULL,
&gpe_info, NULL);
}
/*
- * Enable all GPEs in this block that have these attributes:
- * 1) are "runtime" or "run/wake" GPEs, and
- * 2) have a corresponding _Lxx or _Exx method
- *
- * Any other GPEs within this block must be enabled via the
- * acpi_enable_gpe() external interface.
+ * Enable all GPEs that have a corresponding method and aren't
+ * capable of generating wakeups. Any other GPEs within this block
+ * must be enabled via the acpi_enable_gpe() interface.
*/
wake_gpe_count = 0;
gpe_enabled_count = 0;
+ if (gpe_device == acpi_gbl_fadt_gpe_device)
+ gpe_device = NULL;
for (i = 0; i < gpe_block->register_count; i++) {
- for (j = 0; j < 8; j++) {
+ for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
+ acpi_status status;
+ acpi_size gpe_index;
+ int gpe_number;
/* Get the info block for this particular GPE */
+ gpe_index = (acpi_size)i * ACPI_GPE_REGISTER_WIDTH + j;
+ gpe_event_info = &gpe_block->event_info[gpe_index];
- gpe_event_info = &gpe_block->event_info[((acpi_size) i *
- ACPI_GPE_REGISTER_WIDTH)
- + j];
-
- if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
- ACPI_GPE_DISPATCH_METHOD) &&
- (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) {
- gpe_enabled_count++;
- }
-
- if (gpe_event_info->flags & ACPI_GPE_TYPE_WAKE) {
+ if (gpe_event_info->flags & ACPI_GPE_CAN_WAKE) {
wake_gpe_count++;
+ if (acpi_gbl_leave_wake_gpes_disabled)
+ continue;
}
+
+ if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_METHOD))
+ continue;
+
+ 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))
+ ACPI_ERROR((AE_INFO,
+ "Failed to enable GPE %02X\n",
+ gpe_number));
+ else
+ gpe_enabled_count++;
}
}
@@ -1062,15 +1049,7 @@ acpi_ev_initialize_gpe_block(struct acpi
"Found %u Wake, Enabled %u Runtime GPEs in this block\n",
wake_gpe_count, gpe_enabled_count));
- /* Enable all valid runtime GPEs found above */
-
- status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block, NULL);
- if (ACPI_FAILURE(status)) {
- ACPI_ERROR((AE_INFO, "Could not enable GPEs in GpeBlock %p",
- gpe_block));
- }
-
- return_ACPI_STATUS(status);
+ return_ACPI_STATUS(AE_OK);
}
/*******************************************************************************
Index: linux-2.6/drivers/acpi/acpica/evxface.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evxface.c
+++ linux-2.6/drivers/acpi/acpica/evxface.c
@@ -617,13 +617,6 @@ acpi_install_gpe_handler(acpi_handle gpe
handler->context = context;
handler->method_node = gpe_event_info->dispatch.method_node;
- /* Disable the GPE before installing the handler */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- goto unlock_and_exit;
- }
-
/* Install the handler */
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
@@ -707,13 +700,6 @@ acpi_remove_gpe_handler(acpi_handle gpe_
goto unlock_and_exit;
}
- /* Disable the GPE before removing the handler */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- goto unlock_and_exit;
- }
-
/* Make sure all deferred tasks are completed */
(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
Index: linux-2.6/include/acpi/actypes.h
===================================================================
--- linux-2.6.orig/include/acpi/actypes.h
+++ linux-2.6/include/acpi/actypes.h
@@ -668,15 +668,16 @@ typedef u32 acpi_event_status;
/*
* GPE info flags - Per GPE
- * +-+-+-+---+---+-+
- * |7|6|5|4:3|2:1|0|
- * +-+-+-+---+---+-+
- * | | | | | |
- * | | | | | +--- Interrupt type: Edge or Level Triggered
- * | | | | +--- Type: Wake-only, Runtime-only, or wake/runtime
+ * +-+-+-+---+-+-+-+
+ * |7|6|5|4:3|2|1|0|
+ * +-+-+-+---+-+-+-+
+ * | | | | | | |
+ * | | | | | | +--- Interrupt type: Edge or Level Triggered
+ * | | | | | +--- GPE can wake the system
+ * | | | | +--- Unused
* | | | +--- Type of dispatch -- to method, handler, or none
- * | | +--- Enabled for runtime?
- * | +--- Enabled for wake?
+ * | | +--- Unused
+ * | +--- Unused
* +--- Unused
*/
#define ACPI_GPE_XRUPT_TYPE_MASK (u8) 0x01
@@ -687,22 +688,13 @@ typedef u32 acpi_event_status;
#define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x06
#define ACPI_GPE_TYPE_WAKE (u8) 0x02
#define ACPI_GPE_TYPE_RUNTIME (u8) 0x04 /* Default */
+#define ACPI_GPE_CAN_WAKE (u8) 0x02
#define ACPI_GPE_DISPATCH_MASK (u8) 0x18
#define ACPI_GPE_DISPATCH_HANDLER (u8) 0x08
#define ACPI_GPE_DISPATCH_METHOD (u8) 0x10
#define ACPI_GPE_DISPATCH_NOT_USED (u8) 0x00 /* Default */
-#define ACPI_GPE_RUN_ENABLE_MASK (u8) 0x20
-#define ACPI_GPE_RUN_ENABLED (u8) 0x20
-#define ACPI_GPE_RUN_DISABLED (u8) 0x00 /* Default */
-
-#define ACPI_GPE_WAKE_ENABLE_MASK (u8) 0x40
-#define ACPI_GPE_WAKE_ENABLED (u8) 0x40
-#define ACPI_GPE_WAKE_DISABLED (u8) 0x00 /* Default */
-
-#define ACPI_GPE_ENABLE_MASK (u8) 0x60 /* Both run/wake */
-
/*
* Flags for GPE and Lock interfaces
*/
Index: linux-2.6/drivers/acpi/system.c
===================================================================
--- linux-2.6.orig/drivers/acpi/system.c
+++ linux-2.6/drivers/acpi/system.c
@@ -387,10 +387,10 @@ static ssize_t counter_set(struct kobjec
if (index < num_gpes) {
if (!strcmp(buf, "disable\n") &&
(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_disable_gpe(handle, index);
+ result = acpi_set_gpe(handle, index, ACPI_GPE_DISABLE);
else if (!strcmp(buf, "enable\n") &&
!(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_enable_gpe(handle, index);
+ result = acpi_set_gpe(handle, index, ACPI_GPE_ENABLE);
else if (!strcmp(buf, "clear\n") &&
(status & ACPI_EVENT_FLAG_SET))
result = acpi_clear_gpe(handle, index, ACPI_NOT_ISR);
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-19 21:23 [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs Moore, Robert
2010-02-19 23:14 ` Rafael J. Wysocki
2010-02-19 23:18 ` Rafael J. Wysocki
@ 2010-02-19 23:18 ` Rafael J. Wysocki
2010-02-23 0:26 ` Jesse Barnes
2010-02-23 0:26 ` Jesse Barnes
2 siblings, 2 replies; 23+ messages in thread
From: Rafael J. Wysocki @ 2010-02-19 23:18 UTC (permalink / raw)
To: Moore, Robert, Lin, Ming M
Cc: Matthew Garrett, Brown, Len, ACPI Devel Maling List, pm list,
Linux PCI, Jesse Barnes
[Sorry for resending, tried to restore the CC list.]
On Friday 19 February 2010, Moore, Robert wrote:
>
> Here's some comments and questions on the GPE changes in ACPICA.
> Overall, looks good.
First of all, thanks a lot for the review.
> Acpi_set_gpe - looks ok
>
> Acpi_enable_gpe
>
> + if (type & ACPI_GPE_TYPE_RUNTIME) {
> + if (++gpe_event_info->runtime_count == 1)
> + status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
>
> + if (ACPI_FAILURE(status))
> + gpe_event_info->runtime_count--;
> + }
>
> I would think the status check should be grouped like this:
>
> + if (type & ACPI_GPE_TYPE_RUNTIME) {
> + if (++gpe_event_info->runtime_count == 1) {
> + status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
>
> + if (ACPI_FAILURE(status))
> + gpe_event_info->runtime_count--;
> + }
> + }
Yes. It doesn't affect correctness, but it should be like that.
> Acpi_disable_gpe
>
> + acpi_ev_disable_gpe(gpe_event_info);
>
> There is a status returned by this function, should get it.
OK, although there doesn't seem to be any sensible action we
can perform if this acpi_ev_disable_gpe() returns failure.
> Should do a switch(type) and handle the bad type case.
Well, it seems sufficient to do
if (type & ~ACPI_TYPE_WAKE_RUN)
return_ACPI_STATUS(AE_BAD_PARAMETER);
In acpi_enable_gpe() too, BTW.
> +++ linux-2.6/drivers/acpi/ec.c
> + acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
> + acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
>
> Think you should have some comments here as to why exactly the code is
> Forcing a H/W disable/enable (in all places these functions are used)
Comments added.
> acpi_ev_update_gpe_enable_masks.
>
> My understanding is that this function changes to update the masks based upon the reference counters, instead of an input parameter.
That's correct.
> acpi_ev_enable_gpe:
>
> 1) I think we may not need the "write_to_hardware" parameter anymore.
Right.
> The calls to ev_enable_gpe that use FALSE for this parameter look like they
> could be simply replaced with a call to acpi_ev_update_gpe_enable_masks.
There's only one of them as far as I can see.
> 2) The GPE is only enabled if the runtime_count is non-zero. Would there
> ever be a situation where we might want to enable a GPE when the
> runtime_count is zero?
Yes, that's the case if the GPE is only enabled for wake-up, but it's done
with the help of acpi_set_gpe() (in wakeup.c). We still need the wake-up
reference counting for that, though.
> acpi_ev_disable_gpe: OK, just removing the obsolete flags
>
>
> acpi_ev_save_method_info:
>
> Default is still "runtime" gpe, unless _PRW is found later and then ACPI_GPE_CAN_WAKE is set, correct?
Yes.
> acpi_ev_initialize_gpe_block:
>
> Probably should still get the status from WalkNamespace and emit an
> ACPI_ERROR if this fails, since this would probably be a serious error if we
> could not get the _PRW methods.
In fact the old code overwrote the return value of acpi_ns_walk_namespace()
with the status returned by acpi_hw_enable_runtime_gpe_block() so we never
used it.
> acpi_ev_initialize_gpe_block:
>
> I wonder if we still need Boolean acpi_gbl_leave_wake_gpes_disabled.
I'm not sure, but if we are to remove it, that should be done with a separate
patch anyway.
> Why remove call to acpi_hw_enable_runtime_gpe_block?
Because we need to get the reference counting right from the start.
> It is much more efficient to do entire registers at once instead of
> repeatedly calling ev_enable_gpe.
It is, but I don't think that would be worth the increased code complexity
needed to update the reference counters as appropriate.
> +++ linux-2.6/include/acpi/actypes.h
>
> #define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x06
> #define ACPI_GPE_TYPE_WAKE (u8) 0x02
> #define ACPI_GPE_TYPE_RUNTIME (u8) 0x04 /* Default */
>
> These are obsolete and can be removed, yes?
No. We use them in acpi_[enable|disable]_gpe().
Updated patch is appended.
Rafael
---
Subject: ACPI: Use GPE reference counting to support shared GPEs (rev. 2)
From: Rafael J. Wysocki <rjw@sisk.pl>
ACPI GPEs may map to multiple devices. The current GPE interface
only provides a mechanism for enabling and disabling GPEs, making
it difficult to change the state of GPEs at runtime without extensive
cooperation between devices.
Add an API to allow devices to indicate whether or not they want
their device's GPE to be enabled for both runtime and wakeup events.
Remove the old GPE type handling entirely, which gets rid of various
quirks, like the implicit disabling with GPE type setting. This
requires a small amount of rework in order to ensure that non-wake
GPEs are enabled by default to preserve existing behaviour.
Based on patches from Matthew Garrett <mjg@redhat.com>.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/acpi/acpica/acevents.h | 10 --
drivers/acpi/acpica/aclocal.h | 2
drivers/acpi/acpica/evgpe.c | 161 ++++-------------------------------------
drivers/acpi/acpica/evgpeblk.c | 87 ++++++++--------------
drivers/acpi/acpica/evxface.c | 14 ---
drivers/acpi/acpica/evxfevnt.c | 95 +++++++++++++++++-------
drivers/acpi/button.c | 13 ++-
drivers/acpi/ec.c | 28 ++++---
drivers/acpi/sleep.c | 15 +++
drivers/acpi/system.c | 4 -
drivers/acpi/wakeup.c | 81 ++++++--------------
include/acpi/acpixf.h | 6 -
include/acpi/actypes.h | 28 ++-----
13 files changed, 207 insertions(+), 337 deletions(-)
Index: linux-2.6/drivers/acpi/acpica/aclocal.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/aclocal.h
+++ linux-2.6/drivers/acpi/acpica/aclocal.h
@@ -426,6 +426,8 @@ struct acpi_gpe_event_info {
struct acpi_gpe_register_info *register_info; /* Backpointer to register info */
u8 flags; /* Misc info about this GPE */
u8 gpe_number; /* This GPE */
+ u8 runtime_count;
+ u8 wakeup_count;
};
/* Information about a GPE register pair, one per each status/enable pair in an array */
Index: linux-2.6/drivers/acpi/acpica/evxfevnt.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evxfevnt.c
+++ linux-2.6/drivers/acpi/acpica/evxfevnt.c
@@ -201,23 +201,27 @@ ACPI_EXPORT_SYMBOL(acpi_enable_event)
/*******************************************************************************
*
- * FUNCTION: acpi_set_gpe_type
+ * FUNCTION: acpi_set_gpe
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Type - New GPE type
+ * action - Enable or disable
+ * Called from ISR or not
*
* RETURN: Status
*
- * DESCRIPTION: Set the type of an individual GPE
+ * DESCRIPTION: Enable or disable an ACPI event (general purpose)
*
******************************************************************************/
-acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type)
+acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action)
{
acpi_status status = AE_OK;
+ acpi_cpu_flags flags;
struct acpi_gpe_event_info *gpe_event_info;
- ACPI_FUNCTION_TRACE(acpi_set_gpe_type);
+ ACPI_FUNCTION_TRACE(acpi_set_gpe);
+
+ flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -227,19 +231,29 @@ acpi_status acpi_set_gpe_type(acpi_handl
goto unlock_and_exit;
}
- if ((gpe_event_info->flags & ACPI_GPE_TYPE_MASK) == type) {
- return_ACPI_STATUS(AE_OK);
- }
+ /* Perform the action */
- /* Set the new type (will disable GPE if currently enabled) */
+ switch (action) {
+ case ACPI_GPE_ENABLE:
+ status = acpi_ev_enable_gpe(gpe_event_info);
+ break;
+
+ case ACPI_GPE_DISABLE:
+ status = acpi_ev_disable_gpe(gpe_event_info);
+ break;
- status = acpi_ev_set_gpe_type(gpe_event_info, type);
+ default:
+ ACPI_ERROR((AE_INFO, "Invalid action\n"));
+ status = AE_BAD_PARAMETER;
+ break;
+ }
unlock_and_exit:
+ acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
+ACPI_EXPORT_SYMBOL(acpi_set_gpe)
/*******************************************************************************
*
@@ -247,15 +261,14 @@ ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Flags - Just enable, or also wake enable?
- * Called from ISR or not
+ * type - Purpose the GPE will be used for
*
* RETURN: Status
*
- * DESCRIPTION: Enable an ACPI event (general purpose)
+ * DESCRIPTION: Take a reference to a GPE and enable it if necessary
*
******************************************************************************/
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number)
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
{
acpi_status status = AE_OK;
acpi_cpu_flags flags;
@@ -263,6 +276,9 @@ acpi_status acpi_enable_gpe(acpi_handle
ACPI_FUNCTION_TRACE(acpi_enable_gpe);
+ if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
+ return_ACPI_STATUS(AE_BAD_PARAMETER);
+
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -273,15 +289,32 @@ acpi_status acpi_enable_gpe(acpi_handle
goto unlock_and_exit;
}
- /* Perform the enable */
+ if (type & ACPI_GPE_TYPE_RUNTIME) {
+ if (++gpe_event_info->runtime_count == 1) {
+ status = acpi_ev_enable_gpe(gpe_event_info);
+ if (ACPI_FAILURE(status))
+ gpe_event_info->runtime_count--;
+ }
+ }
+
+ if (type & ACPI_GPE_TYPE_WAKE) {
+ if (!(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
+ status = AE_BAD_PARAMETER;
+ goto unlock_and_exit;
+ }
- status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
+ /*
+ * Wake-up GPEs are only enabled right prior to putting the
+ * system into a sleep state.
+ */
+ if (++gpe_event_info->wakeup_count == 1)
+ acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ }
- unlock_and_exit:
+unlock_and_exit:
acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-
ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
/*******************************************************************************
@@ -290,15 +323,14 @@ ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Flags - Just disable, or also wake disable?
- * Called from ISR or not
+ * type - Purpose the GPE won't be used for any more
*
* RETURN: Status
*
- * DESCRIPTION: Disable an ACPI event (general purpose)
+ * DESCRIPTION: Release a reference to a GPE and disable it if necessary
*
******************************************************************************/
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number)
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
{
acpi_status status = AE_OK;
acpi_cpu_flags flags;
@@ -306,6 +338,9 @@ acpi_status acpi_disable_gpe(acpi_handle
ACPI_FUNCTION_TRACE(acpi_disable_gpe);
+ if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
+ return_ACPI_STATUS(AE_BAD_PARAMETER);
+
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -315,13 +350,23 @@ acpi_status acpi_disable_gpe(acpi_handle
goto unlock_and_exit;
}
- status = acpi_ev_disable_gpe(gpe_event_info);
+ if ((type & ACPI_GPE_TYPE_WAKE) && gpe_event_info->runtime_count)
+ if (--gpe_event_info->runtime_count == 0)
+ status = acpi_ev_disable_gpe(gpe_event_info);
+
+ if ((type & ACPI_GPE_TYPE_RUNTIME) && gpe_event_info->wakeup_count) {
+ /*
+ * Wake-up GPEs are not enabled after leaving system sleep
+ * states, so we don't need to disable them here.
+ */
+ if (--gpe_event_info->wakeup_count == 0)
+ acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ }
unlock_and_exit:
acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-
ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
/*******************************************************************************
Index: linux-2.6/include/acpi/acpixf.h
===================================================================
--- linux-2.6.orig/include/acpi/acpixf.h
+++ linux-2.6/include/acpi/acpixf.h
@@ -281,11 +281,11 @@ acpi_status acpi_get_event_status(u32 ev
/*
* GPE Interfaces
*/
-acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type);
+acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action);
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number);
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type);
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number);
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type);
acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags);
Index: linux-2.6/drivers/acpi/button.c
===================================================================
--- linux-2.6.orig/drivers/acpi/button.c
+++ linux-2.6/drivers/acpi/button.c
@@ -422,11 +422,9 @@ static int acpi_button_add(struct acpi_d
if (device->wakeup.flags.valid) {
/* Button's GPE is run-wake GPE */
- acpi_set_gpe_type(device->wakeup.gpe_device,
- device->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
acpi_enable_gpe(device->wakeup.gpe_device,
- device->wakeup.gpe_number);
+ device->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE_RUN);
device->wakeup.state.enabled = 1;
}
@@ -446,6 +444,13 @@ static int acpi_button_remove(struct acp
{
struct acpi_button *button = acpi_driver_data(device);
+ if (device->wakeup.flags.valid) {
+ acpi_disable_gpe(device->wakeup.gpe_device,
+ device->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE_RUN);
+ device->wakeup.state.enabled = 0;
+ }
+
acpi_button_remove_fs(device);
input_unregister_device(button->input);
kfree(button);
Index: linux-2.6/drivers/acpi/ec.c
===================================================================
--- linux-2.6.orig/drivers/acpi/ec.c
+++ linux-2.6/drivers/acpi/ec.c
@@ -307,7 +307,11 @@ static int acpi_ec_transaction(struct ac
pr_debug(PREFIX "transaction start\n");
/* disable GPE during transaction if storm is detected */
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
- acpi_disable_gpe(NULL, ec->gpe);
+ /*
+ * It has to be disabled at the hardware level regardless of the
+ * GPE reference counting, so that it doesn't trigger.
+ */
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
}
status = acpi_ec_transaction_unlocked(ec, t);
@@ -316,8 +320,12 @@ static int acpi_ec_transaction(struct ac
ec_check_sci_sync(ec, acpi_ec_read_status(ec));
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
msleep(1);
- /* it is safe to enable GPE outside of transaction */
- acpi_enable_gpe(NULL, ec->gpe);
+ /*
+ * It is safe to enable the GPE outside of the transaction. Use
+ * acpi_set_gpe() for that, since we used it to disable the GPE
+ * above.
+ */
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
} else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
pr_info(PREFIX "GPE storm detected, "
"transactions will use polling mode\n");
@@ -788,8 +796,8 @@ static int ec_install_handlers(struct ac
&acpi_ec_gpe_handler, ec);
if (ACPI_FAILURE(status))
return -ENODEV;
- acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
- acpi_enable_gpe(NULL, ec->gpe);
+
+ acpi_enable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
status = acpi_install_address_space_handler(ec->handle,
ACPI_ADR_SPACE_EC,
&acpi_ec_space_handler,
@@ -806,6 +814,7 @@ static int ec_install_handlers(struct ac
} else {
acpi_remove_gpe_handler(NULL, ec->gpe,
&acpi_ec_gpe_handler);
+ acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
return -ENODEV;
}
}
@@ -816,6 +825,7 @@ static int ec_install_handlers(struct ac
static void ec_remove_handlers(struct acpi_ec *ec)
{
+ acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
pr_err(PREFIX "failed to remove space handler\n");
@@ -1057,16 +1067,16 @@ error:
static int acpi_ec_suspend(struct acpi_device *device, pm_message_t state)
{
struct acpi_ec *ec = acpi_driver_data(device);
- /* Stop using GPE */
- acpi_disable_gpe(NULL, ec->gpe);
+ /* Stop using GPE, but keep it reference counted. */
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
return 0;
}
static int acpi_ec_resume(struct acpi_device *device)
{
struct acpi_ec *ec = acpi_driver_data(device);
- /* Enable use of GPE back */
- acpi_enable_gpe(NULL, ec->gpe);
+ /* Enable the GPE again, but don't reference count it once more. */
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
return 0;
}
Index: linux-2.6/drivers/acpi/sleep.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep.c
+++ linux-2.6/drivers/acpi/sleep.c
@@ -745,9 +745,18 @@ int acpi_pm_device_sleep_wake(struct dev
return -ENODEV;
}
- error = enable ?
- acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state) :
- acpi_disable_wakeup_device_power(adev);
+ if (enable) {
+ error = acpi_enable_wakeup_device_power(adev,
+ acpi_target_sleep_state);
+ if (!error)
+ acpi_enable_gpe(adev->wakeup.gpe_device,
+ adev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
+ } else {
+ acpi_disable_gpe(adev->wakeup.gpe_device, adev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
+ error = acpi_disable_wakeup_device_power(adev);
+ }
if (!error)
dev_info(dev, "wake-up capability %s by ACPI\n",
enable ? "enabled" : "disabled");
Index: linux-2.6/drivers/acpi/wakeup.c
===================================================================
--- linux-2.6.orig/drivers/acpi/wakeup.c
+++ linux-2.6/drivers/acpi/wakeup.c
@@ -21,12 +21,12 @@
ACPI_MODULE_NAME("wakeup_devices")
/**
- * acpi_enable_wakeup_device_prep - prepare wakeup devices
- * @sleep_state: ACPI state
- * Enable all wakup devices power if the devices' wakeup level
- * is higher than requested sleep level
+ * acpi_enable_wakeup_device_prep - Prepare wake-up devices.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * Enable all wake-up devices' power, unless the requested system sleep state is
+ * too deep.
*/
-
void acpi_enable_wakeup_device_prep(u8 sleep_state)
{
struct list_head *node, *next;
@@ -36,9 +36,8 @@ void acpi_enable_wakeup_device_prep(u8 s
struct acpi_device,
wakeup_list);
- if (!dev->wakeup.flags.valid ||
- !dev->wakeup.state.enabled ||
- (sleep_state > (u32) dev->wakeup.sleep_state))
+ if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
+ || (sleep_state > (u32) dev->wakeup.sleep_state))
continue;
acpi_enable_wakeup_device_power(dev, sleep_state);
@@ -46,9 +45,12 @@ void acpi_enable_wakeup_device_prep(u8 s
}
/**
- * acpi_enable_wakeup_device - enable wakeup devices
- * @sleep_state: ACPI state
- * Enable all wakup devices's GPE
+ * acpi_enable_wakeup_device - Enable wake-up device GPEs.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * Enable all wake-up devices' GPEs, with the assumption that
+ * acpi_disable_all_gpes() was executed before, so we don't need to disable any
+ * GPEs here.
*/
void acpi_enable_wakeup_device(u8 sleep_state)
{
@@ -65,29 +67,22 @@ void acpi_enable_wakeup_device(u8 sleep_
if (!dev->wakeup.flags.valid)
continue;
- /* If users want to disable run-wake GPE,
- * we only disable it for wake and leave it for runtime
- */
if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
- || sleep_state > (u32) dev->wakeup.sleep_state) {
- if (dev->wakeup.flags.run_wake) {
- /* set_gpe_type will disable GPE, leave it like that */
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_RUNTIME);
- }
+ || sleep_state > (u32) dev->wakeup.sleep_state)
continue;
- }
- if (!dev->wakeup.flags.run_wake)
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
+
+ /* The wake-up power should have been enabled already. */
+ acpi_set_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+ ACPI_GPE_ENABLE);
}
}
/**
- * acpi_disable_wakeup_device - disable devices' wakeup capability
- * @sleep_state: ACPI state
- * Disable all wakup devices's GPE and wakeup capability
+ * acpi_disable_wakeup_device - Disable devices' wakeup capability.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * This function only affects devices with wakeup.state.enabled set, which means
+ * that it reverses the changes made by acpi_enable_wakeup_device_prep().
*/
void acpi_disable_wakeup_device(u8 sleep_state)
{
@@ -97,30 +92,11 @@ void acpi_disable_wakeup_device(u8 sleep
struct acpi_device *dev =
container_of(node, struct acpi_device, wakeup_list);
- if (!dev->wakeup.flags.valid)
- continue;
-
- if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
- || sleep_state > (u32) dev->wakeup.sleep_state) {
- if (dev->wakeup.flags.run_wake) {
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
- /* Re-enable it, since set_gpe_type will disable it */
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
- }
+ if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
+ || (sleep_state > (u32) dev->wakeup.sleep_state))
continue;
- }
acpi_disable_wakeup_device_power(dev);
- /* Never disable run-wake GPE */
- if (!dev->wakeup.flags.run_wake) {
- acpi_disable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
- acpi_clear_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number, ACPI_NOT_ISR);
- }
}
}
@@ -136,11 +112,8 @@ int __init acpi_wakeup_device_init(void)
/* In case user doesn't load button driver */
if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
continue;
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
+ acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
dev->wakeup.state.enabled = 1;
}
mutex_unlock(&acpi_device_lock);
Index: linux-2.6/drivers/acpi/acpica/acevents.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/acevents.h
+++ linux-2.6/drivers/acpi/acpica/acevents.h
@@ -76,12 +76,9 @@ acpi_ev_queue_notify_request(struct acpi
* evgpe - GPE handling and dispatch
*/
acpi_status
-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
- u8 type);
+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info);
-acpi_status
-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
- u8 write_to_hardware);
+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);
acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);
@@ -122,9 +119,6 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_eve
u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);
acpi_status
-acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type);
-
-acpi_status
acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info);
acpi_status acpi_ev_gpe_initialize(void);
Index: linux-2.6/drivers/acpi/acpica/evgpe.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpe.c
+++ linux-2.6/drivers/acpi/acpica/evgpe.c
@@ -54,54 +54,9 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
/*******************************************************************************
*
- * FUNCTION: acpi_ev_set_gpe_type
- *
- * PARAMETERS: gpe_event_info - GPE to set
- * Type - New type
- *
- * RETURN: Status
- *
- * DESCRIPTION: Sets the new type for the GPE (wake, run, or wake/run)
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type)
-{
- acpi_status status;
-
- ACPI_FUNCTION_TRACE(ev_set_gpe_type);
-
- /* Validate type and update register enable masks */
-
- switch (type) {
- case ACPI_GPE_TYPE_WAKE:
- case ACPI_GPE_TYPE_RUNTIME:
- case ACPI_GPE_TYPE_WAKE_RUN:
- break;
-
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
- }
-
- /* Disable the GPE if currently enabled */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
-
- /* Clear the type bits and insert the new Type */
-
- gpe_event_info->flags &= ~ACPI_GPE_TYPE_MASK;
- gpe_event_info->flags |= type;
- return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
* FUNCTION: acpi_ev_update_gpe_enable_masks
*
* PARAMETERS: gpe_event_info - GPE to update
- * Type - What to do: ACPI_GPE_DISABLE or
- * ACPI_GPE_ENABLE
*
* RETURN: Status
*
@@ -110,8 +65,7 @@ acpi_ev_set_gpe_type(struct acpi_gpe_eve
******************************************************************************/
acpi_status
-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
- u8 type)
+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info)
{
struct acpi_gpe_register_info *gpe_register_info;
u8 register_bit;
@@ -127,37 +81,14 @@ acpi_ev_update_gpe_enable_masks(struct a
(1 <<
(gpe_event_info->gpe_number - gpe_register_info->base_gpe_number));
- /* 1) Disable case. Simply clear all enable bits */
-
- if (type == ACPI_GPE_DISABLE) {
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
- register_bit);
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- return_ACPI_STATUS(AE_OK);
- }
-
- /* 2) Enable case. Set/Clear the appropriate enable bits */
+ ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake, register_bit);
+ ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
- ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
-
- case ACPI_GPE_TYPE_RUNTIME:
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
- register_bit);
+ if (gpe_event_info->runtime_count)
ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
- case ACPI_GPE_TYPE_WAKE_RUN:
+ if (gpe_event_info->wakeup_count)
ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
- ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
-
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
- }
return_ACPI_STATUS(AE_OK);
}
@@ -167,8 +98,6 @@ acpi_ev_update_gpe_enable_masks(struct a
* FUNCTION: acpi_ev_enable_gpe
*
* PARAMETERS: gpe_event_info - GPE to enable
- * write_to_hardware - Enable now, or just mark data structs
- * (WAKE GPEs should be deferred)
*
* RETURN: Status
*
@@ -176,9 +105,7 @@ acpi_ev_update_gpe_enable_masks(struct a
*
******************************************************************************/
-acpi_status
-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
- u8 write_to_hardware)
+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
{
acpi_status status;
@@ -186,47 +113,20 @@ acpi_ev_enable_gpe(struct acpi_gpe_event
/* Make sure HW enable masks are updated */
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info, ACPI_GPE_ENABLE);
- if (ACPI_FAILURE(status)) {
+ status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
- }
/* Mark wake-enabled or HW enable, or both */
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
- break;
-
- case ACPI_GPE_TYPE_WAKE_RUN:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
-
- /*lint -fallthrough */
-
- case ACPI_GPE_TYPE_RUNTIME:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
-
- if (write_to_hardware) {
-
- /* Clear the GPE (of stale events), then enable it */
-
- status = acpi_hw_clear_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- return_ACPI_STATUS(status);
- }
-
- /* Enable the requested runtime GPE */
-
- status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
- }
- break;
+ if (gpe_event_info->runtime_count) {
+ /* Clear the GPE (of stale events), then enable it */
+ status = acpi_hw_clear_gpe(gpe_event_info);
+ if (ACPI_FAILURE(status))
+ return_ACPI_STATUS(status);
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
+ /* Enable the requested runtime GPE */
+ status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
}
return_ACPI_STATUS(AE_OK);
@@ -252,34 +152,9 @@ acpi_status acpi_ev_disable_gpe(struct a
/* Make sure HW enable masks are updated */
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info, ACPI_GPE_DISABLE);
- if (ACPI_FAILURE(status)) {
+ status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
- }
-
- /* Clear the appropriate enabled flags for this GPE */
-
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
- break;
-
- case ACPI_GPE_TYPE_WAKE_RUN:
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
-
- /* fallthrough */
-
- case ACPI_GPE_TYPE_RUNTIME:
-
- /* Disable the requested runtime GPE */
-
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
- break;
-
- default:
- break;
- }
/*
* Even if we don't know the GPE type, make sure that we always
@@ -521,7 +396,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
/* Set the GPE flags for return to enabled state */
- (void)acpi_ev_enable_gpe(gpe_event_info, FALSE);
+ (void)acpi_ev_update_gpe_enable_masks(gpe_event_info);
/*
* Take a snapshot of the GPE info for this level - we copy the info to
Index: linux-2.6/drivers/acpi/acpica/evgpeblk.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpeblk.c
+++ linux-2.6/drivers/acpi/acpica/evgpeblk.c
@@ -258,7 +258,6 @@ acpi_ev_save_method_info(acpi_handle obj
u32 gpe_number;
char name[ACPI_NAME_SIZE + 1];
u8 type;
- acpi_status status;
ACPI_FUNCTION_TRACE(ev_save_method_info);
@@ -325,26 +324,20 @@ acpi_ev_save_method_info(acpi_handle obj
/*
* Now we can add this information to the gpe_event_info block for use
- * during dispatch of this GPE. Default type is RUNTIME, although this may
- * change when the _PRW methods are executed later.
+ * during dispatch of this GPE.
*/
gpe_event_info =
&gpe_block->event_info[gpe_number - gpe_block->block_base_number];
- gpe_event_info->flags = (u8)
- (type | ACPI_GPE_DISPATCH_METHOD | ACPI_GPE_TYPE_RUNTIME);
+ gpe_event_info->flags = (u8) (type | ACPI_GPE_DISPATCH_METHOD);
gpe_event_info->dispatch.method_node =
(struct acpi_namespace_node *)obj_handle;
- /* Update enable mask, but don't enable the HW GPE as of yet */
-
- status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
-
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
"Registered GPE method %s as GPE number 0x%.2X\n",
name, gpe_number));
- return_ACPI_STATUS(status);
+ return_ACPI_STATUS(AE_OK);
}
/*******************************************************************************
@@ -454,20 +447,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle ob
gpe_block->
block_base_number];
- /* Mark GPE for WAKE-ONLY but WAKE_DISABLED */
-
- gpe_event_info->flags &=
- ~(ACPI_GPE_WAKE_ENABLED | ACPI_GPE_RUN_ENABLED);
-
- status =
- acpi_ev_set_gpe_type(gpe_event_info, ACPI_GPE_TYPE_WAKE);
- if (ACPI_FAILURE(status)) {
- goto cleanup;
- }
-
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info,
- ACPI_GPE_DISABLE);
+ gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
}
cleanup:
@@ -989,7 +969,6 @@ acpi_status
acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
struct acpi_gpe_block_info *gpe_block)
{
- acpi_status status;
struct acpi_gpe_event_info *gpe_event_info;
struct acpi_gpe_walk_info gpe_info;
u32 wake_gpe_count;
@@ -1019,42 +998,50 @@ acpi_ev_initialize_gpe_block(struct acpi
gpe_info.gpe_block = gpe_block;
gpe_info.gpe_device = gpe_device;
- status =
- acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+ acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, ACPI_NS_WALK_UNLOCK,
acpi_ev_match_prw_and_gpe, NULL,
&gpe_info, NULL);
}
/*
- * Enable all GPEs in this block that have these attributes:
- * 1) are "runtime" or "run/wake" GPEs, and
- * 2) have a corresponding _Lxx or _Exx method
- *
- * Any other GPEs within this block must be enabled via the
- * acpi_enable_gpe() external interface.
+ * Enable all GPEs that have a corresponding method and aren't
+ * capable of generating wakeups. Any other GPEs within this block
+ * must be enabled via the acpi_enable_gpe() interface.
*/
wake_gpe_count = 0;
gpe_enabled_count = 0;
+ if (gpe_device == acpi_gbl_fadt_gpe_device)
+ gpe_device = NULL;
for (i = 0; i < gpe_block->register_count; i++) {
- for (j = 0; j < 8; j++) {
+ for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
+ acpi_status status;
+ acpi_size gpe_index;
+ int gpe_number;
/* Get the info block for this particular GPE */
+ gpe_index = (acpi_size)i * ACPI_GPE_REGISTER_WIDTH + j;
+ gpe_event_info = &gpe_block->event_info[gpe_index];
- gpe_event_info = &gpe_block->event_info[((acpi_size) i *
- ACPI_GPE_REGISTER_WIDTH)
- + j];
-
- if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
- ACPI_GPE_DISPATCH_METHOD) &&
- (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) {
- gpe_enabled_count++;
- }
-
- if (gpe_event_info->flags & ACPI_GPE_TYPE_WAKE) {
+ if (gpe_event_info->flags & ACPI_GPE_CAN_WAKE) {
wake_gpe_count++;
+ if (acpi_gbl_leave_wake_gpes_disabled)
+ continue;
}
+
+ if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_METHOD))
+ continue;
+
+ 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))
+ ACPI_ERROR((AE_INFO,
+ "Failed to enable GPE %02X\n",
+ gpe_number));
+ else
+ gpe_enabled_count++;
}
}
@@ -1062,15 +1049,7 @@ acpi_ev_initialize_gpe_block(struct acpi
"Found %u Wake, Enabled %u Runtime GPEs in this block\n",
wake_gpe_count, gpe_enabled_count));
- /* Enable all valid runtime GPEs found above */
-
- status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block, NULL);
- if (ACPI_FAILURE(status)) {
- ACPI_ERROR((AE_INFO, "Could not enable GPEs in GpeBlock %p",
- gpe_block));
- }
-
- return_ACPI_STATUS(status);
+ return_ACPI_STATUS(AE_OK);
}
/*******************************************************************************
Index: linux-2.6/drivers/acpi/acpica/evxface.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evxface.c
+++ linux-2.6/drivers/acpi/acpica/evxface.c
@@ -617,13 +617,6 @@ acpi_install_gpe_handler(acpi_handle gpe
handler->context = context;
handler->method_node = gpe_event_info->dispatch.method_node;
- /* Disable the GPE before installing the handler */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- goto unlock_and_exit;
- }
-
/* Install the handler */
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
@@ -707,13 +700,6 @@ acpi_remove_gpe_handler(acpi_handle gpe_
goto unlock_and_exit;
}
- /* Disable the GPE before removing the handler */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- goto unlock_and_exit;
- }
-
/* Make sure all deferred tasks are completed */
(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
Index: linux-2.6/include/acpi/actypes.h
===================================================================
--- linux-2.6.orig/include/acpi/actypes.h
+++ linux-2.6/include/acpi/actypes.h
@@ -668,15 +668,16 @@ typedef u32 acpi_event_status;
/*
* GPE info flags - Per GPE
- * +-+-+-+---+---+-+
- * |7|6|5|4:3|2:1|0|
- * +-+-+-+---+---+-+
- * | | | | | |
- * | | | | | +--- Interrupt type: Edge or Level Triggered
- * | | | | +--- Type: Wake-only, Runtime-only, or wake/runtime
+ * +-+-+-+---+-+-+-+
+ * |7|6|5|4:3|2|1|0|
+ * +-+-+-+---+-+-+-+
+ * | | | | | | |
+ * | | | | | | +--- Interrupt type: Edge or Level Triggered
+ * | | | | | +--- GPE can wake the system
+ * | | | | +--- Unused
* | | | +--- Type of dispatch -- to method, handler, or none
- * | | +--- Enabled for runtime?
- * | +--- Enabled for wake?
+ * | | +--- Unused
+ * | +--- Unused
* +--- Unused
*/
#define ACPI_GPE_XRUPT_TYPE_MASK (u8) 0x01
@@ -687,22 +688,13 @@ typedef u32 acpi_event_status;
#define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x06
#define ACPI_GPE_TYPE_WAKE (u8) 0x02
#define ACPI_GPE_TYPE_RUNTIME (u8) 0x04 /* Default */
+#define ACPI_GPE_CAN_WAKE (u8) 0x02
#define ACPI_GPE_DISPATCH_MASK (u8) 0x18
#define ACPI_GPE_DISPATCH_HANDLER (u8) 0x08
#define ACPI_GPE_DISPATCH_METHOD (u8) 0x10
#define ACPI_GPE_DISPATCH_NOT_USED (u8) 0x00 /* Default */
-#define ACPI_GPE_RUN_ENABLE_MASK (u8) 0x20
-#define ACPI_GPE_RUN_ENABLED (u8) 0x20
-#define ACPI_GPE_RUN_DISABLED (u8) 0x00 /* Default */
-
-#define ACPI_GPE_WAKE_ENABLE_MASK (u8) 0x40
-#define ACPI_GPE_WAKE_ENABLED (u8) 0x40
-#define ACPI_GPE_WAKE_DISABLED (u8) 0x00 /* Default */
-
-#define ACPI_GPE_ENABLE_MASK (u8) 0x60 /* Both run/wake */
-
/*
* Flags for GPE and Lock interfaces
*/
Index: linux-2.6/drivers/acpi/system.c
===================================================================
--- linux-2.6.orig/drivers/acpi/system.c
+++ linux-2.6/drivers/acpi/system.c
@@ -387,10 +387,10 @@ static ssize_t counter_set(struct kobjec
if (index < num_gpes) {
if (!strcmp(buf, "disable\n") &&
(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_disable_gpe(handle, index);
+ result = acpi_set_gpe(handle, index, ACPI_GPE_DISABLE);
else if (!strcmp(buf, "enable\n") &&
!(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_enable_gpe(handle, index);
+ result = acpi_set_gpe(handle, index, ACPI_GPE_ENABLE);
else if (!strcmp(buf, "clear\n") &&
(status & ACPI_EVENT_FLAG_SET))
result = acpi_clear_gpe(handle, index, ACPI_NOT_ISR);
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-19 21:23 [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs Moore, Robert
2010-02-19 23:14 ` Rafael J. Wysocki
@ 2010-02-19 23:18 ` Rafael J. Wysocki
2010-02-19 23:18 ` Rafael J. Wysocki
2 siblings, 0 replies; 23+ messages in thread
From: Rafael J. Wysocki @ 2010-02-19 23:18 UTC (permalink / raw)
To: Moore, Robert, Lin, Ming M
Cc: Brown, Len, Linux PCI, Jesse Barnes, ACPI Devel Maling List,
pm list, Matthew Garrett
[Sorry for resending, tried to restore the CC list.]
On Friday 19 February 2010, Moore, Robert wrote:
>
> Here's some comments and questions on the GPE changes in ACPICA.
> Overall, looks good.
First of all, thanks a lot for the review.
> Acpi_set_gpe - looks ok
>
> Acpi_enable_gpe
>
> + if (type & ACPI_GPE_TYPE_RUNTIME) {
> + if (++gpe_event_info->runtime_count == 1)
> + status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
>
> + if (ACPI_FAILURE(status))
> + gpe_event_info->runtime_count--;
> + }
>
> I would think the status check should be grouped like this:
>
> + if (type & ACPI_GPE_TYPE_RUNTIME) {
> + if (++gpe_event_info->runtime_count == 1) {
> + status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
>
> + if (ACPI_FAILURE(status))
> + gpe_event_info->runtime_count--;
> + }
> + }
Yes. It doesn't affect correctness, but it should be like that.
> Acpi_disable_gpe
>
> + acpi_ev_disable_gpe(gpe_event_info);
>
> There is a status returned by this function, should get it.
OK, although there doesn't seem to be any sensible action we
can perform if this acpi_ev_disable_gpe() returns failure.
> Should do a switch(type) and handle the bad type case.
Well, it seems sufficient to do
if (type & ~ACPI_TYPE_WAKE_RUN)
return_ACPI_STATUS(AE_BAD_PARAMETER);
In acpi_enable_gpe() too, BTW.
> +++ linux-2.6/drivers/acpi/ec.c
> + acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
> + acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
>
> Think you should have some comments here as to why exactly the code is
> Forcing a H/W disable/enable (in all places these functions are used)
Comments added.
> acpi_ev_update_gpe_enable_masks.
>
> My understanding is that this function changes to update the masks based upon the reference counters, instead of an input parameter.
That's correct.
> acpi_ev_enable_gpe:
>
> 1) I think we may not need the "write_to_hardware" parameter anymore.
Right.
> The calls to ev_enable_gpe that use FALSE for this parameter look like they
> could be simply replaced with a call to acpi_ev_update_gpe_enable_masks.
There's only one of them as far as I can see.
> 2) The GPE is only enabled if the runtime_count is non-zero. Would there
> ever be a situation where we might want to enable a GPE when the
> runtime_count is zero?
Yes, that's the case if the GPE is only enabled for wake-up, but it's done
with the help of acpi_set_gpe() (in wakeup.c). We still need the wake-up
reference counting for that, though.
> acpi_ev_disable_gpe: OK, just removing the obsolete flags
>
>
> acpi_ev_save_method_info:
>
> Default is still "runtime" gpe, unless _PRW is found later and then ACPI_GPE_CAN_WAKE is set, correct?
Yes.
> acpi_ev_initialize_gpe_block:
>
> Probably should still get the status from WalkNamespace and emit an
> ACPI_ERROR if this fails, since this would probably be a serious error if we
> could not get the _PRW methods.
In fact the old code overwrote the return value of acpi_ns_walk_namespace()
with the status returned by acpi_hw_enable_runtime_gpe_block() so we never
used it.
> acpi_ev_initialize_gpe_block:
>
> I wonder if we still need Boolean acpi_gbl_leave_wake_gpes_disabled.
I'm not sure, but if we are to remove it, that should be done with a separate
patch anyway.
> Why remove call to acpi_hw_enable_runtime_gpe_block?
Because we need to get the reference counting right from the start.
> It is much more efficient to do entire registers at once instead of
> repeatedly calling ev_enable_gpe.
It is, but I don't think that would be worth the increased code complexity
needed to update the reference counters as appropriate.
> +++ linux-2.6/include/acpi/actypes.h
>
> #define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x06
> #define ACPI_GPE_TYPE_WAKE (u8) 0x02
> #define ACPI_GPE_TYPE_RUNTIME (u8) 0x04 /* Default */
>
> These are obsolete and can be removed, yes?
No. We use them in acpi_[enable|disable]_gpe().
Updated patch is appended.
Rafael
---
Subject: ACPI: Use GPE reference counting to support shared GPEs (rev. 2)
From: Rafael J. Wysocki <rjw@sisk.pl>
ACPI GPEs may map to multiple devices. The current GPE interface
only provides a mechanism for enabling and disabling GPEs, making
it difficult to change the state of GPEs at runtime without extensive
cooperation between devices.
Add an API to allow devices to indicate whether or not they want
their device's GPE to be enabled for both runtime and wakeup events.
Remove the old GPE type handling entirely, which gets rid of various
quirks, like the implicit disabling with GPE type setting. This
requires a small amount of rework in order to ensure that non-wake
GPEs are enabled by default to preserve existing behaviour.
Based on patches from Matthew Garrett <mjg@redhat.com>.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/acpi/acpica/acevents.h | 10 --
drivers/acpi/acpica/aclocal.h | 2
drivers/acpi/acpica/evgpe.c | 161 ++++-------------------------------------
drivers/acpi/acpica/evgpeblk.c | 87 ++++++++--------------
drivers/acpi/acpica/evxface.c | 14 ---
drivers/acpi/acpica/evxfevnt.c | 95 +++++++++++++++++-------
drivers/acpi/button.c | 13 ++-
drivers/acpi/ec.c | 28 ++++---
drivers/acpi/sleep.c | 15 +++
drivers/acpi/system.c | 4 -
drivers/acpi/wakeup.c | 81 ++++++--------------
include/acpi/acpixf.h | 6 -
include/acpi/actypes.h | 28 ++-----
13 files changed, 207 insertions(+), 337 deletions(-)
Index: linux-2.6/drivers/acpi/acpica/aclocal.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/aclocal.h
+++ linux-2.6/drivers/acpi/acpica/aclocal.h
@@ -426,6 +426,8 @@ struct acpi_gpe_event_info {
struct acpi_gpe_register_info *register_info; /* Backpointer to register info */
u8 flags; /* Misc info about this GPE */
u8 gpe_number; /* This GPE */
+ u8 runtime_count;
+ u8 wakeup_count;
};
/* Information about a GPE register pair, one per each status/enable pair in an array */
Index: linux-2.6/drivers/acpi/acpica/evxfevnt.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evxfevnt.c
+++ linux-2.6/drivers/acpi/acpica/evxfevnt.c
@@ -201,23 +201,27 @@ ACPI_EXPORT_SYMBOL(acpi_enable_event)
/*******************************************************************************
*
- * FUNCTION: acpi_set_gpe_type
+ * FUNCTION: acpi_set_gpe
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Type - New GPE type
+ * action - Enable or disable
+ * Called from ISR or not
*
* RETURN: Status
*
- * DESCRIPTION: Set the type of an individual GPE
+ * DESCRIPTION: Enable or disable an ACPI event (general purpose)
*
******************************************************************************/
-acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type)
+acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action)
{
acpi_status status = AE_OK;
+ acpi_cpu_flags flags;
struct acpi_gpe_event_info *gpe_event_info;
- ACPI_FUNCTION_TRACE(acpi_set_gpe_type);
+ ACPI_FUNCTION_TRACE(acpi_set_gpe);
+
+ flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -227,19 +231,29 @@ acpi_status acpi_set_gpe_type(acpi_handl
goto unlock_and_exit;
}
- if ((gpe_event_info->flags & ACPI_GPE_TYPE_MASK) == type) {
- return_ACPI_STATUS(AE_OK);
- }
+ /* Perform the action */
- /* Set the new type (will disable GPE if currently enabled) */
+ switch (action) {
+ case ACPI_GPE_ENABLE:
+ status = acpi_ev_enable_gpe(gpe_event_info);
+ break;
+
+ case ACPI_GPE_DISABLE:
+ status = acpi_ev_disable_gpe(gpe_event_info);
+ break;
- status = acpi_ev_set_gpe_type(gpe_event_info, type);
+ default:
+ ACPI_ERROR((AE_INFO, "Invalid action\n"));
+ status = AE_BAD_PARAMETER;
+ break;
+ }
unlock_and_exit:
+ acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
+ACPI_EXPORT_SYMBOL(acpi_set_gpe)
/*******************************************************************************
*
@@ -247,15 +261,14 @@ ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Flags - Just enable, or also wake enable?
- * Called from ISR or not
+ * type - Purpose the GPE will be used for
*
* RETURN: Status
*
- * DESCRIPTION: Enable an ACPI event (general purpose)
+ * DESCRIPTION: Take a reference to a GPE and enable it if necessary
*
******************************************************************************/
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number)
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
{
acpi_status status = AE_OK;
acpi_cpu_flags flags;
@@ -263,6 +276,9 @@ acpi_status acpi_enable_gpe(acpi_handle
ACPI_FUNCTION_TRACE(acpi_enable_gpe);
+ if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
+ return_ACPI_STATUS(AE_BAD_PARAMETER);
+
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -273,15 +289,32 @@ acpi_status acpi_enable_gpe(acpi_handle
goto unlock_and_exit;
}
- /* Perform the enable */
+ if (type & ACPI_GPE_TYPE_RUNTIME) {
+ if (++gpe_event_info->runtime_count == 1) {
+ status = acpi_ev_enable_gpe(gpe_event_info);
+ if (ACPI_FAILURE(status))
+ gpe_event_info->runtime_count--;
+ }
+ }
+
+ if (type & ACPI_GPE_TYPE_WAKE) {
+ if (!(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
+ status = AE_BAD_PARAMETER;
+ goto unlock_and_exit;
+ }
- status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
+ /*
+ * Wake-up GPEs are only enabled right prior to putting the
+ * system into a sleep state.
+ */
+ if (++gpe_event_info->wakeup_count == 1)
+ acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ }
- unlock_and_exit:
+unlock_and_exit:
acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-
ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
/*******************************************************************************
@@ -290,15 +323,14 @@ ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Flags - Just disable, or also wake disable?
- * Called from ISR or not
+ * type - Purpose the GPE won't be used for any more
*
* RETURN: Status
*
- * DESCRIPTION: Disable an ACPI event (general purpose)
+ * DESCRIPTION: Release a reference to a GPE and disable it if necessary
*
******************************************************************************/
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number)
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
{
acpi_status status = AE_OK;
acpi_cpu_flags flags;
@@ -306,6 +338,9 @@ acpi_status acpi_disable_gpe(acpi_handle
ACPI_FUNCTION_TRACE(acpi_disable_gpe);
+ if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
+ return_ACPI_STATUS(AE_BAD_PARAMETER);
+
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -315,13 +350,23 @@ acpi_status acpi_disable_gpe(acpi_handle
goto unlock_and_exit;
}
- status = acpi_ev_disable_gpe(gpe_event_info);
+ if ((type & ACPI_GPE_TYPE_WAKE) && gpe_event_info->runtime_count)
+ if (--gpe_event_info->runtime_count == 0)
+ status = acpi_ev_disable_gpe(gpe_event_info);
+
+ if ((type & ACPI_GPE_TYPE_RUNTIME) && gpe_event_info->wakeup_count) {
+ /*
+ * Wake-up GPEs are not enabled after leaving system sleep
+ * states, so we don't need to disable them here.
+ */
+ if (--gpe_event_info->wakeup_count == 0)
+ acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ }
unlock_and_exit:
acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-
ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
/*******************************************************************************
Index: linux-2.6/include/acpi/acpixf.h
===================================================================
--- linux-2.6.orig/include/acpi/acpixf.h
+++ linux-2.6/include/acpi/acpixf.h
@@ -281,11 +281,11 @@ acpi_status acpi_get_event_status(u32 ev
/*
* GPE Interfaces
*/
-acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type);
+acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action);
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number);
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type);
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number);
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type);
acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags);
Index: linux-2.6/drivers/acpi/button.c
===================================================================
--- linux-2.6.orig/drivers/acpi/button.c
+++ linux-2.6/drivers/acpi/button.c
@@ -422,11 +422,9 @@ static int acpi_button_add(struct acpi_d
if (device->wakeup.flags.valid) {
/* Button's GPE is run-wake GPE */
- acpi_set_gpe_type(device->wakeup.gpe_device,
- device->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
acpi_enable_gpe(device->wakeup.gpe_device,
- device->wakeup.gpe_number);
+ device->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE_RUN);
device->wakeup.state.enabled = 1;
}
@@ -446,6 +444,13 @@ static int acpi_button_remove(struct acp
{
struct acpi_button *button = acpi_driver_data(device);
+ if (device->wakeup.flags.valid) {
+ acpi_disable_gpe(device->wakeup.gpe_device,
+ device->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE_RUN);
+ device->wakeup.state.enabled = 0;
+ }
+
acpi_button_remove_fs(device);
input_unregister_device(button->input);
kfree(button);
Index: linux-2.6/drivers/acpi/ec.c
===================================================================
--- linux-2.6.orig/drivers/acpi/ec.c
+++ linux-2.6/drivers/acpi/ec.c
@@ -307,7 +307,11 @@ static int acpi_ec_transaction(struct ac
pr_debug(PREFIX "transaction start\n");
/* disable GPE during transaction if storm is detected */
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
- acpi_disable_gpe(NULL, ec->gpe);
+ /*
+ * It has to be disabled at the hardware level regardless of the
+ * GPE reference counting, so that it doesn't trigger.
+ */
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
}
status = acpi_ec_transaction_unlocked(ec, t);
@@ -316,8 +320,12 @@ static int acpi_ec_transaction(struct ac
ec_check_sci_sync(ec, acpi_ec_read_status(ec));
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
msleep(1);
- /* it is safe to enable GPE outside of transaction */
- acpi_enable_gpe(NULL, ec->gpe);
+ /*
+ * It is safe to enable the GPE outside of the transaction. Use
+ * acpi_set_gpe() for that, since we used it to disable the GPE
+ * above.
+ */
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
} else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
pr_info(PREFIX "GPE storm detected, "
"transactions will use polling mode\n");
@@ -788,8 +796,8 @@ static int ec_install_handlers(struct ac
&acpi_ec_gpe_handler, ec);
if (ACPI_FAILURE(status))
return -ENODEV;
- acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
- acpi_enable_gpe(NULL, ec->gpe);
+
+ acpi_enable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
status = acpi_install_address_space_handler(ec->handle,
ACPI_ADR_SPACE_EC,
&acpi_ec_space_handler,
@@ -806,6 +814,7 @@ static int ec_install_handlers(struct ac
} else {
acpi_remove_gpe_handler(NULL, ec->gpe,
&acpi_ec_gpe_handler);
+ acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
return -ENODEV;
}
}
@@ -816,6 +825,7 @@ static int ec_install_handlers(struct ac
static void ec_remove_handlers(struct acpi_ec *ec)
{
+ acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
pr_err(PREFIX "failed to remove space handler\n");
@@ -1057,16 +1067,16 @@ error:
static int acpi_ec_suspend(struct acpi_device *device, pm_message_t state)
{
struct acpi_ec *ec = acpi_driver_data(device);
- /* Stop using GPE */
- acpi_disable_gpe(NULL, ec->gpe);
+ /* Stop using GPE, but keep it reference counted. */
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
return 0;
}
static int acpi_ec_resume(struct acpi_device *device)
{
struct acpi_ec *ec = acpi_driver_data(device);
- /* Enable use of GPE back */
- acpi_enable_gpe(NULL, ec->gpe);
+ /* Enable the GPE again, but don't reference count it once more. */
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
return 0;
}
Index: linux-2.6/drivers/acpi/sleep.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep.c
+++ linux-2.6/drivers/acpi/sleep.c
@@ -745,9 +745,18 @@ int acpi_pm_device_sleep_wake(struct dev
return -ENODEV;
}
- error = enable ?
- acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state) :
- acpi_disable_wakeup_device_power(adev);
+ if (enable) {
+ error = acpi_enable_wakeup_device_power(adev,
+ acpi_target_sleep_state);
+ if (!error)
+ acpi_enable_gpe(adev->wakeup.gpe_device,
+ adev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
+ } else {
+ acpi_disable_gpe(adev->wakeup.gpe_device, adev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
+ error = acpi_disable_wakeup_device_power(adev);
+ }
if (!error)
dev_info(dev, "wake-up capability %s by ACPI\n",
enable ? "enabled" : "disabled");
Index: linux-2.6/drivers/acpi/wakeup.c
===================================================================
--- linux-2.6.orig/drivers/acpi/wakeup.c
+++ linux-2.6/drivers/acpi/wakeup.c
@@ -21,12 +21,12 @@
ACPI_MODULE_NAME("wakeup_devices")
/**
- * acpi_enable_wakeup_device_prep - prepare wakeup devices
- * @sleep_state: ACPI state
- * Enable all wakup devices power if the devices' wakeup level
- * is higher than requested sleep level
+ * acpi_enable_wakeup_device_prep - Prepare wake-up devices.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * Enable all wake-up devices' power, unless the requested system sleep state is
+ * too deep.
*/
-
void acpi_enable_wakeup_device_prep(u8 sleep_state)
{
struct list_head *node, *next;
@@ -36,9 +36,8 @@ void acpi_enable_wakeup_device_prep(u8 s
struct acpi_device,
wakeup_list);
- if (!dev->wakeup.flags.valid ||
- !dev->wakeup.state.enabled ||
- (sleep_state > (u32) dev->wakeup.sleep_state))
+ if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
+ || (sleep_state > (u32) dev->wakeup.sleep_state))
continue;
acpi_enable_wakeup_device_power(dev, sleep_state);
@@ -46,9 +45,12 @@ void acpi_enable_wakeup_device_prep(u8 s
}
/**
- * acpi_enable_wakeup_device - enable wakeup devices
- * @sleep_state: ACPI state
- * Enable all wakup devices's GPE
+ * acpi_enable_wakeup_device - Enable wake-up device GPEs.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * Enable all wake-up devices' GPEs, with the assumption that
+ * acpi_disable_all_gpes() was executed before, so we don't need to disable any
+ * GPEs here.
*/
void acpi_enable_wakeup_device(u8 sleep_state)
{
@@ -65,29 +67,22 @@ void acpi_enable_wakeup_device(u8 sleep_
if (!dev->wakeup.flags.valid)
continue;
- /* If users want to disable run-wake GPE,
- * we only disable it for wake and leave it for runtime
- */
if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
- || sleep_state > (u32) dev->wakeup.sleep_state) {
- if (dev->wakeup.flags.run_wake) {
- /* set_gpe_type will disable GPE, leave it like that */
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_RUNTIME);
- }
+ || sleep_state > (u32) dev->wakeup.sleep_state)
continue;
- }
- if (!dev->wakeup.flags.run_wake)
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
+
+ /* The wake-up power should have been enabled already. */
+ acpi_set_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+ ACPI_GPE_ENABLE);
}
}
/**
- * acpi_disable_wakeup_device - disable devices' wakeup capability
- * @sleep_state: ACPI state
- * Disable all wakup devices's GPE and wakeup capability
+ * acpi_disable_wakeup_device - Disable devices' wakeup capability.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * This function only affects devices with wakeup.state.enabled set, which means
+ * that it reverses the changes made by acpi_enable_wakeup_device_prep().
*/
void acpi_disable_wakeup_device(u8 sleep_state)
{
@@ -97,30 +92,11 @@ void acpi_disable_wakeup_device(u8 sleep
struct acpi_device *dev =
container_of(node, struct acpi_device, wakeup_list);
- if (!dev->wakeup.flags.valid)
- continue;
-
- if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
- || sleep_state > (u32) dev->wakeup.sleep_state) {
- if (dev->wakeup.flags.run_wake) {
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
- /* Re-enable it, since set_gpe_type will disable it */
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
- }
+ if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
+ || (sleep_state > (u32) dev->wakeup.sleep_state))
continue;
- }
acpi_disable_wakeup_device_power(dev);
- /* Never disable run-wake GPE */
- if (!dev->wakeup.flags.run_wake) {
- acpi_disable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
- acpi_clear_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number, ACPI_NOT_ISR);
- }
}
}
@@ -136,11 +112,8 @@ int __init acpi_wakeup_device_init(void)
/* In case user doesn't load button driver */
if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
continue;
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
+ acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
dev->wakeup.state.enabled = 1;
}
mutex_unlock(&acpi_device_lock);
Index: linux-2.6/drivers/acpi/acpica/acevents.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/acevents.h
+++ linux-2.6/drivers/acpi/acpica/acevents.h
@@ -76,12 +76,9 @@ acpi_ev_queue_notify_request(struct acpi
* evgpe - GPE handling and dispatch
*/
acpi_status
-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
- u8 type);
+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info);
-acpi_status
-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
- u8 write_to_hardware);
+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);
acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);
@@ -122,9 +119,6 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_eve
u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);
acpi_status
-acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type);
-
-acpi_status
acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info);
acpi_status acpi_ev_gpe_initialize(void);
Index: linux-2.6/drivers/acpi/acpica/evgpe.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpe.c
+++ linux-2.6/drivers/acpi/acpica/evgpe.c
@@ -54,54 +54,9 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
/*******************************************************************************
*
- * FUNCTION: acpi_ev_set_gpe_type
- *
- * PARAMETERS: gpe_event_info - GPE to set
- * Type - New type
- *
- * RETURN: Status
- *
- * DESCRIPTION: Sets the new type for the GPE (wake, run, or wake/run)
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type)
-{
- acpi_status status;
-
- ACPI_FUNCTION_TRACE(ev_set_gpe_type);
-
- /* Validate type and update register enable masks */
-
- switch (type) {
- case ACPI_GPE_TYPE_WAKE:
- case ACPI_GPE_TYPE_RUNTIME:
- case ACPI_GPE_TYPE_WAKE_RUN:
- break;
-
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
- }
-
- /* Disable the GPE if currently enabled */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
-
- /* Clear the type bits and insert the new Type */
-
- gpe_event_info->flags &= ~ACPI_GPE_TYPE_MASK;
- gpe_event_info->flags |= type;
- return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
* FUNCTION: acpi_ev_update_gpe_enable_masks
*
* PARAMETERS: gpe_event_info - GPE to update
- * Type - What to do: ACPI_GPE_DISABLE or
- * ACPI_GPE_ENABLE
*
* RETURN: Status
*
@@ -110,8 +65,7 @@ acpi_ev_set_gpe_type(struct acpi_gpe_eve
******************************************************************************/
acpi_status
-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
- u8 type)
+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info)
{
struct acpi_gpe_register_info *gpe_register_info;
u8 register_bit;
@@ -127,37 +81,14 @@ acpi_ev_update_gpe_enable_masks(struct a
(1 <<
(gpe_event_info->gpe_number - gpe_register_info->base_gpe_number));
- /* 1) Disable case. Simply clear all enable bits */
-
- if (type == ACPI_GPE_DISABLE) {
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
- register_bit);
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- return_ACPI_STATUS(AE_OK);
- }
-
- /* 2) Enable case. Set/Clear the appropriate enable bits */
+ ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake, register_bit);
+ ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
- ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
-
- case ACPI_GPE_TYPE_RUNTIME:
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
- register_bit);
+ if (gpe_event_info->runtime_count)
ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
- case ACPI_GPE_TYPE_WAKE_RUN:
+ if (gpe_event_info->wakeup_count)
ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
- ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
-
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
- }
return_ACPI_STATUS(AE_OK);
}
@@ -167,8 +98,6 @@ acpi_ev_update_gpe_enable_masks(struct a
* FUNCTION: acpi_ev_enable_gpe
*
* PARAMETERS: gpe_event_info - GPE to enable
- * write_to_hardware - Enable now, or just mark data structs
- * (WAKE GPEs should be deferred)
*
* RETURN: Status
*
@@ -176,9 +105,7 @@ acpi_ev_update_gpe_enable_masks(struct a
*
******************************************************************************/
-acpi_status
-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
- u8 write_to_hardware)
+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
{
acpi_status status;
@@ -186,47 +113,20 @@ acpi_ev_enable_gpe(struct acpi_gpe_event
/* Make sure HW enable masks are updated */
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info, ACPI_GPE_ENABLE);
- if (ACPI_FAILURE(status)) {
+ status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
- }
/* Mark wake-enabled or HW enable, or both */
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
- break;
-
- case ACPI_GPE_TYPE_WAKE_RUN:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
-
- /*lint -fallthrough */
-
- case ACPI_GPE_TYPE_RUNTIME:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
-
- if (write_to_hardware) {
-
- /* Clear the GPE (of stale events), then enable it */
-
- status = acpi_hw_clear_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- return_ACPI_STATUS(status);
- }
-
- /* Enable the requested runtime GPE */
-
- status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
- }
- break;
+ if (gpe_event_info->runtime_count) {
+ /* Clear the GPE (of stale events), then enable it */
+ status = acpi_hw_clear_gpe(gpe_event_info);
+ if (ACPI_FAILURE(status))
+ return_ACPI_STATUS(status);
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
+ /* Enable the requested runtime GPE */
+ status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
}
return_ACPI_STATUS(AE_OK);
@@ -252,34 +152,9 @@ acpi_status acpi_ev_disable_gpe(struct a
/* Make sure HW enable masks are updated */
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info, ACPI_GPE_DISABLE);
- if (ACPI_FAILURE(status)) {
+ status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
- }
-
- /* Clear the appropriate enabled flags for this GPE */
-
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
- break;
-
- case ACPI_GPE_TYPE_WAKE_RUN:
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
-
- /* fallthrough */
-
- case ACPI_GPE_TYPE_RUNTIME:
-
- /* Disable the requested runtime GPE */
-
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
- break;
-
- default:
- break;
- }
/*
* Even if we don't know the GPE type, make sure that we always
@@ -521,7 +396,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
/* Set the GPE flags for return to enabled state */
- (void)acpi_ev_enable_gpe(gpe_event_info, FALSE);
+ (void)acpi_ev_update_gpe_enable_masks(gpe_event_info);
/*
* Take a snapshot of the GPE info for this level - we copy the info to
Index: linux-2.6/drivers/acpi/acpica/evgpeblk.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpeblk.c
+++ linux-2.6/drivers/acpi/acpica/evgpeblk.c
@@ -258,7 +258,6 @@ acpi_ev_save_method_info(acpi_handle obj
u32 gpe_number;
char name[ACPI_NAME_SIZE + 1];
u8 type;
- acpi_status status;
ACPI_FUNCTION_TRACE(ev_save_method_info);
@@ -325,26 +324,20 @@ acpi_ev_save_method_info(acpi_handle obj
/*
* Now we can add this information to the gpe_event_info block for use
- * during dispatch of this GPE. Default type is RUNTIME, although this may
- * change when the _PRW methods are executed later.
+ * during dispatch of this GPE.
*/
gpe_event_info =
&gpe_block->event_info[gpe_number - gpe_block->block_base_number];
- gpe_event_info->flags = (u8)
- (type | ACPI_GPE_DISPATCH_METHOD | ACPI_GPE_TYPE_RUNTIME);
+ gpe_event_info->flags = (u8) (type | ACPI_GPE_DISPATCH_METHOD);
gpe_event_info->dispatch.method_node =
(struct acpi_namespace_node *)obj_handle;
- /* Update enable mask, but don't enable the HW GPE as of yet */
-
- status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
-
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
"Registered GPE method %s as GPE number 0x%.2X\n",
name, gpe_number));
- return_ACPI_STATUS(status);
+ return_ACPI_STATUS(AE_OK);
}
/*******************************************************************************
@@ -454,20 +447,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle ob
gpe_block->
block_base_number];
- /* Mark GPE for WAKE-ONLY but WAKE_DISABLED */
-
- gpe_event_info->flags &=
- ~(ACPI_GPE_WAKE_ENABLED | ACPI_GPE_RUN_ENABLED);
-
- status =
- acpi_ev_set_gpe_type(gpe_event_info, ACPI_GPE_TYPE_WAKE);
- if (ACPI_FAILURE(status)) {
- goto cleanup;
- }
-
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info,
- ACPI_GPE_DISABLE);
+ gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
}
cleanup:
@@ -989,7 +969,6 @@ acpi_status
acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
struct acpi_gpe_block_info *gpe_block)
{
- acpi_status status;
struct acpi_gpe_event_info *gpe_event_info;
struct acpi_gpe_walk_info gpe_info;
u32 wake_gpe_count;
@@ -1019,42 +998,50 @@ acpi_ev_initialize_gpe_block(struct acpi
gpe_info.gpe_block = gpe_block;
gpe_info.gpe_device = gpe_device;
- status =
- acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+ acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, ACPI_NS_WALK_UNLOCK,
acpi_ev_match_prw_and_gpe, NULL,
&gpe_info, NULL);
}
/*
- * Enable all GPEs in this block that have these attributes:
- * 1) are "runtime" or "run/wake" GPEs, and
- * 2) have a corresponding _Lxx or _Exx method
- *
- * Any other GPEs within this block must be enabled via the
- * acpi_enable_gpe() external interface.
+ * Enable all GPEs that have a corresponding method and aren't
+ * capable of generating wakeups. Any other GPEs within this block
+ * must be enabled via the acpi_enable_gpe() interface.
*/
wake_gpe_count = 0;
gpe_enabled_count = 0;
+ if (gpe_device == acpi_gbl_fadt_gpe_device)
+ gpe_device = NULL;
for (i = 0; i < gpe_block->register_count; i++) {
- for (j = 0; j < 8; j++) {
+ for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
+ acpi_status status;
+ acpi_size gpe_index;
+ int gpe_number;
/* Get the info block for this particular GPE */
+ gpe_index = (acpi_size)i * ACPI_GPE_REGISTER_WIDTH + j;
+ gpe_event_info = &gpe_block->event_info[gpe_index];
- gpe_event_info = &gpe_block->event_info[((acpi_size) i *
- ACPI_GPE_REGISTER_WIDTH)
- + j];
-
- if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
- ACPI_GPE_DISPATCH_METHOD) &&
- (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) {
- gpe_enabled_count++;
- }
-
- if (gpe_event_info->flags & ACPI_GPE_TYPE_WAKE) {
+ if (gpe_event_info->flags & ACPI_GPE_CAN_WAKE) {
wake_gpe_count++;
+ if (acpi_gbl_leave_wake_gpes_disabled)
+ continue;
}
+
+ if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_METHOD))
+ continue;
+
+ 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))
+ ACPI_ERROR((AE_INFO,
+ "Failed to enable GPE %02X\n",
+ gpe_number));
+ else
+ gpe_enabled_count++;
}
}
@@ -1062,15 +1049,7 @@ acpi_ev_initialize_gpe_block(struct acpi
"Found %u Wake, Enabled %u Runtime GPEs in this block\n",
wake_gpe_count, gpe_enabled_count));
- /* Enable all valid runtime GPEs found above */
-
- status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block, NULL);
- if (ACPI_FAILURE(status)) {
- ACPI_ERROR((AE_INFO, "Could not enable GPEs in GpeBlock %p",
- gpe_block));
- }
-
- return_ACPI_STATUS(status);
+ return_ACPI_STATUS(AE_OK);
}
/*******************************************************************************
Index: linux-2.6/drivers/acpi/acpica/evxface.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evxface.c
+++ linux-2.6/drivers/acpi/acpica/evxface.c
@@ -617,13 +617,6 @@ acpi_install_gpe_handler(acpi_handle gpe
handler->context = context;
handler->method_node = gpe_event_info->dispatch.method_node;
- /* Disable the GPE before installing the handler */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- goto unlock_and_exit;
- }
-
/* Install the handler */
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
@@ -707,13 +700,6 @@ acpi_remove_gpe_handler(acpi_handle gpe_
goto unlock_and_exit;
}
- /* Disable the GPE before removing the handler */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- goto unlock_and_exit;
- }
-
/* Make sure all deferred tasks are completed */
(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
Index: linux-2.6/include/acpi/actypes.h
===================================================================
--- linux-2.6.orig/include/acpi/actypes.h
+++ linux-2.6/include/acpi/actypes.h
@@ -668,15 +668,16 @@ typedef u32 acpi_event_status;
/*
* GPE info flags - Per GPE
- * +-+-+-+---+---+-+
- * |7|6|5|4:3|2:1|0|
- * +-+-+-+---+---+-+
- * | | | | | |
- * | | | | | +--- Interrupt type: Edge or Level Triggered
- * | | | | +--- Type: Wake-only, Runtime-only, or wake/runtime
+ * +-+-+-+---+-+-+-+
+ * |7|6|5|4:3|2|1|0|
+ * +-+-+-+---+-+-+-+
+ * | | | | | | |
+ * | | | | | | +--- Interrupt type: Edge or Level Triggered
+ * | | | | | +--- GPE can wake the system
+ * | | | | +--- Unused
* | | | +--- Type of dispatch -- to method, handler, or none
- * | | +--- Enabled for runtime?
- * | +--- Enabled for wake?
+ * | | +--- Unused
+ * | +--- Unused
* +--- Unused
*/
#define ACPI_GPE_XRUPT_TYPE_MASK (u8) 0x01
@@ -687,22 +688,13 @@ typedef u32 acpi_event_status;
#define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x06
#define ACPI_GPE_TYPE_WAKE (u8) 0x02
#define ACPI_GPE_TYPE_RUNTIME (u8) 0x04 /* Default */
+#define ACPI_GPE_CAN_WAKE (u8) 0x02
#define ACPI_GPE_DISPATCH_MASK (u8) 0x18
#define ACPI_GPE_DISPATCH_HANDLER (u8) 0x08
#define ACPI_GPE_DISPATCH_METHOD (u8) 0x10
#define ACPI_GPE_DISPATCH_NOT_USED (u8) 0x00 /* Default */
-#define ACPI_GPE_RUN_ENABLE_MASK (u8) 0x20
-#define ACPI_GPE_RUN_ENABLED (u8) 0x20
-#define ACPI_GPE_RUN_DISABLED (u8) 0x00 /* Default */
-
-#define ACPI_GPE_WAKE_ENABLE_MASK (u8) 0x40
-#define ACPI_GPE_WAKE_ENABLED (u8) 0x40
-#define ACPI_GPE_WAKE_DISABLED (u8) 0x00 /* Default */
-
-#define ACPI_GPE_ENABLE_MASK (u8) 0x60 /* Both run/wake */
-
/*
* Flags for GPE and Lock interfaces
*/
Index: linux-2.6/drivers/acpi/system.c
===================================================================
--- linux-2.6.orig/drivers/acpi/system.c
+++ linux-2.6/drivers/acpi/system.c
@@ -387,10 +387,10 @@ static ssize_t counter_set(struct kobjec
if (index < num_gpes) {
if (!strcmp(buf, "disable\n") &&
(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_disable_gpe(handle, index);
+ result = acpi_set_gpe(handle, index, ACPI_GPE_DISABLE);
else if (!strcmp(buf, "enable\n") &&
!(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_enable_gpe(handle, index);
+ result = acpi_set_gpe(handle, index, ACPI_GPE_ENABLE);
else if (!strcmp(buf, "clear\n") &&
(status & ACPI_EVENT_FLAG_SET))
result = acpi_clear_gpe(handle, index, ACPI_NOT_ISR);
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-19 23:18 ` Rafael J. Wysocki
@ 2010-02-23 0:26 ` Jesse Barnes
2010-02-23 23:52 ` Rafael J. Wysocki
2010-02-23 23:52 ` Rafael J. Wysocki
2010-02-23 0:26 ` Jesse Barnes
1 sibling, 2 replies; 23+ messages in thread
From: Jesse Barnes @ 2010-02-23 0:26 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Moore, Robert, Lin, Ming M, Matthew Garrett, Brown, Len,
ACPI Devel Maling List, pm list, Linux PCI
On Sat, 20 Feb 2010 00:18:02 +0100
"Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> [Sorry for resending, tried to restore the CC list.]
>
> On Friday 19 February 2010, Moore, Robert wrote:
> >
> > Here's some comments and questions on the GPE changes in ACPICA.
> > Overall, looks good.
>
> First of all, thanks a lot for the review.
I missed this one when applying the series, can you resend as an
incremental patch on top of linux-next?
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-19 23:18 ` Rafael J. Wysocki
2010-02-23 0:26 ` Jesse Barnes
@ 2010-02-23 0:26 ` Jesse Barnes
1 sibling, 0 replies; 23+ messages in thread
From: Jesse Barnes @ 2010-02-23 0:26 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Brown, Len, Lin, Ming M, Linux PCI, Moore, Robert,
ACPI Devel Maling List, pm list, Matthew Garrett
On Sat, 20 Feb 2010 00:18:02 +0100
"Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> [Sorry for resending, tried to restore the CC list.]
>
> On Friday 19 February 2010, Moore, Robert wrote:
> >
> > Here's some comments and questions on the GPE changes in ACPICA.
> > Overall, looks good.
>
> First of all, thanks a lot for the review.
I missed this one when applying the series, can you resend as an
incremental patch on top of linux-next?
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-23 0:26 ` Jesse Barnes
2010-02-23 23:52 ` Rafael J. Wysocki
@ 2010-02-23 23:52 ` Rafael J. Wysocki
2010-02-24 22:26 ` Jesse Barnes
2010-02-24 22:26 ` Jesse Barnes
1 sibling, 2 replies; 23+ messages in thread
From: Rafael J. Wysocki @ 2010-02-23 23:52 UTC (permalink / raw)
To: Jesse Barnes
Cc: Moore, Robert, Lin, Ming M, Matthew Garrett, Brown, Len,
ACPI Devel Maling List, pm list, Linux PCI
On Tuesday 23 February 2010, Jesse Barnes wrote:
> On Sat, 20 Feb 2010 00:18:02 +0100
> "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
>
> > [Sorry for resending, tried to restore the CC list.]
> >
> > On Friday 19 February 2010, Moore, Robert wrote:
> > >
> > > Here's some comments and questions on the GPE changes in ACPICA.
> > > Overall, looks good.
> >
> > First of all, thanks a lot for the review.
>
> I missed this one when applying the series, can you resend as an
> incremental patch on top of linux-next?
Sure, appended.
Please note that it also fixes a bug I found earlier today.
I added a changelog in case you want to apply it as a separate patch.
Rafael
---
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: ACPI: GPE refrence counting clean-ups
To fix a bug and address the reviewers' comments regarding the ACPI
GPE refcounting patch, do the following additional changes:
o Remove the second argument of acpi_ev_enable_gpe(),
'write_to_hardware', because it is not necessary any more.
o Add the "bad parameter" test against 'type' in
acpi_enable_gpe() and acpi_disable_gpe().
o Make acpi_enable_gpe() only check 'status' for runtime GPEs if
acpi_ev_enable_gpe() was actually called.
o Make acpi_disable_gpe() return 'status' returned by
acpi_ev_disable_gpe() and fix a bug where ACPI_GPE_TYPE_WAKE
and ACPI_GPE_TYPE_RUNTIME were exchanged by mistake.
o Add comments explaining why acpi_set_gpe() is used by the ACPI EC
driver.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/acpi/acpica/acevents.h | 4 +---
drivers/acpi/acpica/evgpe.c | 10 +++-------
drivers/acpi/acpica/evxfevnt.c | 24 +++++++++++++++---------
drivers/acpi/ec.c | 14 +++++++++++---
4 files changed, 30 insertions(+), 22 deletions(-)
Index: linux-2.6/drivers/acpi/acpica/acevents.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/acevents.h
+++ linux-2.6/drivers/acpi/acpica/acevents.h
@@ -78,9 +78,7 @@ acpi_ev_queue_notify_request(struct acpi
acpi_status
acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info);
-acpi_status
-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
- u8 write_to_hardware);
+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);
acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);
Index: linux-2.6/drivers/acpi/acpica/evgpe.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpe.c
+++ linux-2.6/drivers/acpi/acpica/evgpe.c
@@ -98,8 +98,6 @@ acpi_ev_update_gpe_enable_masks(struct a
* FUNCTION: acpi_ev_enable_gpe
*
* PARAMETERS: gpe_event_info - GPE to enable
- * write_to_hardware - Enable now, or just mark data structs
- * (WAKE GPEs should be deferred)
*
* RETURN: Status
*
@@ -107,9 +105,7 @@ acpi_ev_update_gpe_enable_masks(struct a
*
******************************************************************************/
-acpi_status
-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
- u8 write_to_hardware)
+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
{
acpi_status status;
@@ -123,7 +119,7 @@ acpi_ev_enable_gpe(struct acpi_gpe_event
/* Mark wake-enabled or HW enable, or both */
- if (gpe_event_info->runtime_count && write_to_hardware) {
+ if (gpe_event_info->runtime_count) {
/* Clear the GPE (of stale events), then enable it */
status = acpi_hw_clear_gpe(gpe_event_info);
if (ACPI_FAILURE(status))
@@ -400,7 +396,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
/* Set the GPE flags for return to enabled state */
- (void)acpi_ev_enable_gpe(gpe_event_info, FALSE);
+ (void)acpi_ev_update_gpe_enable_masks(gpe_event_info);
/*
* Take a snapshot of the GPE info for this level - we copy the info to
Index: linux-2.6/drivers/acpi/acpica/evxfevnt.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evxfevnt.c
+++ linux-2.6/drivers/acpi/acpica/evxfevnt.c
@@ -235,7 +235,7 @@ acpi_status acpi_set_gpe(acpi_handle gpe
switch (action) {
case ACPI_GPE_ENABLE:
- status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
+ status = acpi_ev_enable_gpe(gpe_event_info);
break;
case ACPI_GPE_DISABLE:
@@ -276,6 +276,9 @@ acpi_status acpi_enable_gpe(acpi_handle
ACPI_FUNCTION_TRACE(acpi_enable_gpe);
+ if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
+ return_ACPI_STATUS(AE_BAD_PARAMETER);
+
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -287,11 +290,11 @@ acpi_status acpi_enable_gpe(acpi_handle
}
if (type & ACPI_GPE_TYPE_RUNTIME) {
- if (++gpe_event_info->runtime_count == 1)
- status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
-
- if (ACPI_FAILURE(status))
- gpe_event_info->runtime_count--;
+ if (++gpe_event_info->runtime_count == 1) {
+ status = acpi_ev_enable_gpe(gpe_event_info);
+ if (ACPI_FAILURE(status))
+ gpe_event_info->runtime_count--;
+ }
}
if (type & ACPI_GPE_TYPE_WAKE) {
@@ -335,6 +338,9 @@ acpi_status acpi_disable_gpe(acpi_handle
ACPI_FUNCTION_TRACE(acpi_disable_gpe);
+ if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
+ return_ACPI_STATUS(AE_BAD_PARAMETER);
+
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -344,12 +350,12 @@ acpi_status acpi_disable_gpe(acpi_handle
goto unlock_and_exit;
}
- if ((type & ACPI_GPE_TYPE_WAKE) && gpe_event_info->runtime_count) {
+ if ((type & ACPI_GPE_TYPE_RUNTIME) && gpe_event_info->runtime_count) {
if (--gpe_event_info->runtime_count == 0)
- acpi_ev_disable_gpe(gpe_event_info);
+ status = acpi_ev_disable_gpe(gpe_event_info);
}
- if ((type & ACPI_GPE_TYPE_RUNTIME) && gpe_event_info->wakeup_count) {
+ if ((type & ACPI_GPE_TYPE_WAKE) && gpe_event_info->wakeup_count) {
/*
* Wake-up GPEs are not enabled after leaving system sleep
* states, so we don't need to disable them here.
Index: linux-2.6/drivers/acpi/ec.c
===================================================================
--- linux-2.6.orig/drivers/acpi/ec.c
+++ linux-2.6/drivers/acpi/ec.c
@@ -307,6 +307,10 @@ static int acpi_ec_transaction(struct ac
pr_debug(PREFIX "transaction start\n");
/* disable GPE during transaction if storm is detected */
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
+ /*
+ * It has to be disabled at the hardware level regardless of the
+ * GPE reference counting, so that it doesn't trigger.
+ */
acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
}
@@ -316,7 +320,11 @@ static int acpi_ec_transaction(struct ac
ec_check_sci_sync(ec, acpi_ec_read_status(ec));
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
msleep(1);
- /* it is safe to enable GPE outside of transaction */
+ /*
+ * It is safe to enable the GPE outside of the transaction. Use
+ * acpi_set_gpe() for that, since we used it to disable the GPE
+ * above.
+ */
acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
} else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
pr_info(PREFIX "GPE storm detected, "
@@ -1059,7 +1067,7 @@ error:
static int acpi_ec_suspend(struct acpi_device *device, pm_message_t state)
{
struct acpi_ec *ec = acpi_driver_data(device);
- /* Stop using GPE */
+ /* Stop using the GPE, but keep it reference counted. */
acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
return 0;
}
@@ -1067,7 +1075,7 @@ static int acpi_ec_suspend(struct acpi_d
static int acpi_ec_resume(struct acpi_device *device)
{
struct acpi_ec *ec = acpi_driver_data(device);
- /* Enable use of GPE back */
+ /* Enable the GPE again, but don't reference count it once more. */
acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
return 0;
}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-23 0:26 ` Jesse Barnes
@ 2010-02-23 23:52 ` Rafael J. Wysocki
2010-02-23 23:52 ` Rafael J. Wysocki
1 sibling, 0 replies; 23+ messages in thread
From: Rafael J. Wysocki @ 2010-02-23 23:52 UTC (permalink / raw)
To: Jesse Barnes
Cc: Brown, Len, Lin, Ming M, Linux PCI, Moore, Robert,
ACPI Devel Maling List, pm list, Matthew Garrett
On Tuesday 23 February 2010, Jesse Barnes wrote:
> On Sat, 20 Feb 2010 00:18:02 +0100
> "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
>
> > [Sorry for resending, tried to restore the CC list.]
> >
> > On Friday 19 February 2010, Moore, Robert wrote:
> > >
> > > Here's some comments and questions on the GPE changes in ACPICA.
> > > Overall, looks good.
> >
> > First of all, thanks a lot for the review.
>
> I missed this one when applying the series, can you resend as an
> incremental patch on top of linux-next?
Sure, appended.
Please note that it also fixes a bug I found earlier today.
I added a changelog in case you want to apply it as a separate patch.
Rafael
---
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: ACPI: GPE refrence counting clean-ups
To fix a bug and address the reviewers' comments regarding the ACPI
GPE refcounting patch, do the following additional changes:
o Remove the second argument of acpi_ev_enable_gpe(),
'write_to_hardware', because it is not necessary any more.
o Add the "bad parameter" test against 'type' in
acpi_enable_gpe() and acpi_disable_gpe().
o Make acpi_enable_gpe() only check 'status' for runtime GPEs if
acpi_ev_enable_gpe() was actually called.
o Make acpi_disable_gpe() return 'status' returned by
acpi_ev_disable_gpe() and fix a bug where ACPI_GPE_TYPE_WAKE
and ACPI_GPE_TYPE_RUNTIME were exchanged by mistake.
o Add comments explaining why acpi_set_gpe() is used by the ACPI EC
driver.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/acpi/acpica/acevents.h | 4 +---
drivers/acpi/acpica/evgpe.c | 10 +++-------
drivers/acpi/acpica/evxfevnt.c | 24 +++++++++++++++---------
drivers/acpi/ec.c | 14 +++++++++++---
4 files changed, 30 insertions(+), 22 deletions(-)
Index: linux-2.6/drivers/acpi/acpica/acevents.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/acevents.h
+++ linux-2.6/drivers/acpi/acpica/acevents.h
@@ -78,9 +78,7 @@ acpi_ev_queue_notify_request(struct acpi
acpi_status
acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info);
-acpi_status
-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
- u8 write_to_hardware);
+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);
acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);
Index: linux-2.6/drivers/acpi/acpica/evgpe.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpe.c
+++ linux-2.6/drivers/acpi/acpica/evgpe.c
@@ -98,8 +98,6 @@ acpi_ev_update_gpe_enable_masks(struct a
* FUNCTION: acpi_ev_enable_gpe
*
* PARAMETERS: gpe_event_info - GPE to enable
- * write_to_hardware - Enable now, or just mark data structs
- * (WAKE GPEs should be deferred)
*
* RETURN: Status
*
@@ -107,9 +105,7 @@ acpi_ev_update_gpe_enable_masks(struct a
*
******************************************************************************/
-acpi_status
-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
- u8 write_to_hardware)
+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
{
acpi_status status;
@@ -123,7 +119,7 @@ acpi_ev_enable_gpe(struct acpi_gpe_event
/* Mark wake-enabled or HW enable, or both */
- if (gpe_event_info->runtime_count && write_to_hardware) {
+ if (gpe_event_info->runtime_count) {
/* Clear the GPE (of stale events), then enable it */
status = acpi_hw_clear_gpe(gpe_event_info);
if (ACPI_FAILURE(status))
@@ -400,7 +396,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
/* Set the GPE flags for return to enabled state */
- (void)acpi_ev_enable_gpe(gpe_event_info, FALSE);
+ (void)acpi_ev_update_gpe_enable_masks(gpe_event_info);
/*
* Take a snapshot of the GPE info for this level - we copy the info to
Index: linux-2.6/drivers/acpi/acpica/evxfevnt.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evxfevnt.c
+++ linux-2.6/drivers/acpi/acpica/evxfevnt.c
@@ -235,7 +235,7 @@ acpi_status acpi_set_gpe(acpi_handle gpe
switch (action) {
case ACPI_GPE_ENABLE:
- status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
+ status = acpi_ev_enable_gpe(gpe_event_info);
break;
case ACPI_GPE_DISABLE:
@@ -276,6 +276,9 @@ acpi_status acpi_enable_gpe(acpi_handle
ACPI_FUNCTION_TRACE(acpi_enable_gpe);
+ if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
+ return_ACPI_STATUS(AE_BAD_PARAMETER);
+
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -287,11 +290,11 @@ acpi_status acpi_enable_gpe(acpi_handle
}
if (type & ACPI_GPE_TYPE_RUNTIME) {
- if (++gpe_event_info->runtime_count == 1)
- status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
-
- if (ACPI_FAILURE(status))
- gpe_event_info->runtime_count--;
+ if (++gpe_event_info->runtime_count == 1) {
+ status = acpi_ev_enable_gpe(gpe_event_info);
+ if (ACPI_FAILURE(status))
+ gpe_event_info->runtime_count--;
+ }
}
if (type & ACPI_GPE_TYPE_WAKE) {
@@ -335,6 +338,9 @@ acpi_status acpi_disable_gpe(acpi_handle
ACPI_FUNCTION_TRACE(acpi_disable_gpe);
+ if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
+ return_ACPI_STATUS(AE_BAD_PARAMETER);
+
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -344,12 +350,12 @@ acpi_status acpi_disable_gpe(acpi_handle
goto unlock_and_exit;
}
- if ((type & ACPI_GPE_TYPE_WAKE) && gpe_event_info->runtime_count) {
+ if ((type & ACPI_GPE_TYPE_RUNTIME) && gpe_event_info->runtime_count) {
if (--gpe_event_info->runtime_count == 0)
- acpi_ev_disable_gpe(gpe_event_info);
+ status = acpi_ev_disable_gpe(gpe_event_info);
}
- if ((type & ACPI_GPE_TYPE_RUNTIME) && gpe_event_info->wakeup_count) {
+ if ((type & ACPI_GPE_TYPE_WAKE) && gpe_event_info->wakeup_count) {
/*
* Wake-up GPEs are not enabled after leaving system sleep
* states, so we don't need to disable them here.
Index: linux-2.6/drivers/acpi/ec.c
===================================================================
--- linux-2.6.orig/drivers/acpi/ec.c
+++ linux-2.6/drivers/acpi/ec.c
@@ -307,6 +307,10 @@ static int acpi_ec_transaction(struct ac
pr_debug(PREFIX "transaction start\n");
/* disable GPE during transaction if storm is detected */
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
+ /*
+ * It has to be disabled at the hardware level regardless of the
+ * GPE reference counting, so that it doesn't trigger.
+ */
acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
}
@@ -316,7 +320,11 @@ static int acpi_ec_transaction(struct ac
ec_check_sci_sync(ec, acpi_ec_read_status(ec));
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
msleep(1);
- /* it is safe to enable GPE outside of transaction */
+ /*
+ * It is safe to enable the GPE outside of the transaction. Use
+ * acpi_set_gpe() for that, since we used it to disable the GPE
+ * above.
+ */
acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
} else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
pr_info(PREFIX "GPE storm detected, "
@@ -1059,7 +1067,7 @@ error:
static int acpi_ec_suspend(struct acpi_device *device, pm_message_t state)
{
struct acpi_ec *ec = acpi_driver_data(device);
- /* Stop using GPE */
+ /* Stop using the GPE, but keep it reference counted. */
acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
return 0;
}
@@ -1067,7 +1075,7 @@ static int acpi_ec_suspend(struct acpi_d
static int acpi_ec_resume(struct acpi_device *device)
{
struct acpi_ec *ec = acpi_driver_data(device);
- /* Enable use of GPE back */
+ /* Enable the GPE again, but don't reference count it once more. */
acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
return 0;
}
^ permalink raw reply [flat|nested] 23+ messages in thread
* RE: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-19 23:14 ` Rafael J. Wysocki
@ 2010-02-24 22:05 ` Moore, Robert
2010-02-25 15:14 ` Alexey Starikovskiy
1 sibling, 0 replies; 23+ messages in thread
From: Moore, Robert @ 2010-02-24 22:05 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Matthew Garrett, linux-acpi
Just a couple comments, nothing major.
>-----Original Message-----
>From: Rafael J. Wysocki [mailto:rjw@sisk.pl]
>Sent: Friday, February 19, 2010 3:14 PM
>To: Moore, Robert
>Cc: Matthew Garrett; linux-acpi@vger.kernel.org; Lin, Ming M; Brown, Len
>Subject: Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared
>GPEs
>
>On Friday 19 February 2010, Moore, Robert wrote:
>>
>> Here's some comments and questions on the GPE changes in ACPICA.
>> Overall, looks good.
>
>First of all, thanks a lot for the review.
>
>> Acpi_set_gpe - looks ok
>>
>> Acpi_enable_gpe
>>
>> + if (type & ACPI_GPE_TYPE_RUNTIME) {
>> + if (++gpe_event_info->runtime_count == 1)
>> + status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
>>
>> + if (ACPI_FAILURE(status))
>> + gpe_event_info->runtime_count--;
>> + }
>>
>> I would think the status check should be grouped like this:
>>
>> + if (type & ACPI_GPE_TYPE_RUNTIME) {
>> + if (++gpe_event_info->runtime_count == 1) {
>> + status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
>>
>> + if (ACPI_FAILURE(status))
>> + gpe_event_info->runtime_count--;
>> + }
>> + }
>
>Yes. It doesn't affect correctness, but it should be like that.
>
>> Acpi_disable_gpe
>>
>> + acpi_ev_disable_gpe(gpe_event_info);
>>
>> There is a status returned by this function, should get it.
>
>OK, although there doesn't seem to be any sensible action we
>can perform if this acpi_ev_disable_gpe() returns failure.
>
I believe that the direction we take on these types of things is that if it makes no sense to abort on a serious error, then print an error message.
>> Should do a switch(type) and handle the bad type case.
>
>Well, it seems sufficient to do
>
>if (type & ~ACPI_TYPE_WAKE_RUN)
> return_ACPI_STATUS(AE_BAD_PARAMETER);
>
>In acpi_enable_gpe() too, BTW.
>
Yes, OK.
>> +++ linux-2.6/drivers/acpi/ec.c
>> + acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
>> + acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
>>
>> Think you should have some comments here as to why exactly the code is
>> Forcing a H/W disable/enable (in all places these functions are used)
>
>Comments added.
>
>> acpi_ev_update_gpe_enable_masks.
>>
>> My understanding is that this function changes to update the masks based
>upon the reference counters, instead of an input parameter.
>
>That's correct.
>
>> acpi_ev_enable_gpe:
>>
>> 1) I think we may not need the "write_to_hardware" parameter anymore.
>
>Right.
>
>> The calls to ev_enable_gpe that use FALSE for this parameter look like
>they
>> could be simply replaced with a call to acpi_ev_update_gpe_enable_masks.
>
>There's only one of them as far as I can see.
I think there was two, but your patch removes one.
>
>> 2) The GPE is only enabled if the runtime_count is non-zero. Would there
>> ever be a situation where we might want to enable a GPE when the
>> runtime_count is zero?
>
>Yes, that's the case if the GPE is only enabled for wake-up, but it's done
>with the help of acpi_set_gpe() (in wakeup.c). We still need the wake-up
>reference counting for that, though.
>
>> acpi_ev_disable_gpe: OK, just removing the obsolete flags
>>
>>
>> acpi_ev_save_method_info:
>>
>> Default is still "runtime" gpe, unless _PRW is found later and then
>ACPI_GPE_CAN_WAKE is set, correct?
>
>Yes.
>
>> acpi_ev_initialize_gpe_block:
>>
>> Probably should still get the status from WalkNamespace and emit an
>> ACPI_ERROR if this fails, since this would probably be a serious error if
>we
>> could not get the _PRW methods.
>
>In fact the old code overwrote the return value of acpi_ns_walk_namespace()
>with the status returned by acpi_hw_enable_runtime_gpe_block() so we never
>used it.
Similar issue to the gpe disable; we don't want to abort anything, but a message would be nice when the machine won't wakeup.
>
>> acpi_ev_initialize_gpe_block:
>>
>> I wonder if we still need Boolean acpi_gbl_leave_wake_gpes_disabled.
>
>I'm not sure, but if we are to remove it, that should be done with a
>separate
>patch anyway.
I'll look back as to when and why this was added. Many of these things are "just in case" additions.
>
>> Why remove call to acpi_hw_enable_runtime_gpe_block?
>
>Because we need to get the reference counting right from the start.
>
>> It is much more efficient to do entire registers at once instead of
>> repeatedly calling ev_enable_gpe.
>
>It is, but I don't think that would be worth the increased code complexity
>needed to update the reference counters as appropriate.
>
>> +++ linux-2.6/include/acpi/actypes.h
>>
>> #define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x06
>> #define ACPI_GPE_TYPE_WAKE (u8) 0x02
>> #define ACPI_GPE_TYPE_RUNTIME (u8) 0x04 /* Default */
>>
>> These are obsolete and can be removed, yes?
>
>No. We use them in acpi_[enable|disable]_gpe().
>
>Updated patch is appended.
>
>Rafael
>
>---
>Subject: ACPI: Use GPE reference counting to support shared GPEs (rev. 2)
>From: Rafael J. Wysocki <rjw@sisk.pl>
>
>ACPI GPEs may map to multiple devices. The current GPE interface
>only provides a mechanism for enabling and disabling GPEs, making
>it difficult to change the state of GPEs at runtime without extensive
>cooperation between devices.
>
>Add an API to allow devices to indicate whether or not they want
>their device's GPE to be enabled for both runtime and wakeup events.
>
>Remove the old GPE type handling entirely, which gets rid of various
>quirks, like the implicit disabling with GPE type setting. This
>requires a small amount of rework in order to ensure that non-wake
>GPEs are enabled by default to preserve existing behaviour.
>
>Based on patches from Matthew Garrett <mjg@redhat.com>.
>
>Signed-off-by: Matthew Garrett <mjg@redhat.com>
>Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
>---
> drivers/acpi/acpica/acevents.h | 10 --
> drivers/acpi/acpica/aclocal.h | 2
> drivers/acpi/acpica/evgpe.c | 161 ++++--------------------------------
>-----
> drivers/acpi/acpica/evgpeblk.c | 87 ++++++++--------------
> drivers/acpi/acpica/evxface.c | 14 ---
> drivers/acpi/acpica/evxfevnt.c | 95 +++++++++++++++++-------
> drivers/acpi/button.c | 13 ++-
> drivers/acpi/ec.c | 28 ++++---
> drivers/acpi/sleep.c | 15 +++
> drivers/acpi/system.c | 4 -
> drivers/acpi/wakeup.c | 81 ++++++--------------
> include/acpi/acpixf.h | 6 -
> include/acpi/actypes.h | 28 ++-----
> 13 files changed, 207 insertions(+), 337 deletions(-)
>
>Index: linux-2.6/drivers/acpi/acpica/aclocal.h
>===================================================================
>--- linux-2.6.orig/drivers/acpi/acpica/aclocal.h
>+++ linux-2.6/drivers/acpi/acpica/aclocal.h
>@@ -426,6 +426,8 @@ struct acpi_gpe_event_info {
> struct acpi_gpe_register_info *register_info; /* Backpointer to
>register info */
> u8 flags; /* Misc info about this GPE */
> u8 gpe_number; /* This GPE */
>+ u8 runtime_count;
>+ u8 wakeup_count;
> };
>
> /* Information about a GPE register pair, one per each status/enable pair
>in an array */
>Index: linux-2.6/drivers/acpi/acpica/evxfevnt.c
>===================================================================
>--- linux-2.6.orig/drivers/acpi/acpica/evxfevnt.c
>+++ linux-2.6/drivers/acpi/acpica/evxfevnt.c
>@@ -201,23 +201,27 @@ ACPI_EXPORT_SYMBOL(acpi_enable_event)
>
>
>/**************************************************************************
>*****
> *
>- * FUNCTION: acpi_set_gpe_type
>+ * FUNCTION: acpi_set_gpe
> *
> * PARAMETERS: gpe_device - Parent GPE Device
> * gpe_number - GPE level within the GPE block
>- * Type - New GPE type
>+ * action - Enable or disable
>+ * Called from ISR or not
> *
> * RETURN: Status
> *
>- * DESCRIPTION: Set the type of an individual GPE
>+ * DESCRIPTION: Enable or disable an ACPI event (general purpose)
> *
>
>***************************************************************************
>***/
>-acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8
>type)
>+acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8
>action)
> {
> acpi_status status = AE_OK;
>+ acpi_cpu_flags flags;
> struct acpi_gpe_event_info *gpe_event_info;
>
>- ACPI_FUNCTION_TRACE(acpi_set_gpe_type);
>+ ACPI_FUNCTION_TRACE(acpi_set_gpe);
>+
>+ flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
>
> /* Ensure that we have a valid GPE number */
>
>@@ -227,19 +231,29 @@ acpi_status acpi_set_gpe_type(acpi_handl
> goto unlock_and_exit;
> }
>
>- if ((gpe_event_info->flags & ACPI_GPE_TYPE_MASK) == type) {
>- return_ACPI_STATUS(AE_OK);
>- }
>+ /* Perform the action */
>
>- /* Set the new type (will disable GPE if currently enabled) */
>+ switch (action) {
>+ case ACPI_GPE_ENABLE:
>+ status = acpi_ev_enable_gpe(gpe_event_info);
>+ break;
>+
>+ case ACPI_GPE_DISABLE:
>+ status = acpi_ev_disable_gpe(gpe_event_info);
>+ break;
>
>- status = acpi_ev_set_gpe_type(gpe_event_info, type);
>+ default:
>+ ACPI_ERROR((AE_INFO, "Invalid action\n"));
>+ status = AE_BAD_PARAMETER;
>+ break;
>+ }
>
> unlock_and_exit:
>+ acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
> return_ACPI_STATUS(status);
> }
>
>-ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
>+ACPI_EXPORT_SYMBOL(acpi_set_gpe)
>
>
>/**************************************************************************
>*****
> *
>@@ -247,15 +261,14 @@ ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
> *
> * PARAMETERS: gpe_device - Parent GPE Device
> * gpe_number - GPE level within the GPE block
>- * Flags - Just enable, or also wake enable?
>- * Called from ISR or not
>+ * type - Purpose the GPE will be used for
> *
> * RETURN: Status
> *
>- * DESCRIPTION: Enable an ACPI event (general purpose)
>+ * DESCRIPTION: Take a reference to a GPE and enable it if necessary
> *
>
>***************************************************************************
>***/
>-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number)
>+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8
>type)
> {
> acpi_status status = AE_OK;
> acpi_cpu_flags flags;
>@@ -263,6 +276,9 @@ acpi_status acpi_enable_gpe(acpi_handle
>
> ACPI_FUNCTION_TRACE(acpi_enable_gpe);
>
>+ if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
>+ return_ACPI_STATUS(AE_BAD_PARAMETER);
>+
> flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
>
> /* Ensure that we have a valid GPE number */
>@@ -273,15 +289,32 @@ acpi_status acpi_enable_gpe(acpi_handle
> goto unlock_and_exit;
> }
>
>- /* Perform the enable */
>+ if (type & ACPI_GPE_TYPE_RUNTIME) {
>+ if (++gpe_event_info->runtime_count == 1) {
>+ status = acpi_ev_enable_gpe(gpe_event_info);
>+ if (ACPI_FAILURE(status))
>+ gpe_event_info->runtime_count--;
>+ }
>+ }
>+
>+ if (type & ACPI_GPE_TYPE_WAKE) {
>+ if (!(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
>+ status = AE_BAD_PARAMETER;
>+ goto unlock_and_exit;
>+ }
>
>- status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
>+ /*
>+ * Wake-up GPEs are only enabled right prior to putting the
>+ * system into a sleep state.
>+ */
>+ if (++gpe_event_info->wakeup_count == 1)
>+ acpi_ev_update_gpe_enable_masks(gpe_event_info);
>+ }
>
>- unlock_and_exit:
>+unlock_and_exit:
> acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
> return_ACPI_STATUS(status);
> }
>-
> ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
>
>
>/**************************************************************************
>*****
>@@ -290,15 +323,14 @@ ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
> *
> * PARAMETERS: gpe_device - Parent GPE Device
> * gpe_number - GPE level within the GPE block
>- * Flags - Just disable, or also wake disable?
>- * Called from ISR or not
>+ * type - Purpose the GPE won't be used for any
>more
> *
> * RETURN: Status
> *
>- * DESCRIPTION: Disable an ACPI event (general purpose)
>+ * DESCRIPTION: Release a reference to a GPE and disable it if necessary
> *
>
>***************************************************************************
>***/
>-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number)
>+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8
>type)
> {
> acpi_status status = AE_OK;
> acpi_cpu_flags flags;
>@@ -306,6 +338,9 @@ acpi_status acpi_disable_gpe(acpi_handle
>
> ACPI_FUNCTION_TRACE(acpi_disable_gpe);
>
>+ if (type & ~ACPI_GPE_TYPE_WAKE_RUN)
>+ return_ACPI_STATUS(AE_BAD_PARAMETER);
>+
> flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
> /* Ensure that we have a valid GPE number */
>
>@@ -315,13 +350,23 @@ acpi_status acpi_disable_gpe(acpi_handle
> goto unlock_and_exit;
> }
>
>- status = acpi_ev_disable_gpe(gpe_event_info);
>+ if ((type & ACPI_GPE_TYPE_WAKE) && gpe_event_info->runtime_count)
>+ if (--gpe_event_info->runtime_count == 0)
>+ status = acpi_ev_disable_gpe(gpe_event_info);
>+
>+ if ((type & ACPI_GPE_TYPE_RUNTIME) && gpe_event_info->wakeup_count) {
>+ /*
>+ * Wake-up GPEs are not enabled after leaving system sleep
>+ * states, so we don't need to disable them here.
>+ */
>+ if (--gpe_event_info->wakeup_count == 0)
>+ acpi_ev_update_gpe_enable_masks(gpe_event_info);
>+ }
>
> unlock_and_exit:
> acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
> return_ACPI_STATUS(status);
> }
>-
> ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
>
>
>/**************************************************************************
>*****
>Index: linux-2.6/include/acpi/acpixf.h
>===================================================================
>--- linux-2.6.orig/include/acpi/acpixf.h
>+++ linux-2.6/include/acpi/acpixf.h
>@@ -281,11 +281,11 @@ acpi_status acpi_get_event_status(u32 ev
> /*
> * GPE Interfaces
> */
>-acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8
>type);
>+acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8
>action);
>
>-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number);
>+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8
>type);
>
>-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number);
>+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8
>type);
>
> acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32
>flags);
>
>Index: linux-2.6/drivers/acpi/button.c
>===================================================================
>--- linux-2.6.orig/drivers/acpi/button.c
>+++ linux-2.6/drivers/acpi/button.c
>@@ -422,11 +422,9 @@ static int acpi_button_add(struct acpi_d
>
> if (device->wakeup.flags.valid) {
> /* Button's GPE is run-wake GPE */
>- acpi_set_gpe_type(device->wakeup.gpe_device,
>- device->wakeup.gpe_number,
>- ACPI_GPE_TYPE_WAKE_RUN);
> acpi_enable_gpe(device->wakeup.gpe_device,
>- device->wakeup.gpe_number);
>+ device->wakeup.gpe_number,
>+ ACPI_GPE_TYPE_WAKE_RUN);
> device->wakeup.state.enabled = 1;
> }
>
>@@ -446,6 +444,13 @@ static int acpi_button_remove(struct acp
> {
> struct acpi_button *button = acpi_driver_data(device);
>
>+ if (device->wakeup.flags.valid) {
>+ acpi_disable_gpe(device->wakeup.gpe_device,
>+ device->wakeup.gpe_number,
>+ ACPI_GPE_TYPE_WAKE_RUN);
>+ device->wakeup.state.enabled = 0;
>+ }
>+
> acpi_button_remove_fs(device);
> input_unregister_device(button->input);
> kfree(button);
>Index: linux-2.6/drivers/acpi/ec.c
>===================================================================
>--- linux-2.6.orig/drivers/acpi/ec.c
>+++ linux-2.6/drivers/acpi/ec.c
>@@ -307,7 +307,11 @@ static int acpi_ec_transaction(struct ac
> pr_debug(PREFIX "transaction start\n");
> /* disable GPE during transaction if storm is detected */
> if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
>- acpi_disable_gpe(NULL, ec->gpe);
>+ /*
>+ * It has to be disabled at the hardware level regardless of
>the
>+ * GPE reference counting, so that it doesn't trigger.
>+ */
>+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
> }
>
> status = acpi_ec_transaction_unlocked(ec, t);
>@@ -316,8 +320,12 @@ static int acpi_ec_transaction(struct ac
> ec_check_sci_sync(ec, acpi_ec_read_status(ec));
> if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
> msleep(1);
>- /* it is safe to enable GPE outside of transaction */
>- acpi_enable_gpe(NULL, ec->gpe);
>+ /*
>+ * It is safe to enable the GPE outside of the transaction.
>Use
>+ * acpi_set_gpe() for that, since we used it to disable the GPE
>+ * above.
>+ */
>+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
> } else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
> pr_info(PREFIX "GPE storm detected, "
> "transactions will use polling mode\n");
>@@ -788,8 +796,8 @@ static int ec_install_handlers(struct ac
> &acpi_ec_gpe_handler, ec);
> if (ACPI_FAILURE(status))
> return -ENODEV;
>- acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
>- acpi_enable_gpe(NULL, ec->gpe);
>+
>+ acpi_enable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
> status = acpi_install_address_space_handler(ec->handle,
> ACPI_ADR_SPACE_EC,
> &acpi_ec_space_handler,
>@@ -806,6 +814,7 @@ static int ec_install_handlers(struct ac
> } else {
> acpi_remove_gpe_handler(NULL, ec->gpe,
> &acpi_ec_gpe_handler);
>+ acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
> return -ENODEV;
> }
> }
>@@ -816,6 +825,7 @@ static int ec_install_handlers(struct ac
>
> static void ec_remove_handlers(struct acpi_ec *ec)
> {
>+ acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
> if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
> ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
> pr_err(PREFIX "failed to remove space handler\n");
>@@ -1057,16 +1067,16 @@ error:
> static int acpi_ec_suspend(struct acpi_device *device, pm_message_t state)
> {
> struct acpi_ec *ec = acpi_driver_data(device);
>- /* Stop using GPE */
>- acpi_disable_gpe(NULL, ec->gpe);
>+ /* Stop using GPE, but keep it reference counted. */
>+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
> return 0;
> }
>
> static int acpi_ec_resume(struct acpi_device *device)
> {
> struct acpi_ec *ec = acpi_driver_data(device);
>- /* Enable use of GPE back */
>- acpi_enable_gpe(NULL, ec->gpe);
>+ /* Enable the GPE again, but don't reference count it once more. */
>+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
> return 0;
> }
>
>Index: linux-2.6/drivers/acpi/sleep.c
>===================================================================
>--- linux-2.6.orig/drivers/acpi/sleep.c
>+++ linux-2.6/drivers/acpi/sleep.c
>@@ -745,9 +745,18 @@ int acpi_pm_device_sleep_wake(struct dev
> return -ENODEV;
> }
>
>- error = enable ?
>- acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state)
>:
>- acpi_disable_wakeup_device_power(adev);
>+ if (enable) {
>+ error = acpi_enable_wakeup_device_power(adev,
>+ acpi_target_sleep_state);
>+ if (!error)
>+ acpi_enable_gpe(adev->wakeup.gpe_device,
>+ adev->wakeup.gpe_number,
>+ ACPI_GPE_TYPE_WAKE);
>+ } else {
>+ acpi_disable_gpe(adev->wakeup.gpe_device, adev-
>>wakeup.gpe_number,
>+ ACPI_GPE_TYPE_WAKE);
>+ error = acpi_disable_wakeup_device_power(adev);
>+ }
> if (!error)
> dev_info(dev, "wake-up capability %s by ACPI\n",
> enable ? "enabled" : "disabled");
>Index: linux-2.6/drivers/acpi/wakeup.c
>===================================================================
>--- linux-2.6.orig/drivers/acpi/wakeup.c
>+++ linux-2.6/drivers/acpi/wakeup.c
>@@ -21,12 +21,12 @@
> ACPI_MODULE_NAME("wakeup_devices")
>
> /**
>- * acpi_enable_wakeup_device_prep - prepare wakeup devices
>- * @sleep_state: ACPI state
>- * Enable all wakup devices power if the devices' wakeup level
>- * is higher than requested sleep level
>+ * acpi_enable_wakeup_device_prep - Prepare wake-up devices.
>+ * @sleep_state: ACPI system sleep state.
>+ *
>+ * Enable all wake-up devices' power, unless the requested system sleep
>state is
>+ * too deep.
> */
>-
> void acpi_enable_wakeup_device_prep(u8 sleep_state)
> {
> struct list_head *node, *next;
>@@ -36,9 +36,8 @@ void acpi_enable_wakeup_device_prep(u8 s
> struct acpi_device,
> wakeup_list);
>
>- if (!dev->wakeup.flags.valid ||
>- !dev->wakeup.state.enabled ||
>- (sleep_state > (u32) dev->wakeup.sleep_state))
>+ if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
>+ || (sleep_state > (u32) dev->wakeup.sleep_state))
> continue;
>
> acpi_enable_wakeup_device_power(dev, sleep_state);
>@@ -46,9 +45,12 @@ void acpi_enable_wakeup_device_prep(u8 s
> }
>
> /**
>- * acpi_enable_wakeup_device - enable wakeup devices
>- * @sleep_state: ACPI state
>- * Enable all wakup devices's GPE
>+ * acpi_enable_wakeup_device - Enable wake-up device GPEs.
>+ * @sleep_state: ACPI system sleep state.
>+ *
>+ * Enable all wake-up devices' GPEs, with the assumption that
>+ * acpi_disable_all_gpes() was executed before, so we don't need to
>disable any
>+ * GPEs here.
> */
> void acpi_enable_wakeup_device(u8 sleep_state)
> {
>@@ -65,29 +67,22 @@ void acpi_enable_wakeup_device(u8 sleep_
> if (!dev->wakeup.flags.valid)
> continue;
>
>- /* If users want to disable run-wake GPE,
>- * we only disable it for wake and leave it for runtime
>- */
> if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
>- || sleep_state > (u32) dev->wakeup.sleep_state) {
>- if (dev->wakeup.flags.run_wake) {
>- /* set_gpe_type will disable GPE, leave it like
>that */
>- acpi_set_gpe_type(dev->wakeup.gpe_device,
>- dev->wakeup.gpe_number,
>- ACPI_GPE_TYPE_RUNTIME);
>- }
>+ || sleep_state > (u32) dev->wakeup.sleep_state)
> continue;
>- }
>- if (!dev->wakeup.flags.run_wake)
>- acpi_enable_gpe(dev->wakeup.gpe_device,
>- dev->wakeup.gpe_number);
>+
>+ /* The wake-up power should have been enabled already. */
>+ acpi_set_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
>+ ACPI_GPE_ENABLE);
> }
> }
>
> /**
>- * acpi_disable_wakeup_device - disable devices' wakeup capability
>- * @sleep_state: ACPI state
>- * Disable all wakup devices's GPE and wakeup capability
>+ * acpi_disable_wakeup_device - Disable devices' wakeup capability.
>+ * @sleep_state: ACPI system sleep state.
>+ *
>+ * This function only affects devices with wakeup.state.enabled set, which
>means
>+ * that it reverses the changes made by acpi_enable_wakeup_device_prep().
> */
> void acpi_disable_wakeup_device(u8 sleep_state)
> {
>@@ -97,30 +92,11 @@ void acpi_disable_wakeup_device(u8 sleep
> struct acpi_device *dev =
> container_of(node, struct acpi_device, wakeup_list);
>
>- if (!dev->wakeup.flags.valid)
>- continue;
>-
>- if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
>- || sleep_state > (u32) dev->wakeup.sleep_state) {
>- if (dev->wakeup.flags.run_wake) {
>- acpi_set_gpe_type(dev->wakeup.gpe_device,
>- dev->wakeup.gpe_number,
>- ACPI_GPE_TYPE_WAKE_RUN);
>- /* Re-enable it, since set_gpe_type will disable it
>*/
>- acpi_enable_gpe(dev->wakeup.gpe_device,
>- dev->wakeup.gpe_number);
>- }
>+ if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
>+ || (sleep_state > (u32) dev->wakeup.sleep_state))
> continue;
>- }
>
> acpi_disable_wakeup_device_power(dev);
>- /* Never disable run-wake GPE */
>- if (!dev->wakeup.flags.run_wake) {
>- acpi_disable_gpe(dev->wakeup.gpe_device,
>- dev->wakeup.gpe_number);
>- acpi_clear_gpe(dev->wakeup.gpe_device,
>- dev->wakeup.gpe_number, ACPI_NOT_ISR);
>- }
> }
> }
>
>@@ -136,11 +112,8 @@ int __init acpi_wakeup_device_init(void)
> /* In case user doesn't load button driver */
> if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
> continue;
>- acpi_set_gpe_type(dev->wakeup.gpe_device,
>- dev->wakeup.gpe_number,
>- ACPI_GPE_TYPE_WAKE_RUN);
>- acpi_enable_gpe(dev->wakeup.gpe_device,
>- dev->wakeup.gpe_number);
>+ acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
>+ ACPI_GPE_TYPE_WAKE);
> dev->wakeup.state.enabled = 1;
> }
> mutex_unlock(&acpi_device_lock);
>Index: linux-2.6/drivers/acpi/acpica/acevents.h
>===================================================================
>--- linux-2.6.orig/drivers/acpi/acpica/acevents.h
>+++ linux-2.6/drivers/acpi/acpica/acevents.h
>@@ -76,12 +76,9 @@ acpi_ev_queue_notify_request(struct acpi
> * evgpe - GPE handling and dispatch
> */
> acpi_status
>-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info
>*gpe_event_info,
>- u8 type);
>+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info
>*gpe_event_info);
>
>-acpi_status
>-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
>- u8 write_to_hardware);
>+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info
>*gpe_event_info);
>
> acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info
>*gpe_event_info);
>
>@@ -122,9 +119,6 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_eve
> u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);
>
> acpi_status
>-acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type);
>-
>-acpi_status
> acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info
>*gpe_event_info);
>
> acpi_status acpi_ev_gpe_initialize(void);
>Index: linux-2.6/drivers/acpi/acpica/evgpe.c
>===================================================================
>--- linux-2.6.orig/drivers/acpi/acpica/evgpe.c
>+++ linux-2.6/drivers/acpi/acpica/evgpe.c
>@@ -54,54 +54,9 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
>
>
>/**************************************************************************
>*****
> *
>- * FUNCTION: acpi_ev_set_gpe_type
>- *
>- * PARAMETERS: gpe_event_info - GPE to set
>- * Type - New type
>- *
>- * RETURN: Status
>- *
>- * DESCRIPTION: Sets the new type for the GPE (wake, run, or wake/run)
>- *
>-
>***************************************************************************
>***/
>-
>-acpi_status
>-acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type)
>-{
>- acpi_status status;
>-
>- ACPI_FUNCTION_TRACE(ev_set_gpe_type);
>-
>- /* Validate type and update register enable masks */
>-
>- switch (type) {
>- case ACPI_GPE_TYPE_WAKE:
>- case ACPI_GPE_TYPE_RUNTIME:
>- case ACPI_GPE_TYPE_WAKE_RUN:
>- break;
>-
>- default:
>- return_ACPI_STATUS(AE_BAD_PARAMETER);
>- }
>-
>- /* Disable the GPE if currently enabled */
>-
>- status = acpi_ev_disable_gpe(gpe_event_info);
>-
>- /* Clear the type bits and insert the new Type */
>-
>- gpe_event_info->flags &= ~ACPI_GPE_TYPE_MASK;
>- gpe_event_info->flags |= type;
>- return_ACPI_STATUS(status);
>-}
>-
>-
>/**************************************************************************
>*****
>- *
> * FUNCTION: acpi_ev_update_gpe_enable_masks
> *
> * PARAMETERS: gpe_event_info - GPE to update
>- * Type - What to do: ACPI_GPE_DISABLE or
>- * ACPI_GPE_ENABLE
> *
> * RETURN: Status
> *
>@@ -110,8 +65,7 @@ acpi_ev_set_gpe_type(struct acpi_gpe_eve
>
>***************************************************************************
>***/
>
> acpi_status
>-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info
>*gpe_event_info,
>- u8 type)
>+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info
>*gpe_event_info)
> {
> struct acpi_gpe_register_info *gpe_register_info;
> u8 register_bit;
>@@ -127,37 +81,14 @@ acpi_ev_update_gpe_enable_masks(struct a
> (1 <<
> (gpe_event_info->gpe_number - gpe_register_info-
>>base_gpe_number));
>
>- /* 1) Disable case. Simply clear all enable bits */
>-
>- if (type == ACPI_GPE_DISABLE) {
>- ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
>- register_bit);
>- ACPI_CLEAR_BIT(gpe_register_info->enable_for_run,
>register_bit);
>- return_ACPI_STATUS(AE_OK);
>- }
>-
>- /* 2) Enable case. Set/Clear the appropriate enable bits */
>+ ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake, register_bit);
>+ ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
>
>- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
>- case ACPI_GPE_TYPE_WAKE:
>- ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
>- ACPI_CLEAR_BIT(gpe_register_info->enable_for_run,
>register_bit);
>- break;
>-
>- case ACPI_GPE_TYPE_RUNTIME:
>- ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
>- register_bit);
>+ if (gpe_event_info->runtime_count)
> ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
>- break;
>
>- case ACPI_GPE_TYPE_WAKE_RUN:
>+ if (gpe_event_info->wakeup_count)
> ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
>- ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
>- break;
>-
>- default:
>- return_ACPI_STATUS(AE_BAD_PARAMETER);
>- }
>
> return_ACPI_STATUS(AE_OK);
> }
>@@ -167,8 +98,6 @@ acpi_ev_update_gpe_enable_masks(struct a
> * FUNCTION: acpi_ev_enable_gpe
> *
> * PARAMETERS: gpe_event_info - GPE to enable
>- * write_to_hardware - Enable now, or just mark data
>structs
>- * (WAKE GPEs should be deferred)
> *
> * RETURN: Status
> *
>@@ -176,9 +105,7 @@ acpi_ev_update_gpe_enable_masks(struct a
> *
>
>***************************************************************************
>***/
>
>-acpi_status
>-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
>- u8 write_to_hardware)
>+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
> {
> acpi_status status;
>
>@@ -186,47 +113,20 @@ acpi_ev_enable_gpe(struct acpi_gpe_event
>
> /* Make sure HW enable masks are updated */
>
>- status =
>- acpi_ev_update_gpe_enable_masks(gpe_event_info, ACPI_GPE_ENABLE);
>- if (ACPI_FAILURE(status)) {
>+ status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
>+ if (ACPI_FAILURE(status))
> return_ACPI_STATUS(status);
>- }
>
> /* Mark wake-enabled or HW enable, or both */
>
>- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
>- case ACPI_GPE_TYPE_WAKE:
>-
>- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
>- break;
>-
>- case ACPI_GPE_TYPE_WAKE_RUN:
>-
>- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
>-
>- /*lint -fallthrough */
>-
>- case ACPI_GPE_TYPE_RUNTIME:
>-
>- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
>-
>- if (write_to_hardware) {
>-
>- /* Clear the GPE (of stale events), then enable it */
>-
>- status = acpi_hw_clear_gpe(gpe_event_info);
>- if (ACPI_FAILURE(status)) {
>- return_ACPI_STATUS(status);
>- }
>-
>- /* Enable the requested runtime GPE */
>-
>- status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
>- }
>- break;
>+ if (gpe_event_info->runtime_count) {
>+ /* Clear the GPE (of stale events), then enable it */
>+ status = acpi_hw_clear_gpe(gpe_event_info);
>+ if (ACPI_FAILURE(status))
>+ return_ACPI_STATUS(status);
>
>- default:
>- return_ACPI_STATUS(AE_BAD_PARAMETER);
>+ /* Enable the requested runtime GPE */
>+ status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
> }
>
> return_ACPI_STATUS(AE_OK);
>@@ -252,34 +152,9 @@ acpi_status acpi_ev_disable_gpe(struct a
>
> /* Make sure HW enable masks are updated */
>
>- status =
>- acpi_ev_update_gpe_enable_masks(gpe_event_info,
>ACPI_GPE_DISABLE);
>- if (ACPI_FAILURE(status)) {
>+ status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
>+ if (ACPI_FAILURE(status))
> return_ACPI_STATUS(status);
>- }
>-
>- /* Clear the appropriate enabled flags for this GPE */
>-
>- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
>- case ACPI_GPE_TYPE_WAKE:
>- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
>- break;
>-
>- case ACPI_GPE_TYPE_WAKE_RUN:
>- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
>-
>- /* fallthrough */
>-
>- case ACPI_GPE_TYPE_RUNTIME:
>-
>- /* Disable the requested runtime GPE */
>-
>- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
>- break;
>-
>- default:
>- break;
>- }
>
> /*
> * Even if we don't know the GPE type, make sure that we always
>@@ -521,7 +396,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
>
> /* Set the GPE flags for return to enabled state */
>
>- (void)acpi_ev_enable_gpe(gpe_event_info, FALSE);
>+ (void)acpi_ev_update_gpe_enable_masks(gpe_event_info);
>
> /*
> * Take a snapshot of the GPE info for this level - we copy the info
>to
>Index: linux-2.6/drivers/acpi/acpica/evgpeblk.c
>===================================================================
>--- linux-2.6.orig/drivers/acpi/acpica/evgpeblk.c
>+++ linux-2.6/drivers/acpi/acpica/evgpeblk.c
>@@ -258,7 +258,6 @@ acpi_ev_save_method_info(acpi_handle obj
> u32 gpe_number;
> char name[ACPI_NAME_SIZE + 1];
> u8 type;
>- acpi_status status;
>
> ACPI_FUNCTION_TRACE(ev_save_method_info);
>
>@@ -325,26 +324,20 @@ acpi_ev_save_method_info(acpi_handle obj
>
> /*
> * Now we can add this information to the gpe_event_info block for
>use
>- * during dispatch of this GPE. Default type is RUNTIME, although
>this may
>- * change when the _PRW methods are executed later.
>+ * during dispatch of this GPE.
> */
> gpe_event_info =
> &gpe_block->event_info[gpe_number - gpe_block-
>>block_base_number];
>
>- gpe_event_info->flags = (u8)
>- (type | ACPI_GPE_DISPATCH_METHOD | ACPI_GPE_TYPE_RUNTIME);
>+ gpe_event_info->flags = (u8) (type | ACPI_GPE_DISPATCH_METHOD);
>
> gpe_event_info->dispatch.method_node =
> (struct acpi_namespace_node *)obj_handle;
>
>- /* Update enable mask, but don't enable the HW GPE as of yet */
>-
>- status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
>-
> ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
> "Registered GPE method %s as GPE number 0x%.2X\n",
> name, gpe_number));
>- return_ACPI_STATUS(status);
>+ return_ACPI_STATUS(AE_OK);
> }
>
>
>/**************************************************************************
>*****
>@@ -454,20 +447,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle ob
> gpe_block->
> block_base_number];
>
>- /* Mark GPE for WAKE-ONLY but WAKE_DISABLED */
>-
>- gpe_event_info->flags &=
>- ~(ACPI_GPE_WAKE_ENABLED | ACPI_GPE_RUN_ENABLED);
>-
>- status =
>- acpi_ev_set_gpe_type(gpe_event_info, ACPI_GPE_TYPE_WAKE);
>- if (ACPI_FAILURE(status)) {
>- goto cleanup;
>- }
>-
>- status =
>- acpi_ev_update_gpe_enable_masks(gpe_event_info,
>- ACPI_GPE_DISABLE);
>+ gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
> }
>
> cleanup:
>@@ -989,7 +969,6 @@ acpi_status
> acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
> struct acpi_gpe_block_info *gpe_block)
> {
>- acpi_status status;
> struct acpi_gpe_event_info *gpe_event_info;
> struct acpi_gpe_walk_info gpe_info;
> u32 wake_gpe_count;
>@@ -1019,42 +998,50 @@ acpi_ev_initialize_gpe_block(struct acpi
> gpe_info.gpe_block = gpe_block;
> gpe_info.gpe_device = gpe_device;
>
>- status =
>- acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
>+ acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
> ACPI_UINT32_MAX, ACPI_NS_WALK_UNLOCK,
> acpi_ev_match_prw_and_gpe, NULL,
> &gpe_info, NULL);
> }
>
> /*
>- * Enable all GPEs in this block that have these attributes:
>- * 1) are "runtime" or "run/wake" GPEs, and
>- * 2) have a corresponding _Lxx or _Exx method
>- *
>- * Any other GPEs within this block must be enabled via the
>- * acpi_enable_gpe() external interface.
>+ * Enable all GPEs that have a corresponding method and aren't
>+ * capable of generating wakeups. Any other GPEs within this block
>+ * must be enabled via the acpi_enable_gpe() interface.
> */
> wake_gpe_count = 0;
> gpe_enabled_count = 0;
>+ if (gpe_device == acpi_gbl_fadt_gpe_device)
>+ gpe_device = NULL;
>
> for (i = 0; i < gpe_block->register_count; i++) {
>- for (j = 0; j < 8; j++) {
>+ for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
>+ acpi_status status;
>+ acpi_size gpe_index;
>+ int gpe_number;
>
> /* Get the info block for this particular GPE */
>+ gpe_index = (acpi_size)i * ACPI_GPE_REGISTER_WIDTH + j;
>+ gpe_event_info = &gpe_block->event_info[gpe_index];
>
>- gpe_event_info = &gpe_block->event_info[((acpi_size) i *
>- ACPI_GPE_REGISTER_WIDTH)
>- + j];
>-
>- if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
>- ACPI_GPE_DISPATCH_METHOD) &&
>- (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) {
>- gpe_enabled_count++;
>- }
>-
>- if (gpe_event_info->flags & ACPI_GPE_TYPE_WAKE) {
>+ if (gpe_event_info->flags & ACPI_GPE_CAN_WAKE) {
> wake_gpe_count++;
>+ if (acpi_gbl_leave_wake_gpes_disabled)
>+ continue;
> }
>+
>+ if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_METHOD))
>+ continue;
>+
>+ 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))
>+ ACPI_ERROR((AE_INFO,
>+ "Failed to enable GPE %02X\n",
>+ gpe_number));
>+ else
>+ gpe_enabled_count++;
> }
> }
>
>@@ -1062,15 +1049,7 @@ acpi_ev_initialize_gpe_block(struct acpi
> "Found %u Wake, Enabled %u Runtime GPEs in this
>block\n",
> wake_gpe_count, gpe_enabled_count));
>
>- /* Enable all valid runtime GPEs found above */
>-
>- status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block, NULL);
>- if (ACPI_FAILURE(status)) {
>- ACPI_ERROR((AE_INFO, "Could not enable GPEs in GpeBlock %p",
>- gpe_block));
>- }
>-
>- return_ACPI_STATUS(status);
>+ return_ACPI_STATUS(AE_OK);
> }
>
>
>/**************************************************************************
>*****
>Index: linux-2.6/drivers/acpi/acpica/evxface.c
>===================================================================
>--- linux-2.6.orig/drivers/acpi/acpica/evxface.c
>+++ linux-2.6/drivers/acpi/acpica/evxface.c
>@@ -617,13 +617,6 @@ acpi_install_gpe_handler(acpi_handle gpe
> handler->context = context;
> handler->method_node = gpe_event_info->dispatch.method_node;
>
>- /* Disable the GPE before installing the handler */
>-
>- status = acpi_ev_disable_gpe(gpe_event_info);
>- if (ACPI_FAILURE(status)) {
>- goto unlock_and_exit;
>- }
>-
> /* Install the handler */
>
> flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
>@@ -707,13 +700,6 @@ acpi_remove_gpe_handler(acpi_handle gpe_
> goto unlock_and_exit;
> }
>
>- /* Disable the GPE before removing the handler */
>-
>- status = acpi_ev_disable_gpe(gpe_event_info);
>- if (ACPI_FAILURE(status)) {
>- goto unlock_and_exit;
>- }
>-
> /* Make sure all deferred tasks are completed */
>
> (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
>Index: linux-2.6/include/acpi/actypes.h
>===================================================================
>--- linux-2.6.orig/include/acpi/actypes.h
>+++ linux-2.6/include/acpi/actypes.h
>@@ -668,15 +668,16 @@ typedef u32 acpi_event_status;
>
> /*
> * GPE info flags - Per GPE
>- * +-+-+-+---+---+-+
>- * |7|6|5|4:3|2:1|0|
>- * +-+-+-+---+---+-+
>- * | | | | | |
>- * | | | | | +--- Interrupt type: Edge or Level Triggered
>- * | | | | +--- Type: Wake-only, Runtime-only, or wake/runtime
>+ * +-+-+-+---+-+-+-+
>+ * |7|6|5|4:3|2|1|0|
>+ * +-+-+-+---+-+-+-+
>+ * | | | | | | |
>+ * | | | | | | +--- Interrupt type: Edge or Level Triggered
>+ * | | | | | +--- GPE can wake the system
>+ * | | | | +--- Unused
> * | | | +--- Type of dispatch -- to method, handler, or none
>- * | | +--- Enabled for runtime?
>- * | +--- Enabled for wake?
>+ * | | +--- Unused
>+ * | +--- Unused
> * +--- Unused
> */
> #define ACPI_GPE_XRUPT_TYPE_MASK (u8) 0x01
>@@ -687,22 +688,13 @@ typedef u32 acpi_event_status;
> #define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x06
> #define ACPI_GPE_TYPE_WAKE (u8) 0x02
> #define ACPI_GPE_TYPE_RUNTIME (u8) 0x04 /* Default */
>+#define ACPI_GPE_CAN_WAKE (u8) 0x02
>
> #define ACPI_GPE_DISPATCH_MASK (u8) 0x18
> #define ACPI_GPE_DISPATCH_HANDLER (u8) 0x08
> #define ACPI_GPE_DISPATCH_METHOD (u8) 0x10
> #define ACPI_GPE_DISPATCH_NOT_USED (u8) 0x00 /* Default */
>
>-#define ACPI_GPE_RUN_ENABLE_MASK (u8) 0x20
>-#define ACPI_GPE_RUN_ENABLED (u8) 0x20
>-#define ACPI_GPE_RUN_DISABLED (u8) 0x00 /* Default */
>-
>-#define ACPI_GPE_WAKE_ENABLE_MASK (u8) 0x40
>-#define ACPI_GPE_WAKE_ENABLED (u8) 0x40
>-#define ACPI_GPE_WAKE_DISABLED (u8) 0x00 /* Default */
>-
>-#define ACPI_GPE_ENABLE_MASK (u8) 0x60 /* Both run/wake */
>-
> /*
> * Flags for GPE and Lock interfaces
> */
>Index: linux-2.6/drivers/acpi/system.c
>===================================================================
>--- linux-2.6.orig/drivers/acpi/system.c
>+++ linux-2.6/drivers/acpi/system.c
>@@ -387,10 +387,10 @@ static ssize_t counter_set(struct kobjec
> if (index < num_gpes) {
> if (!strcmp(buf, "disable\n") &&
> (status & ACPI_EVENT_FLAG_ENABLED))
>- result = acpi_disable_gpe(handle, index);
>+ result = acpi_set_gpe(handle, index, ACPI_GPE_DISABLE);
> else if (!strcmp(buf, "enable\n") &&
> !(status & ACPI_EVENT_FLAG_ENABLED))
>- result = acpi_enable_gpe(handle, index);
>+ result = acpi_set_gpe(handle, index, ACPI_GPE_ENABLE);
> else if (!strcmp(buf, "clear\n") &&
> (status & ACPI_EVENT_FLAG_SET))
> result = acpi_clear_gpe(handle, index, ACPI_NOT_ISR);
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-23 23:52 ` Rafael J. Wysocki
2010-02-24 22:26 ` Jesse Barnes
@ 2010-02-24 22:26 ` Jesse Barnes
1 sibling, 0 replies; 23+ messages in thread
From: Jesse Barnes @ 2010-02-24 22:26 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Moore, Robert, Lin, Ming M, Matthew Garrett, Brown, Len,
ACPI Devel Maling List, pm list, Linux PCI
On Wed, 24 Feb 2010 00:52:08 +0100
"Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> On Tuesday 23 February 2010, Jesse Barnes wrote:
> > On Sat, 20 Feb 2010 00:18:02 +0100
> > "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > > [Sorry for resending, tried to restore the CC list.]
> > >
> > > On Friday 19 February 2010, Moore, Robert wrote:
> > > >
> > > > Here's some comments and questions on the GPE changes in ACPICA.
> > > > Overall, looks good.
> > >
> > > First of all, thanks a lot for the review.
> >
> > I missed this one when applying the series, can you resend as an
> > incremental patch on top of linux-next?
>
> Sure, appended.
>
> Please note that it also fixes a bug I found earlier today.
>
> I added a changelog in case you want to apply it as a separate patch.
Applied, thanks.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-23 23:52 ` Rafael J. Wysocki
@ 2010-02-24 22:26 ` Jesse Barnes
2010-02-24 22:26 ` Jesse Barnes
1 sibling, 0 replies; 23+ messages in thread
From: Jesse Barnes @ 2010-02-24 22:26 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Brown, Len, Lin, Ming M, Linux PCI, Moore, Robert,
ACPI Devel Maling List, pm list, Matthew Garrett
On Wed, 24 Feb 2010 00:52:08 +0100
"Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> On Tuesday 23 February 2010, Jesse Barnes wrote:
> > On Sat, 20 Feb 2010 00:18:02 +0100
> > "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > > [Sorry for resending, tried to restore the CC list.]
> > >
> > > On Friday 19 February 2010, Moore, Robert wrote:
> > > >
> > > > Here's some comments and questions on the GPE changes in ACPICA.
> > > > Overall, looks good.
> > >
> > > First of all, thanks a lot for the review.
> >
> > I missed this one when applying the series, can you resend as an
> > incremental patch on top of linux-next?
>
> Sure, appended.
>
> Please note that it also fixes a bug I found earlier today.
>
> I added a changelog in case you want to apply it as a separate patch.
Applied, thanks.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-19 23:14 ` Rafael J. Wysocki
2010-02-24 22:05 ` Moore, Robert
@ 2010-02-25 15:14 ` Alexey Starikovskiy
2010-02-25 19:56 ` Rafael J. Wysocki
1 sibling, 1 reply; 23+ messages in thread
From: Alexey Starikovskiy @ 2010-02-25 15:14 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Moore, Robert, Matthew Garrett, linux-acpi, Lin, Ming M, Brown, Len
Rafael J. Wysocki пишет:
> --- linux-2.6.orig/drivers/acpi/ec.c
> +++ linux-2.6/drivers/acpi/ec.c
> @@ -307,7 +307,11 @@ static int acpi_ec_transaction(struct ac
> pr_debug(PREFIX "transaction start\n");
> /* disable GPE during transaction if storm is detected */
> if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
> - acpi_disable_gpe(NULL, ec->gpe);
> + /*
> + * It has to be disabled at the hardware level regardless of the
> + * GPE reference counting, so that it doesn't trigger.
> + */
> + acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
> }
>
EC should have non-shared GPE, according to spec. Thus, refcounting is
not needed here anyway.
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-25 15:14 ` Alexey Starikovskiy
@ 2010-02-25 19:56 ` Rafael J. Wysocki
0 siblings, 0 replies; 23+ messages in thread
From: Rafael J. Wysocki @ 2010-02-25 19:56 UTC (permalink / raw)
To: Alexey Starikovskiy
Cc: Moore, Robert, Matthew Garrett, Lin, Ming M, Brown, Len
On Thursday 25 February 2010, Alexey Starikovskiy wrote:
> Rafael J. Wysocki пишет:
> > --- linux-2.6.orig/drivers/acpi/ec.c
> > +++ linux-2.6/drivers/acpi/ec.c
> > @@ -307,7 +307,11 @@ static int acpi_ec_transaction(struct ac
> > pr_debug(PREFIX "transaction start\n");
> > /* disable GPE during transaction if storm is detected */
> > if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
> > - acpi_disable_gpe(NULL, ec->gpe);
> > + /*
> > + * It has to be disabled at the hardware level regardless of the
> > + * GPE reference counting, so that it doesn't trigger.
> > + */
> > + acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
> > }
> >
> EC should have non-shared GPE, according to spec. Thus, refcounting is
> not needed here anyway.
So we can just use acpi_disable_gpe() here and analogously with enable
and in suspend/resume?
OK, I'll send a followup patch for that.
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-19 7:24 ` Jin Dongming
@ 2010-02-19 21:08 ` Rafael J. Wysocki
2010-02-19 21:08 ` Rafael J. Wysocki
1 sibling, 0 replies; 23+ messages in thread
From: Rafael J. Wysocki @ 2010-02-19 21:08 UTC (permalink / raw)
To: Jin Dongming
Cc: Jesse Barnes, Moore, Robert, Len Brown, ACPI Devel Maling List,
pm list, Linux PCI, Shaohua Li, Bjorn Helgaas, Oliver Neukum,
Matthew Garrett, LKML, Gary Hade
On Friday 19 February 2010, Jin Dongming wrote:
> Hi, Rafael J. Wysocki
>
> Rafael J. Wysocki wrote:
> > On Thursday 18 February 2010, Jin Dongming wrote:
> >> Hi, Rafael J. Wysocki
> >>> - /* Update enable mask, but don't enable the HW GPE as of yet */
> >>> -
> >>> - status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
> >
> > You could preserve some more context.
> >
> >> I think the above line code should be remained. If it is deleted, the exception
> >> event will be raised on some machine.
> >
> > Why would it? The GPE is still disabled at the hardware level at this point.
> >
> > Rafael
> >
> >
> I am very sorry for my wrong comment. The GPE is still disabled as you wrote.
>
> The error message what I got was not caused by GPE event, it was caused by the "status"
> variable which had not been deleted on x86-next tree. And it is also deleted at this
> file. So I don't there is problem here.
Great, thanks for the review.
Rafael
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-19 7:24 ` Jin Dongming
2010-02-19 21:08 ` Rafael J. Wysocki
@ 2010-02-19 21:08 ` Rafael J. Wysocki
1 sibling, 0 replies; 23+ messages in thread
From: Rafael J. Wysocki @ 2010-02-19 21:08 UTC (permalink / raw)
To: Jin Dongming
Cc: Matthew Garrett, Linux PCI, Moore, Robert, Jesse Barnes, LKML,
ACPI Devel Maling List, pm list
On Friday 19 February 2010, Jin Dongming wrote:
> Hi, Rafael J. Wysocki
>
> Rafael J. Wysocki wrote:
> > On Thursday 18 February 2010, Jin Dongming wrote:
> >> Hi, Rafael J. Wysocki
> >>> - /* Update enable mask, but don't enable the HW GPE as of yet */
> >>> -
> >>> - status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
> >
> > You could preserve some more context.
> >
> >> I think the above line code should be remained. If it is deleted, the exception
> >> event will be raised on some machine.
> >
> > Why would it? The GPE is still disabled at the hardware level at this point.
> >
> > Rafael
> >
> >
> I am very sorry for my wrong comment. The GPE is still disabled as you wrote.
>
> The error message what I got was not caused by GPE event, it was caused by the "status"
> variable which had not been deleted on x86-next tree. And it is also deleted at this
> file. So I don't there is problem here.
Great, thanks for the review.
Rafael
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-18 20:01 ` Rafael J. Wysocki
@ 2010-02-19 7:24 ` Jin Dongming
2010-02-19 21:08 ` Rafael J. Wysocki
2010-02-19 21:08 ` Rafael J. Wysocki
2010-02-19 7:24 ` Jin Dongming
1 sibling, 2 replies; 23+ messages in thread
From: Jin Dongming @ 2010-02-19 7:24 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Jesse Barnes, Moore, Robert, Len Brown, ACPI Devel Maling List,
pm list, Linux PCI, Shaohua Li, Bjorn Helgaas, Oliver Neukum,
Matthew Garrett, LKML, Gary Hade
Hi, Rafael J. Wysocki
Rafael J. Wysocki wrote:
> On Thursday 18 February 2010, Jin Dongming wrote:
>> Hi, Rafael J. Wysocki
>>> - /* Update enable mask, but don't enable the HW GPE as of yet */
>>> -
>>> - status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
>
> You could preserve some more context.
>
>> I think the above line code should be remained. If it is deleted, the exception
>> event will be raised on some machine.
>
> Why would it? The GPE is still disabled at the hardware level at this point.
>
> Rafael
>
>
I am very sorry for my wrong comment. The GPE is still disabled as you wrote.
The error message what I got was not caused by GPE event, it was caused by the "status"
variable which had not been deleted on x86-next tree. And it is also deleted at this
file. So I don't there is problem here.
Best regards,
Jin Dongming
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-18 20:01 ` Rafael J. Wysocki
2010-02-19 7:24 ` Jin Dongming
@ 2010-02-19 7:24 ` Jin Dongming
1 sibling, 0 replies; 23+ messages in thread
From: Jin Dongming @ 2010-02-19 7:24 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Matthew Garrett, Linux PCI, Moore, Robert, Jesse Barnes, LKML,
ACPI Devel Maling List, pm list
Hi, Rafael J. Wysocki
Rafael J. Wysocki wrote:
> On Thursday 18 February 2010, Jin Dongming wrote:
>> Hi, Rafael J. Wysocki
>>> - /* Update enable mask, but don't enable the HW GPE as of yet */
>>> -
>>> - status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
>
> You could preserve some more context.
>
>> I think the above line code should be remained. If it is deleted, the exception
>> event will be raised on some machine.
>
> Why would it? The GPE is still disabled at the hardware level at this point.
>
> Rafael
>
>
I am very sorry for my wrong comment. The GPE is still disabled as you wrote.
The error message what I got was not caused by GPE event, it was caused by the "status"
variable which had not been deleted on x86-next tree. And it is also deleted at this
file. So I don't there is problem here.
Best regards,
Jin Dongming
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-18 7:05 ` Jin Dongming
2010-02-18 20:01 ` Rafael J. Wysocki
@ 2010-02-18 20:01 ` Rafael J. Wysocki
2010-02-19 7:24 ` Jin Dongming
2010-02-19 7:24 ` Jin Dongming
1 sibling, 2 replies; 23+ messages in thread
From: Rafael J. Wysocki @ 2010-02-18 20:01 UTC (permalink / raw)
To: Jin Dongming
Cc: Jesse Barnes, Moore, Robert, Len Brown, ACPI Devel Maling List,
pm list, Linux PCI, Shaohua Li, Bjorn Helgaas, Oliver Neukum,
Matthew Garrett, LKML, Gary Hade
On Thursday 18 February 2010, Jin Dongming wrote:
> Hi, Rafael J. Wysocki
> > - /* Update enable mask, but don't enable the HW GPE as of yet */
> > -
> > - status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
You could preserve some more context.
> I think the above line code should be remained. If it is deleted, the exception
> event will be raised on some machine.
Why would it? The GPE is still disabled at the hardware level at this point.
Rafael
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-18 7:05 ` Jin Dongming
@ 2010-02-18 20:01 ` Rafael J. Wysocki
2010-02-18 20:01 ` Rafael J. Wysocki
1 sibling, 0 replies; 23+ messages in thread
From: Rafael J. Wysocki @ 2010-02-18 20:01 UTC (permalink / raw)
To: Jin Dongming
Cc: Matthew Garrett, Linux PCI, Moore, Robert, Jesse Barnes, LKML,
ACPI Devel Maling List, pm list
On Thursday 18 February 2010, Jin Dongming wrote:
> Hi, Rafael J. Wysocki
> > - /* Update enable mask, but don't enable the HW GPE as of yet */
> > -
> > - status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
You could preserve some more context.
> I think the above line code should be remained. If it is deleted, the exception
> event will be raised on some machine.
Why would it? The GPE is still disabled at the hardware level at this point.
Rafael
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-17 22:41 ` Rafael J. Wysocki
@ 2010-02-18 7:05 ` Jin Dongming
2010-02-18 20:01 ` Rafael J. Wysocki
2010-02-18 20:01 ` Rafael J. Wysocki
2010-02-18 7:05 ` Jin Dongming
1 sibling, 2 replies; 23+ messages in thread
From: Jin Dongming @ 2010-02-18 7:05 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Jesse Barnes, Moore, Robert, Len Brown, ACPI Devel Maling List,
pm list, Linux PCI, Shaohua Li, Bjorn Helgaas, Oliver Neukum,
Matthew Garrett, LKML, Gary Hade
Hi, Rafael J. Wysocki
> - /* Update enable mask, but don't enable the HW GPE as of yet */
> -
> - status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
I think the above line code should be remained. If it is deleted, the exception
event will be raised on some machine.
Best Regards,
Jin Dongming
> -
> ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
> "Registered GPE method %s as GPE number 0x%.2X\n",
> name, gpe_number));
> - return_ACPI_STATUS(status);
> + return_ACPI_STATUS(AE_OK);
> }
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-17 22:41 ` Rafael J. Wysocki
2010-02-18 7:05 ` Jin Dongming
@ 2010-02-18 7:05 ` Jin Dongming
1 sibling, 0 replies; 23+ messages in thread
From: Jin Dongming @ 2010-02-18 7:05 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Matthew Garrett, Linux PCI, Moore, Robert, Jesse Barnes, LKML,
ACPI Devel Maling List, pm list
Hi, Rafael J. Wysocki
> - /* Update enable mask, but don't enable the HW GPE as of yet */
> -
> - status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
I think the above line code should be remained. If it is deleted, the exception
event will be raised on some machine.
Best Regards,
Jin Dongming
> -
> ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
> "Registered GPE method %s as GPE number 0x%.2X\n",
> name, gpe_number));
> - return_ACPI_STATUS(status);
> + return_ACPI_STATUS(AE_OK);
> }
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-17 22:35 [PATCH 0/8] PCI run-time PM support (rev. 4) Rafael J. Wysocki
2010-02-17 22:41 ` [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs Rafael J. Wysocki
@ 2010-02-17 22:41 ` Rafael J. Wysocki
2010-02-18 7:05 ` Jin Dongming
2010-02-18 7:05 ` Jin Dongming
1 sibling, 2 replies; 23+ messages in thread
From: Rafael J. Wysocki @ 2010-02-17 22:41 UTC (permalink / raw)
To: Jesse Barnes, Moore, Robert, Len Brown
Cc: ACPI Devel Maling List, pm list, Linux PCI, Shaohua Li,
Bjorn Helgaas, Oliver Neukum, Matthew Garrett, LKML, Gary Hade
From: Rafael J. Wysocki <rjw@sisk.pl>
ACPI GPEs may map to multiple devices. The current GPE interface
only provides a mechanism for enabling and disabling GPEs, making
it difficult to change the state of GPEs at runtime without extensive
cooperation between devices.
Add an API to allow devices to indicate whether or not they want
their device's GPE to be enabled for both runtime and wakeup events.
Remove the old GPE type handling entirely, which gets rid of various
quirks, like the implicit disabling with GPE type setting. This
requires a small amount of rework in order to ensure that non-wake
GPEs are enabled by default to preserve existing behaviour.
Based on patches from Matthew Garrett <mjg@redhat.com>.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/acpi/acpica/acevents.h | 6 -
drivers/acpi/acpica/aclocal.h | 2
drivers/acpi/acpica/evgpe.c | 153 ++++-------------------------------------
drivers/acpi/acpica/evgpeblk.c | 87 ++++++++---------------
drivers/acpi/acpica/evxface.c | 14 ---
drivers/acpi/acpica/evxfevnt.c | 90 +++++++++++++++++-------
drivers/acpi/button.c | 13 ++-
drivers/acpi/ec.c | 14 ++-
drivers/acpi/sleep.c | 15 +++-
drivers/acpi/system.c | 4 -
drivers/acpi/wakeup.c | 81 +++++++--------------
include/acpi/acpixf.h | 6 -
include/acpi/actypes.h | 28 ++-----
13 files changed, 188 insertions(+), 325 deletions(-)
Index: linux-2.6/drivers/acpi/acpica/aclocal.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/aclocal.h
+++ linux-2.6/drivers/acpi/acpica/aclocal.h
@@ -426,6 +426,8 @@ struct acpi_gpe_event_info {
struct acpi_gpe_register_info *register_info; /* Backpointer to register info */
u8 flags; /* Misc info about this GPE */
u8 gpe_number; /* This GPE */
+ u8 runtime_count;
+ u8 wakeup_count;
};
/* Information about a GPE register pair, one per each status/enable pair in an array */
Index: linux-2.6/drivers/acpi/acpica/evxfevnt.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evxfevnt.c
+++ linux-2.6/drivers/acpi/acpica/evxfevnt.c
@@ -201,23 +201,27 @@ ACPI_EXPORT_SYMBOL(acpi_enable_event)
/*******************************************************************************
*
- * FUNCTION: acpi_set_gpe_type
+ * FUNCTION: acpi_set_gpe
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Type - New GPE type
+ * action - Enable or disable
+ * Called from ISR or not
*
* RETURN: Status
*
- * DESCRIPTION: Set the type of an individual GPE
+ * DESCRIPTION: Enable or disable an ACPI event (general purpose)
*
******************************************************************************/
-acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type)
+acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action)
{
acpi_status status = AE_OK;
+ acpi_cpu_flags flags;
struct acpi_gpe_event_info *gpe_event_info;
- ACPI_FUNCTION_TRACE(acpi_set_gpe_type);
+ ACPI_FUNCTION_TRACE(acpi_set_gpe);
+
+ flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -227,19 +231,29 @@ acpi_status acpi_set_gpe_type(acpi_handl
goto unlock_and_exit;
}
- if ((gpe_event_info->flags & ACPI_GPE_TYPE_MASK) == type) {
- return_ACPI_STATUS(AE_OK);
- }
+ /* Perform the action */
- /* Set the new type (will disable GPE if currently enabled) */
+ switch (action) {
+ case ACPI_GPE_ENABLE:
+ status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
+ break;
+
+ case ACPI_GPE_DISABLE:
+ status = acpi_ev_disable_gpe(gpe_event_info);
+ break;
- status = acpi_ev_set_gpe_type(gpe_event_info, type);
+ default:
+ ACPI_ERROR((AE_INFO, "Invalid action\n"));
+ status = AE_BAD_PARAMETER;
+ break;
+ }
unlock_and_exit:
+ acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
+ACPI_EXPORT_SYMBOL(acpi_set_gpe)
/*******************************************************************************
*
@@ -247,15 +261,14 @@ ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Flags - Just enable, or also wake enable?
- * Called from ISR or not
+ * type - Purpose the GPE will be used for
*
* RETURN: Status
*
- * DESCRIPTION: Enable an ACPI event (general purpose)
+ * DESCRIPTION: Take a reference to a GPE and enable it if necessary
*
******************************************************************************/
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number)
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
{
acpi_status status = AE_OK;
acpi_cpu_flags flags;
@@ -273,15 +286,32 @@ acpi_status acpi_enable_gpe(acpi_handle
goto unlock_and_exit;
}
- /* Perform the enable */
+ if (type & ACPI_GPE_TYPE_RUNTIME) {
+ if (++gpe_event_info->runtime_count == 1)
+ status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
- status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
+ if (ACPI_FAILURE(status))
+ gpe_event_info->runtime_count--;
+ }
- unlock_and_exit:
+ if (type & ACPI_GPE_TYPE_WAKE) {
+ if (!(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
+ status = AE_BAD_PARAMETER;
+ goto unlock_and_exit;
+ }
+
+ /*
+ * Wake-up GPEs are only enabled right prior to putting the
+ * system into a sleep state.
+ */
+ if (++gpe_event_info->wakeup_count == 1)
+ acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ }
+
+unlock_and_exit:
acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-
ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
/*******************************************************************************
@@ -290,15 +320,14 @@ ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Flags - Just disable, or also wake disable?
- * Called from ISR or not
+ * type - Purpose the GPE won't be used for any more
*
* RETURN: Status
*
- * DESCRIPTION: Disable an ACPI event (general purpose)
+ * DESCRIPTION: Release a reference to a GPE and disable it if necessary
*
******************************************************************************/
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number)
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
{
acpi_status status = AE_OK;
acpi_cpu_flags flags;
@@ -315,13 +344,24 @@ acpi_status acpi_disable_gpe(acpi_handle
goto unlock_and_exit;
}
- status = acpi_ev_disable_gpe(gpe_event_info);
+ if ((type & ACPI_GPE_TYPE_WAKE) && gpe_event_info->runtime_count) {
+ if (--gpe_event_info->runtime_count == 0)
+ acpi_ev_disable_gpe(gpe_event_info);
+ }
+
+ if ((type & ACPI_GPE_TYPE_RUNTIME) && gpe_event_info->wakeup_count) {
+ /*
+ * Wake-up GPEs are not enabled after leaving system sleep
+ * states, so we don't need to disable them here.
+ */
+ if (--gpe_event_info->wakeup_count == 0)
+ acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ }
unlock_and_exit:
acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-
ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
/*******************************************************************************
Index: linux-2.6/include/acpi/acpixf.h
===================================================================
--- linux-2.6.orig/include/acpi/acpixf.h
+++ linux-2.6/include/acpi/acpixf.h
@@ -281,11 +281,11 @@ acpi_status acpi_get_event_status(u32 ev
/*
* GPE Interfaces
*/
-acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type);
+acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action);
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number);
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type);
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number);
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type);
acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags);
Index: linux-2.6/drivers/acpi/button.c
===================================================================
--- linux-2.6.orig/drivers/acpi/button.c
+++ linux-2.6/drivers/acpi/button.c
@@ -422,11 +422,9 @@ static int acpi_button_add(struct acpi_d
if (device->wakeup.flags.valid) {
/* Button's GPE is run-wake GPE */
- acpi_set_gpe_type(device->wakeup.gpe_device,
- device->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
acpi_enable_gpe(device->wakeup.gpe_device,
- device->wakeup.gpe_number);
+ device->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE_RUN);
device->wakeup.state.enabled = 1;
}
@@ -446,6 +444,13 @@ static int acpi_button_remove(struct acp
{
struct acpi_button *button = acpi_driver_data(device);
+ if (device->wakeup.flags.valid) {
+ acpi_disable_gpe(device->wakeup.gpe_device,
+ device->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE_RUN);
+ device->wakeup.state.enabled = 0;
+ }
+
acpi_button_remove_fs(device);
input_unregister_device(button->input);
kfree(button);
Index: linux-2.6/drivers/acpi/ec.c
===================================================================
--- linux-2.6.orig/drivers/acpi/ec.c
+++ linux-2.6/drivers/acpi/ec.c
@@ -307,7 +307,7 @@ static int acpi_ec_transaction(struct ac
pr_debug(PREFIX "transaction start\n");
/* disable GPE during transaction if storm is detected */
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
- acpi_disable_gpe(NULL, ec->gpe);
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
}
status = acpi_ec_transaction_unlocked(ec, t);
@@ -317,7 +317,7 @@ static int acpi_ec_transaction(struct ac
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
msleep(1);
/* it is safe to enable GPE outside of transaction */
- acpi_enable_gpe(NULL, ec->gpe);
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
} else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
pr_info(PREFIX "GPE storm detected, "
"transactions will use polling mode\n");
@@ -788,8 +788,8 @@ static int ec_install_handlers(struct ac
&acpi_ec_gpe_handler, ec);
if (ACPI_FAILURE(status))
return -ENODEV;
- acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
- acpi_enable_gpe(NULL, ec->gpe);
+
+ acpi_enable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
status = acpi_install_address_space_handler(ec->handle,
ACPI_ADR_SPACE_EC,
&acpi_ec_space_handler,
@@ -806,6 +806,7 @@ static int ec_install_handlers(struct ac
} else {
acpi_remove_gpe_handler(NULL, ec->gpe,
&acpi_ec_gpe_handler);
+ acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
return -ENODEV;
}
}
@@ -816,6 +817,7 @@ static int ec_install_handlers(struct ac
static void ec_remove_handlers(struct acpi_ec *ec)
{
+ acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
pr_err(PREFIX "failed to remove space handler\n");
@@ -1058,7 +1060,7 @@ static int acpi_ec_suspend(struct acpi_d
{
struct acpi_ec *ec = acpi_driver_data(device);
/* Stop using GPE */
- acpi_disable_gpe(NULL, ec->gpe);
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
return 0;
}
@@ -1066,7 +1068,7 @@ static int acpi_ec_resume(struct acpi_de
{
struct acpi_ec *ec = acpi_driver_data(device);
/* Enable use of GPE back */
- acpi_enable_gpe(NULL, ec->gpe);
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
return 0;
}
Index: linux-2.6/drivers/acpi/sleep.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep.c
+++ linux-2.6/drivers/acpi/sleep.c
@@ -745,9 +745,18 @@ int acpi_pm_device_sleep_wake(struct dev
return -ENODEV;
}
- error = enable ?
- acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state) :
- acpi_disable_wakeup_device_power(adev);
+ if (enable) {
+ error = acpi_enable_wakeup_device_power(adev,
+ acpi_target_sleep_state);
+ if (!error)
+ acpi_enable_gpe(adev->wakeup.gpe_device,
+ adev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
+ } else {
+ acpi_disable_gpe(adev->wakeup.gpe_device, adev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
+ error = acpi_disable_wakeup_device_power(adev);
+ }
if (!error)
dev_info(dev, "wake-up capability %s by ACPI\n",
enable ? "enabled" : "disabled");
Index: linux-2.6/drivers/acpi/wakeup.c
===================================================================
--- linux-2.6.orig/drivers/acpi/wakeup.c
+++ linux-2.6/drivers/acpi/wakeup.c
@@ -21,12 +21,12 @@
ACPI_MODULE_NAME("wakeup_devices")
/**
- * acpi_enable_wakeup_device_prep - prepare wakeup devices
- * @sleep_state: ACPI state
- * Enable all wakup devices power if the devices' wakeup level
- * is higher than requested sleep level
+ * acpi_enable_wakeup_device_prep - Prepare wake-up devices.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * Enable all wake-up devices' power, unless the requested system sleep state is
+ * too deep.
*/
-
void acpi_enable_wakeup_device_prep(u8 sleep_state)
{
struct list_head *node, *next;
@@ -36,9 +36,8 @@ void acpi_enable_wakeup_device_prep(u8 s
struct acpi_device,
wakeup_list);
- if (!dev->wakeup.flags.valid ||
- !dev->wakeup.state.enabled ||
- (sleep_state > (u32) dev->wakeup.sleep_state))
+ if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
+ || (sleep_state > (u32) dev->wakeup.sleep_state))
continue;
acpi_enable_wakeup_device_power(dev, sleep_state);
@@ -46,9 +45,12 @@ void acpi_enable_wakeup_device_prep(u8 s
}
/**
- * acpi_enable_wakeup_device - enable wakeup devices
- * @sleep_state: ACPI state
- * Enable all wakup devices's GPE
+ * acpi_enable_wakeup_device - Enable wake-up device GPEs.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * Enable all wake-up devices' GPEs, with the assumption that
+ * acpi_disable_all_gpes() was executed before, so we don't need to disable any
+ * GPEs here.
*/
void acpi_enable_wakeup_device(u8 sleep_state)
{
@@ -65,29 +67,22 @@ void acpi_enable_wakeup_device(u8 sleep_
if (!dev->wakeup.flags.valid)
continue;
- /* If users want to disable run-wake GPE,
- * we only disable it for wake and leave it for runtime
- */
if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
- || sleep_state > (u32) dev->wakeup.sleep_state) {
- if (dev->wakeup.flags.run_wake) {
- /* set_gpe_type will disable GPE, leave it like that */
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_RUNTIME);
- }
+ || sleep_state > (u32) dev->wakeup.sleep_state)
continue;
- }
- if (!dev->wakeup.flags.run_wake)
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
+
+ /* The wake-up power should have been enabled already. */
+ acpi_set_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+ ACPI_GPE_ENABLE);
}
}
/**
- * acpi_disable_wakeup_device - disable devices' wakeup capability
- * @sleep_state: ACPI state
- * Disable all wakup devices's GPE and wakeup capability
+ * acpi_disable_wakeup_device - Disable devices' wakeup capability.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * This function only affects devices with wakeup.state.enabled set, which means
+ * that it reverses the changes made by acpi_enable_wakeup_device_prep().
*/
void acpi_disable_wakeup_device(u8 sleep_state)
{
@@ -97,30 +92,11 @@ void acpi_disable_wakeup_device(u8 sleep
struct acpi_device *dev =
container_of(node, struct acpi_device, wakeup_list);
- if (!dev->wakeup.flags.valid)
- continue;
-
- if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
- || sleep_state > (u32) dev->wakeup.sleep_state) {
- if (dev->wakeup.flags.run_wake) {
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
- /* Re-enable it, since set_gpe_type will disable it */
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
- }
+ if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
+ || (sleep_state > (u32) dev->wakeup.sleep_state))
continue;
- }
acpi_disable_wakeup_device_power(dev);
- /* Never disable run-wake GPE */
- if (!dev->wakeup.flags.run_wake) {
- acpi_disable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
- acpi_clear_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number, ACPI_NOT_ISR);
- }
}
}
@@ -136,11 +112,8 @@ int __init acpi_wakeup_device_init(void)
/* In case user doesn't load button driver */
if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
continue;
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
+ acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
dev->wakeup.state.enabled = 1;
}
mutex_unlock(&acpi_device_lock);
Index: linux-2.6/drivers/acpi/acpica/acevents.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/acevents.h
+++ linux-2.6/drivers/acpi/acpica/acevents.h
@@ -76,8 +76,7 @@ acpi_ev_queue_notify_request(struct acpi
* evgpe - GPE handling and dispatch
*/
acpi_status
-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
- u8 type);
+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info);
acpi_status
acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
@@ -122,9 +121,6 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_eve
u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);
acpi_status
-acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type);
-
-acpi_status
acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info);
acpi_status acpi_ev_gpe_initialize(void);
Index: linux-2.6/drivers/acpi/acpica/evgpe.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpe.c
+++ linux-2.6/drivers/acpi/acpica/evgpe.c
@@ -54,54 +54,9 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
/*******************************************************************************
*
- * FUNCTION: acpi_ev_set_gpe_type
- *
- * PARAMETERS: gpe_event_info - GPE to set
- * Type - New type
- *
- * RETURN: Status
- *
- * DESCRIPTION: Sets the new type for the GPE (wake, run, or wake/run)
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type)
-{
- acpi_status status;
-
- ACPI_FUNCTION_TRACE(ev_set_gpe_type);
-
- /* Validate type and update register enable masks */
-
- switch (type) {
- case ACPI_GPE_TYPE_WAKE:
- case ACPI_GPE_TYPE_RUNTIME:
- case ACPI_GPE_TYPE_WAKE_RUN:
- break;
-
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
- }
-
- /* Disable the GPE if currently enabled */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
-
- /* Clear the type bits and insert the new Type */
-
- gpe_event_info->flags &= ~ACPI_GPE_TYPE_MASK;
- gpe_event_info->flags |= type;
- return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
* FUNCTION: acpi_ev_update_gpe_enable_masks
*
* PARAMETERS: gpe_event_info - GPE to update
- * Type - What to do: ACPI_GPE_DISABLE or
- * ACPI_GPE_ENABLE
*
* RETURN: Status
*
@@ -110,8 +65,7 @@ acpi_ev_set_gpe_type(struct acpi_gpe_eve
******************************************************************************/
acpi_status
-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
- u8 type)
+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info)
{
struct acpi_gpe_register_info *gpe_register_info;
u8 register_bit;
@@ -127,37 +81,14 @@ acpi_ev_update_gpe_enable_masks(struct a
(1 <<
(gpe_event_info->gpe_number - gpe_register_info->base_gpe_number));
- /* 1) Disable case. Simply clear all enable bits */
-
- if (type == ACPI_GPE_DISABLE) {
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
- register_bit);
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- return_ACPI_STATUS(AE_OK);
- }
-
- /* 2) Enable case. Set/Clear the appropriate enable bits */
+ ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake, register_bit);
+ ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
- ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
-
- case ACPI_GPE_TYPE_RUNTIME:
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
- register_bit);
+ if (gpe_event_info->runtime_count)
ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
- case ACPI_GPE_TYPE_WAKE_RUN:
+ if (gpe_event_info->wakeup_count)
ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
- ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
-
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
- }
return_ACPI_STATUS(AE_OK);
}
@@ -186,47 +117,20 @@ acpi_ev_enable_gpe(struct acpi_gpe_event
/* Make sure HW enable masks are updated */
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info, ACPI_GPE_ENABLE);
- if (ACPI_FAILURE(status)) {
+ status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
- }
/* Mark wake-enabled or HW enable, or both */
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
- break;
-
- case ACPI_GPE_TYPE_WAKE_RUN:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
-
- /*lint -fallthrough */
-
- case ACPI_GPE_TYPE_RUNTIME:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
-
- if (write_to_hardware) {
-
- /* Clear the GPE (of stale events), then enable it */
-
- status = acpi_hw_clear_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- return_ACPI_STATUS(status);
- }
-
- /* Enable the requested runtime GPE */
-
- status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
- }
- break;
+ if (gpe_event_info->runtime_count && write_to_hardware) {
+ /* Clear the GPE (of stale events), then enable it */
+ status = acpi_hw_clear_gpe(gpe_event_info);
+ if (ACPI_FAILURE(status))
+ return_ACPI_STATUS(status);
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
+ /* Enable the requested runtime GPE */
+ status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
}
return_ACPI_STATUS(AE_OK);
@@ -252,34 +156,9 @@ acpi_status acpi_ev_disable_gpe(struct a
/* Make sure HW enable masks are updated */
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info, ACPI_GPE_DISABLE);
- if (ACPI_FAILURE(status)) {
+ status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
- }
-
- /* Clear the appropriate enabled flags for this GPE */
-
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
- break;
-
- case ACPI_GPE_TYPE_WAKE_RUN:
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
-
- /* fallthrough */
-
- case ACPI_GPE_TYPE_RUNTIME:
-
- /* Disable the requested runtime GPE */
-
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
- break;
-
- default:
- break;
- }
/*
* Even if we don't know the GPE type, make sure that we always
Index: linux-2.6/drivers/acpi/acpica/evgpeblk.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpeblk.c
+++ linux-2.6/drivers/acpi/acpica/evgpeblk.c
@@ -258,7 +258,6 @@ acpi_ev_save_method_info(acpi_handle obj
u32 gpe_number;
char name[ACPI_NAME_SIZE + 1];
u8 type;
- acpi_status status;
ACPI_FUNCTION_TRACE(ev_save_method_info);
@@ -325,26 +324,20 @@ acpi_ev_save_method_info(acpi_handle obj
/*
* Now we can add this information to the gpe_event_info block for use
- * during dispatch of this GPE. Default type is RUNTIME, although this may
- * change when the _PRW methods are executed later.
+ * during dispatch of this GPE.
*/
gpe_event_info =
&gpe_block->event_info[gpe_number - gpe_block->block_base_number];
- gpe_event_info->flags = (u8)
- (type | ACPI_GPE_DISPATCH_METHOD | ACPI_GPE_TYPE_RUNTIME);
+ gpe_event_info->flags = (u8) (type | ACPI_GPE_DISPATCH_METHOD);
gpe_event_info->dispatch.method_node =
(struct acpi_namespace_node *)obj_handle;
- /* Update enable mask, but don't enable the HW GPE as of yet */
-
- status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
-
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
"Registered GPE method %s as GPE number 0x%.2X\n",
name, gpe_number));
- return_ACPI_STATUS(status);
+ return_ACPI_STATUS(AE_OK);
}
/*******************************************************************************
@@ -454,20 +447,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle ob
gpe_block->
block_base_number];
- /* Mark GPE for WAKE-ONLY but WAKE_DISABLED */
-
- gpe_event_info->flags &=
- ~(ACPI_GPE_WAKE_ENABLED | ACPI_GPE_RUN_ENABLED);
-
- status =
- acpi_ev_set_gpe_type(gpe_event_info, ACPI_GPE_TYPE_WAKE);
- if (ACPI_FAILURE(status)) {
- goto cleanup;
- }
-
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info,
- ACPI_GPE_DISABLE);
+ gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
}
cleanup:
@@ -989,7 +969,6 @@ acpi_status
acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
struct acpi_gpe_block_info *gpe_block)
{
- acpi_status status;
struct acpi_gpe_event_info *gpe_event_info;
struct acpi_gpe_walk_info gpe_info;
u32 wake_gpe_count;
@@ -1019,42 +998,50 @@ acpi_ev_initialize_gpe_block(struct acpi
gpe_info.gpe_block = gpe_block;
gpe_info.gpe_device = gpe_device;
- status =
- acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+ acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, ACPI_NS_WALK_UNLOCK,
acpi_ev_match_prw_and_gpe, NULL,
&gpe_info, NULL);
}
/*
- * Enable all GPEs in this block that have these attributes:
- * 1) are "runtime" or "run/wake" GPEs, and
- * 2) have a corresponding _Lxx or _Exx method
- *
- * Any other GPEs within this block must be enabled via the
- * acpi_enable_gpe() external interface.
+ * Enable all GPEs that have a corresponding method and aren't
+ * capable of generating wakeups. Any other GPEs within this block
+ * must be enabled via the acpi_enable_gpe() interface.
*/
wake_gpe_count = 0;
gpe_enabled_count = 0;
+ if (gpe_device == acpi_gbl_fadt_gpe_device)
+ gpe_device = NULL;
for (i = 0; i < gpe_block->register_count; i++) {
- for (j = 0; j < 8; j++) {
+ for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
+ acpi_status status;
+ acpi_size gpe_index;
+ int gpe_number;
/* Get the info block for this particular GPE */
+ gpe_index = (acpi_size)i * ACPI_GPE_REGISTER_WIDTH + j;
+ gpe_event_info = &gpe_block->event_info[gpe_index];
- gpe_event_info = &gpe_block->event_info[((acpi_size) i *
- ACPI_GPE_REGISTER_WIDTH)
- + j];
-
- if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
- ACPI_GPE_DISPATCH_METHOD) &&
- (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) {
- gpe_enabled_count++;
- }
-
- if (gpe_event_info->flags & ACPI_GPE_TYPE_WAKE) {
+ if (gpe_event_info->flags & ACPI_GPE_CAN_WAKE) {
wake_gpe_count++;
+ if (acpi_gbl_leave_wake_gpes_disabled)
+ continue;
}
+
+ if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_METHOD))
+ continue;
+
+ 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))
+ ACPI_ERROR((AE_INFO,
+ "Failed to enable GPE %02X\n",
+ gpe_number));
+ else
+ gpe_enabled_count++;
}
}
@@ -1062,15 +1049,7 @@ acpi_ev_initialize_gpe_block(struct acpi
"Found %u Wake, Enabled %u Runtime GPEs in this block\n",
wake_gpe_count, gpe_enabled_count));
- /* Enable all valid runtime GPEs found above */
-
- status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block, NULL);
- if (ACPI_FAILURE(status)) {
- ACPI_ERROR((AE_INFO, "Could not enable GPEs in GpeBlock %p",
- gpe_block));
- }
-
- return_ACPI_STATUS(status);
+ return_ACPI_STATUS(AE_OK);
}
/*******************************************************************************
Index: linux-2.6/drivers/acpi/acpica/evxface.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evxface.c
+++ linux-2.6/drivers/acpi/acpica/evxface.c
@@ -617,13 +617,6 @@ acpi_install_gpe_handler(acpi_handle gpe
handler->context = context;
handler->method_node = gpe_event_info->dispatch.method_node;
- /* Disable the GPE before installing the handler */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- goto unlock_and_exit;
- }
-
/* Install the handler */
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
@@ -707,13 +700,6 @@ acpi_remove_gpe_handler(acpi_handle gpe_
goto unlock_and_exit;
}
- /* Disable the GPE before removing the handler */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- goto unlock_and_exit;
- }
-
/* Make sure all deferred tasks are completed */
(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
Index: linux-2.6/include/acpi/actypes.h
===================================================================
--- linux-2.6.orig/include/acpi/actypes.h
+++ linux-2.6/include/acpi/actypes.h
@@ -668,15 +668,16 @@ typedef u32 acpi_event_status;
/*
* GPE info flags - Per GPE
- * +-+-+-+---+---+-+
- * |7|6|5|4:3|2:1|0|
- * +-+-+-+---+---+-+
- * | | | | | |
- * | | | | | +--- Interrupt type: Edge or Level Triggered
- * | | | | +--- Type: Wake-only, Runtime-only, or wake/runtime
+ * +-+-+-+---+-+-+-+
+ * |7|6|5|4:3|2|1|0|
+ * +-+-+-+---+-+-+-+
+ * | | | | | | |
+ * | | | | | | +--- Interrupt type: Edge or Level Triggered
+ * | | | | | +--- GPE can wake the system
+ * | | | | +--- Unused
* | | | +--- Type of dispatch -- to method, handler, or none
- * | | +--- Enabled for runtime?
- * | +--- Enabled for wake?
+ * | | +--- Unused
+ * | +--- Unused
* +--- Unused
*/
#define ACPI_GPE_XRUPT_TYPE_MASK (u8) 0x01
@@ -687,22 +688,13 @@ typedef u32 acpi_event_status;
#define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x06
#define ACPI_GPE_TYPE_WAKE (u8) 0x02
#define ACPI_GPE_TYPE_RUNTIME (u8) 0x04 /* Default */
+#define ACPI_GPE_CAN_WAKE (u8) 0x02
#define ACPI_GPE_DISPATCH_MASK (u8) 0x18
#define ACPI_GPE_DISPATCH_HANDLER (u8) 0x08
#define ACPI_GPE_DISPATCH_METHOD (u8) 0x10
#define ACPI_GPE_DISPATCH_NOT_USED (u8) 0x00 /* Default */
-#define ACPI_GPE_RUN_ENABLE_MASK (u8) 0x20
-#define ACPI_GPE_RUN_ENABLED (u8) 0x20
-#define ACPI_GPE_RUN_DISABLED (u8) 0x00 /* Default */
-
-#define ACPI_GPE_WAKE_ENABLE_MASK (u8) 0x40
-#define ACPI_GPE_WAKE_ENABLED (u8) 0x40
-#define ACPI_GPE_WAKE_DISABLED (u8) 0x00 /* Default */
-
-#define ACPI_GPE_ENABLE_MASK (u8) 0x60 /* Both run/wake */
-
/*
* Flags for GPE and Lock interfaces
*/
Index: linux-2.6/drivers/acpi/system.c
===================================================================
--- linux-2.6.orig/drivers/acpi/system.c
+++ linux-2.6/drivers/acpi/system.c
@@ -387,10 +387,10 @@ static ssize_t counter_set(struct kobjec
if (index < num_gpes) {
if (!strcmp(buf, "disable\n") &&
(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_disable_gpe(handle, index);
+ result = acpi_set_gpe(handle, index, ACPI_GPE_DISABLE);
else if (!strcmp(buf, "enable\n") &&
!(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_enable_gpe(handle, index);
+ result = acpi_set_gpe(handle, index, ACPI_GPE_ENABLE);
else if (!strcmp(buf, "clear\n") &&
(status & ACPI_EVENT_FLAG_SET))
result = acpi_clear_gpe(handle, index, ACPI_NOT_ISR);
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs
2010-02-17 22:35 [PATCH 0/8] PCI run-time PM support (rev. 4) Rafael J. Wysocki
@ 2010-02-17 22:41 ` Rafael J. Wysocki
2010-02-17 22:41 ` Rafael J. Wysocki
1 sibling, 0 replies; 23+ messages in thread
From: Rafael J. Wysocki @ 2010-02-17 22:41 UTC (permalink / raw)
To: Jesse Barnes, Moore, Robert, Len Brown
Cc: Linux PCI, LKML, ACPI Devel Maling List, pm list, Matthew Garrett
From: Rafael J. Wysocki <rjw@sisk.pl>
ACPI GPEs may map to multiple devices. The current GPE interface
only provides a mechanism for enabling and disabling GPEs, making
it difficult to change the state of GPEs at runtime without extensive
cooperation between devices.
Add an API to allow devices to indicate whether or not they want
their device's GPE to be enabled for both runtime and wakeup events.
Remove the old GPE type handling entirely, which gets rid of various
quirks, like the implicit disabling with GPE type setting. This
requires a small amount of rework in order to ensure that non-wake
GPEs are enabled by default to preserve existing behaviour.
Based on patches from Matthew Garrett <mjg@redhat.com>.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/acpi/acpica/acevents.h | 6 -
drivers/acpi/acpica/aclocal.h | 2
drivers/acpi/acpica/evgpe.c | 153 ++++-------------------------------------
drivers/acpi/acpica/evgpeblk.c | 87 ++++++++---------------
drivers/acpi/acpica/evxface.c | 14 ---
drivers/acpi/acpica/evxfevnt.c | 90 +++++++++++++++++-------
drivers/acpi/button.c | 13 ++-
drivers/acpi/ec.c | 14 ++-
drivers/acpi/sleep.c | 15 +++-
drivers/acpi/system.c | 4 -
drivers/acpi/wakeup.c | 81 +++++++--------------
include/acpi/acpixf.h | 6 -
include/acpi/actypes.h | 28 ++-----
13 files changed, 188 insertions(+), 325 deletions(-)
Index: linux-2.6/drivers/acpi/acpica/aclocal.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/aclocal.h
+++ linux-2.6/drivers/acpi/acpica/aclocal.h
@@ -426,6 +426,8 @@ struct acpi_gpe_event_info {
struct acpi_gpe_register_info *register_info; /* Backpointer to register info */
u8 flags; /* Misc info about this GPE */
u8 gpe_number; /* This GPE */
+ u8 runtime_count;
+ u8 wakeup_count;
};
/* Information about a GPE register pair, one per each status/enable pair in an array */
Index: linux-2.6/drivers/acpi/acpica/evxfevnt.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evxfevnt.c
+++ linux-2.6/drivers/acpi/acpica/evxfevnt.c
@@ -201,23 +201,27 @@ ACPI_EXPORT_SYMBOL(acpi_enable_event)
/*******************************************************************************
*
- * FUNCTION: acpi_set_gpe_type
+ * FUNCTION: acpi_set_gpe
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Type - New GPE type
+ * action - Enable or disable
+ * Called from ISR or not
*
* RETURN: Status
*
- * DESCRIPTION: Set the type of an individual GPE
+ * DESCRIPTION: Enable or disable an ACPI event (general purpose)
*
******************************************************************************/
-acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type)
+acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action)
{
acpi_status status = AE_OK;
+ acpi_cpu_flags flags;
struct acpi_gpe_event_info *gpe_event_info;
- ACPI_FUNCTION_TRACE(acpi_set_gpe_type);
+ ACPI_FUNCTION_TRACE(acpi_set_gpe);
+
+ flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
/* Ensure that we have a valid GPE number */
@@ -227,19 +231,29 @@ acpi_status acpi_set_gpe_type(acpi_handl
goto unlock_and_exit;
}
- if ((gpe_event_info->flags & ACPI_GPE_TYPE_MASK) == type) {
- return_ACPI_STATUS(AE_OK);
- }
+ /* Perform the action */
- /* Set the new type (will disable GPE if currently enabled) */
+ switch (action) {
+ case ACPI_GPE_ENABLE:
+ status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
+ break;
+
+ case ACPI_GPE_DISABLE:
+ status = acpi_ev_disable_gpe(gpe_event_info);
+ break;
- status = acpi_ev_set_gpe_type(gpe_event_info, type);
+ default:
+ ACPI_ERROR((AE_INFO, "Invalid action\n"));
+ status = AE_BAD_PARAMETER;
+ break;
+ }
unlock_and_exit:
+ acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
+ACPI_EXPORT_SYMBOL(acpi_set_gpe)
/*******************************************************************************
*
@@ -247,15 +261,14 @@ ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Flags - Just enable, or also wake enable?
- * Called from ISR or not
+ * type - Purpose the GPE will be used for
*
* RETURN: Status
*
- * DESCRIPTION: Enable an ACPI event (general purpose)
+ * DESCRIPTION: Take a reference to a GPE and enable it if necessary
*
******************************************************************************/
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number)
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
{
acpi_status status = AE_OK;
acpi_cpu_flags flags;
@@ -273,15 +286,32 @@ acpi_status acpi_enable_gpe(acpi_handle
goto unlock_and_exit;
}
- /* Perform the enable */
+ if (type & ACPI_GPE_TYPE_RUNTIME) {
+ if (++gpe_event_info->runtime_count == 1)
+ status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
- status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
+ if (ACPI_FAILURE(status))
+ gpe_event_info->runtime_count--;
+ }
- unlock_and_exit:
+ if (type & ACPI_GPE_TYPE_WAKE) {
+ if (!(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
+ status = AE_BAD_PARAMETER;
+ goto unlock_and_exit;
+ }
+
+ /*
+ * Wake-up GPEs are only enabled right prior to putting the
+ * system into a sleep state.
+ */
+ if (++gpe_event_info->wakeup_count == 1)
+ acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ }
+
+unlock_and_exit:
acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-
ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
/*******************************************************************************
@@ -290,15 +320,14 @@ ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
*
* PARAMETERS: gpe_device - Parent GPE Device
* gpe_number - GPE level within the GPE block
- * Flags - Just disable, or also wake disable?
- * Called from ISR or not
+ * type - Purpose the GPE won't be used for any more
*
* RETURN: Status
*
- * DESCRIPTION: Disable an ACPI event (general purpose)
+ * DESCRIPTION: Release a reference to a GPE and disable it if necessary
*
******************************************************************************/
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number)
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type)
{
acpi_status status = AE_OK;
acpi_cpu_flags flags;
@@ -315,13 +344,24 @@ acpi_status acpi_disable_gpe(acpi_handle
goto unlock_and_exit;
}
- status = acpi_ev_disable_gpe(gpe_event_info);
+ if ((type & ACPI_GPE_TYPE_WAKE) && gpe_event_info->runtime_count) {
+ if (--gpe_event_info->runtime_count == 0)
+ acpi_ev_disable_gpe(gpe_event_info);
+ }
+
+ if ((type & ACPI_GPE_TYPE_RUNTIME) && gpe_event_info->wakeup_count) {
+ /*
+ * Wake-up GPEs are not enabled after leaving system sleep
+ * states, so we don't need to disable them here.
+ */
+ if (--gpe_event_info->wakeup_count == 0)
+ acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ }
unlock_and_exit:
acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
return_ACPI_STATUS(status);
}
-
ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
/*******************************************************************************
Index: linux-2.6/include/acpi/acpixf.h
===================================================================
--- linux-2.6.orig/include/acpi/acpixf.h
+++ linux-2.6/include/acpi/acpixf.h
@@ -281,11 +281,11 @@ acpi_status acpi_get_event_status(u32 ev
/*
* GPE Interfaces
*/
-acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type);
+acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action);
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number);
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type);
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number);
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 type);
acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags);
Index: linux-2.6/drivers/acpi/button.c
===================================================================
--- linux-2.6.orig/drivers/acpi/button.c
+++ linux-2.6/drivers/acpi/button.c
@@ -422,11 +422,9 @@ static int acpi_button_add(struct acpi_d
if (device->wakeup.flags.valid) {
/* Button's GPE is run-wake GPE */
- acpi_set_gpe_type(device->wakeup.gpe_device,
- device->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
acpi_enable_gpe(device->wakeup.gpe_device,
- device->wakeup.gpe_number);
+ device->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE_RUN);
device->wakeup.state.enabled = 1;
}
@@ -446,6 +444,13 @@ static int acpi_button_remove(struct acp
{
struct acpi_button *button = acpi_driver_data(device);
+ if (device->wakeup.flags.valid) {
+ acpi_disable_gpe(device->wakeup.gpe_device,
+ device->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE_RUN);
+ device->wakeup.state.enabled = 0;
+ }
+
acpi_button_remove_fs(device);
input_unregister_device(button->input);
kfree(button);
Index: linux-2.6/drivers/acpi/ec.c
===================================================================
--- linux-2.6.orig/drivers/acpi/ec.c
+++ linux-2.6/drivers/acpi/ec.c
@@ -307,7 +307,7 @@ static int acpi_ec_transaction(struct ac
pr_debug(PREFIX "transaction start\n");
/* disable GPE during transaction if storm is detected */
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
- acpi_disable_gpe(NULL, ec->gpe);
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
}
status = acpi_ec_transaction_unlocked(ec, t);
@@ -317,7 +317,7 @@ static int acpi_ec_transaction(struct ac
if (test_bit(EC_FLAGS_GPE_STORM, &ec->flags)) {
msleep(1);
/* it is safe to enable GPE outside of transaction */
- acpi_enable_gpe(NULL, ec->gpe);
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
} else if (t->irq_count > ACPI_EC_STORM_THRESHOLD) {
pr_info(PREFIX "GPE storm detected, "
"transactions will use polling mode\n");
@@ -788,8 +788,8 @@ static int ec_install_handlers(struct ac
&acpi_ec_gpe_handler, ec);
if (ACPI_FAILURE(status))
return -ENODEV;
- acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
- acpi_enable_gpe(NULL, ec->gpe);
+
+ acpi_enable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
status = acpi_install_address_space_handler(ec->handle,
ACPI_ADR_SPACE_EC,
&acpi_ec_space_handler,
@@ -806,6 +806,7 @@ static int ec_install_handlers(struct ac
} else {
acpi_remove_gpe_handler(NULL, ec->gpe,
&acpi_ec_gpe_handler);
+ acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
return -ENODEV;
}
}
@@ -816,6 +817,7 @@ static int ec_install_handlers(struct ac
static void ec_remove_handlers(struct acpi_ec *ec)
{
+ acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
pr_err(PREFIX "failed to remove space handler\n");
@@ -1058,7 +1060,7 @@ static int acpi_ec_suspend(struct acpi_d
{
struct acpi_ec *ec = acpi_driver_data(device);
/* Stop using GPE */
- acpi_disable_gpe(NULL, ec->gpe);
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);
return 0;
}
@@ -1066,7 +1068,7 @@ static int acpi_ec_resume(struct acpi_de
{
struct acpi_ec *ec = acpi_driver_data(device);
/* Enable use of GPE back */
- acpi_enable_gpe(NULL, ec->gpe);
+ acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);
return 0;
}
Index: linux-2.6/drivers/acpi/sleep.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep.c
+++ linux-2.6/drivers/acpi/sleep.c
@@ -745,9 +745,18 @@ int acpi_pm_device_sleep_wake(struct dev
return -ENODEV;
}
- error = enable ?
- acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state) :
- acpi_disable_wakeup_device_power(adev);
+ if (enable) {
+ error = acpi_enable_wakeup_device_power(adev,
+ acpi_target_sleep_state);
+ if (!error)
+ acpi_enable_gpe(adev->wakeup.gpe_device,
+ adev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
+ } else {
+ acpi_disable_gpe(adev->wakeup.gpe_device, adev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
+ error = acpi_disable_wakeup_device_power(adev);
+ }
if (!error)
dev_info(dev, "wake-up capability %s by ACPI\n",
enable ? "enabled" : "disabled");
Index: linux-2.6/drivers/acpi/wakeup.c
===================================================================
--- linux-2.6.orig/drivers/acpi/wakeup.c
+++ linux-2.6/drivers/acpi/wakeup.c
@@ -21,12 +21,12 @@
ACPI_MODULE_NAME("wakeup_devices")
/**
- * acpi_enable_wakeup_device_prep - prepare wakeup devices
- * @sleep_state: ACPI state
- * Enable all wakup devices power if the devices' wakeup level
- * is higher than requested sleep level
+ * acpi_enable_wakeup_device_prep - Prepare wake-up devices.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * Enable all wake-up devices' power, unless the requested system sleep state is
+ * too deep.
*/
-
void acpi_enable_wakeup_device_prep(u8 sleep_state)
{
struct list_head *node, *next;
@@ -36,9 +36,8 @@ void acpi_enable_wakeup_device_prep(u8 s
struct acpi_device,
wakeup_list);
- if (!dev->wakeup.flags.valid ||
- !dev->wakeup.state.enabled ||
- (sleep_state > (u32) dev->wakeup.sleep_state))
+ if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
+ || (sleep_state > (u32) dev->wakeup.sleep_state))
continue;
acpi_enable_wakeup_device_power(dev, sleep_state);
@@ -46,9 +45,12 @@ void acpi_enable_wakeup_device_prep(u8 s
}
/**
- * acpi_enable_wakeup_device - enable wakeup devices
- * @sleep_state: ACPI state
- * Enable all wakup devices's GPE
+ * acpi_enable_wakeup_device - Enable wake-up device GPEs.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * Enable all wake-up devices' GPEs, with the assumption that
+ * acpi_disable_all_gpes() was executed before, so we don't need to disable any
+ * GPEs here.
*/
void acpi_enable_wakeup_device(u8 sleep_state)
{
@@ -65,29 +67,22 @@ void acpi_enable_wakeup_device(u8 sleep_
if (!dev->wakeup.flags.valid)
continue;
- /* If users want to disable run-wake GPE,
- * we only disable it for wake and leave it for runtime
- */
if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
- || sleep_state > (u32) dev->wakeup.sleep_state) {
- if (dev->wakeup.flags.run_wake) {
- /* set_gpe_type will disable GPE, leave it like that */
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_RUNTIME);
- }
+ || sleep_state > (u32) dev->wakeup.sleep_state)
continue;
- }
- if (!dev->wakeup.flags.run_wake)
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
+
+ /* The wake-up power should have been enabled already. */
+ acpi_set_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+ ACPI_GPE_ENABLE);
}
}
/**
- * acpi_disable_wakeup_device - disable devices' wakeup capability
- * @sleep_state: ACPI state
- * Disable all wakup devices's GPE and wakeup capability
+ * acpi_disable_wakeup_device - Disable devices' wakeup capability.
+ * @sleep_state: ACPI system sleep state.
+ *
+ * This function only affects devices with wakeup.state.enabled set, which means
+ * that it reverses the changes made by acpi_enable_wakeup_device_prep().
*/
void acpi_disable_wakeup_device(u8 sleep_state)
{
@@ -97,30 +92,11 @@ void acpi_disable_wakeup_device(u8 sleep
struct acpi_device *dev =
container_of(node, struct acpi_device, wakeup_list);
- if (!dev->wakeup.flags.valid)
- continue;
-
- if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
- || sleep_state > (u32) dev->wakeup.sleep_state) {
- if (dev->wakeup.flags.run_wake) {
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
- /* Re-enable it, since set_gpe_type will disable it */
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
- }
+ if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
+ || (sleep_state > (u32) dev->wakeup.sleep_state))
continue;
- }
acpi_disable_wakeup_device_power(dev);
- /* Never disable run-wake GPE */
- if (!dev->wakeup.flags.run_wake) {
- acpi_disable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
- acpi_clear_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number, ACPI_NOT_ISR);
- }
}
}
@@ -136,11 +112,8 @@ int __init acpi_wakeup_device_init(void)
/* In case user doesn't load button driver */
if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
continue;
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number);
+ acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE);
dev->wakeup.state.enabled = 1;
}
mutex_unlock(&acpi_device_lock);
Index: linux-2.6/drivers/acpi/acpica/acevents.h
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/acevents.h
+++ linux-2.6/drivers/acpi/acpica/acevents.h
@@ -76,8 +76,7 @@ acpi_ev_queue_notify_request(struct acpi
* evgpe - GPE handling and dispatch
*/
acpi_status
-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
- u8 type);
+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info);
acpi_status
acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
@@ -122,9 +121,6 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_eve
u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);
acpi_status
-acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type);
-
-acpi_status
acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info);
acpi_status acpi_ev_gpe_initialize(void);
Index: linux-2.6/drivers/acpi/acpica/evgpe.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpe.c
+++ linux-2.6/drivers/acpi/acpica/evgpe.c
@@ -54,54 +54,9 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
/*******************************************************************************
*
- * FUNCTION: acpi_ev_set_gpe_type
- *
- * PARAMETERS: gpe_event_info - GPE to set
- * Type - New type
- *
- * RETURN: Status
- *
- * DESCRIPTION: Sets the new type for the GPE (wake, run, or wake/run)
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type)
-{
- acpi_status status;
-
- ACPI_FUNCTION_TRACE(ev_set_gpe_type);
-
- /* Validate type and update register enable masks */
-
- switch (type) {
- case ACPI_GPE_TYPE_WAKE:
- case ACPI_GPE_TYPE_RUNTIME:
- case ACPI_GPE_TYPE_WAKE_RUN:
- break;
-
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
- }
-
- /* Disable the GPE if currently enabled */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
-
- /* Clear the type bits and insert the new Type */
-
- gpe_event_info->flags &= ~ACPI_GPE_TYPE_MASK;
- gpe_event_info->flags |= type;
- return_ACPI_STATUS(status);
-}
-
-/*******************************************************************************
- *
* FUNCTION: acpi_ev_update_gpe_enable_masks
*
* PARAMETERS: gpe_event_info - GPE to update
- * Type - What to do: ACPI_GPE_DISABLE or
- * ACPI_GPE_ENABLE
*
* RETURN: Status
*
@@ -110,8 +65,7 @@ acpi_ev_set_gpe_type(struct acpi_gpe_eve
******************************************************************************/
acpi_status
-acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
- u8 type)
+acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info)
{
struct acpi_gpe_register_info *gpe_register_info;
u8 register_bit;
@@ -127,37 +81,14 @@ acpi_ev_update_gpe_enable_masks(struct a
(1 <<
(gpe_event_info->gpe_number - gpe_register_info->base_gpe_number));
- /* 1) Disable case. Simply clear all enable bits */
-
- if (type == ACPI_GPE_DISABLE) {
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
- register_bit);
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- return_ACPI_STATUS(AE_OK);
- }
-
- /* 2) Enable case. Set/Clear the appropriate enable bits */
+ ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake, register_bit);
+ ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
- ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
-
- case ACPI_GPE_TYPE_RUNTIME:
- ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
- register_bit);
+ if (gpe_event_info->runtime_count)
ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
- case ACPI_GPE_TYPE_WAKE_RUN:
+ if (gpe_event_info->wakeup_count)
ACPI_SET_BIT(gpe_register_info->enable_for_wake, register_bit);
- ACPI_SET_BIT(gpe_register_info->enable_for_run, register_bit);
- break;
-
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
- }
return_ACPI_STATUS(AE_OK);
}
@@ -186,47 +117,20 @@ acpi_ev_enable_gpe(struct acpi_gpe_event
/* Make sure HW enable masks are updated */
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info, ACPI_GPE_ENABLE);
- if (ACPI_FAILURE(status)) {
+ status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
- }
/* Mark wake-enabled or HW enable, or both */
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
- break;
-
- case ACPI_GPE_TYPE_WAKE_RUN:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
-
- /*lint -fallthrough */
-
- case ACPI_GPE_TYPE_RUNTIME:
-
- ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
-
- if (write_to_hardware) {
-
- /* Clear the GPE (of stale events), then enable it */
-
- status = acpi_hw_clear_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- return_ACPI_STATUS(status);
- }
-
- /* Enable the requested runtime GPE */
-
- status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
- }
- break;
+ if (gpe_event_info->runtime_count && write_to_hardware) {
+ /* Clear the GPE (of stale events), then enable it */
+ status = acpi_hw_clear_gpe(gpe_event_info);
+ if (ACPI_FAILURE(status))
+ return_ACPI_STATUS(status);
- default:
- return_ACPI_STATUS(AE_BAD_PARAMETER);
+ /* Enable the requested runtime GPE */
+ status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
}
return_ACPI_STATUS(AE_OK);
@@ -252,34 +156,9 @@ acpi_status acpi_ev_disable_gpe(struct a
/* Make sure HW enable masks are updated */
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info, ACPI_GPE_DISABLE);
- if (ACPI_FAILURE(status)) {
+ status = acpi_ev_update_gpe_enable_masks(gpe_event_info);
+ if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
- }
-
- /* Clear the appropriate enabled flags for this GPE */
-
- switch (gpe_event_info->flags & ACPI_GPE_TYPE_MASK) {
- case ACPI_GPE_TYPE_WAKE:
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
- break;
-
- case ACPI_GPE_TYPE_WAKE_RUN:
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_WAKE_ENABLED);
-
- /* fallthrough */
-
- case ACPI_GPE_TYPE_RUNTIME:
-
- /* Disable the requested runtime GPE */
-
- ACPI_CLEAR_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
- break;
-
- default:
- break;
- }
/*
* Even if we don't know the GPE type, make sure that we always
Index: linux-2.6/drivers/acpi/acpica/evgpeblk.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evgpeblk.c
+++ linux-2.6/drivers/acpi/acpica/evgpeblk.c
@@ -258,7 +258,6 @@ acpi_ev_save_method_info(acpi_handle obj
u32 gpe_number;
char name[ACPI_NAME_SIZE + 1];
u8 type;
- acpi_status status;
ACPI_FUNCTION_TRACE(ev_save_method_info);
@@ -325,26 +324,20 @@ acpi_ev_save_method_info(acpi_handle obj
/*
* Now we can add this information to the gpe_event_info block for use
- * during dispatch of this GPE. Default type is RUNTIME, although this may
- * change when the _PRW methods are executed later.
+ * during dispatch of this GPE.
*/
gpe_event_info =
&gpe_block->event_info[gpe_number - gpe_block->block_base_number];
- gpe_event_info->flags = (u8)
- (type | ACPI_GPE_DISPATCH_METHOD | ACPI_GPE_TYPE_RUNTIME);
+ gpe_event_info->flags = (u8) (type | ACPI_GPE_DISPATCH_METHOD);
gpe_event_info->dispatch.method_node =
(struct acpi_namespace_node *)obj_handle;
- /* Update enable mask, but don't enable the HW GPE as of yet */
-
- status = acpi_ev_enable_gpe(gpe_event_info, FALSE);
-
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
"Registered GPE method %s as GPE number 0x%.2X\n",
name, gpe_number));
- return_ACPI_STATUS(status);
+ return_ACPI_STATUS(AE_OK);
}
/*******************************************************************************
@@ -454,20 +447,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle ob
gpe_block->
block_base_number];
- /* Mark GPE for WAKE-ONLY but WAKE_DISABLED */
-
- gpe_event_info->flags &=
- ~(ACPI_GPE_WAKE_ENABLED | ACPI_GPE_RUN_ENABLED);
-
- status =
- acpi_ev_set_gpe_type(gpe_event_info, ACPI_GPE_TYPE_WAKE);
- if (ACPI_FAILURE(status)) {
- goto cleanup;
- }
-
- status =
- acpi_ev_update_gpe_enable_masks(gpe_event_info,
- ACPI_GPE_DISABLE);
+ gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
}
cleanup:
@@ -989,7 +969,6 @@ acpi_status
acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
struct acpi_gpe_block_info *gpe_block)
{
- acpi_status status;
struct acpi_gpe_event_info *gpe_event_info;
struct acpi_gpe_walk_info gpe_info;
u32 wake_gpe_count;
@@ -1019,42 +998,50 @@ acpi_ev_initialize_gpe_block(struct acpi
gpe_info.gpe_block = gpe_block;
gpe_info.gpe_device = gpe_device;
- status =
- acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+ acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, ACPI_NS_WALK_UNLOCK,
acpi_ev_match_prw_and_gpe, NULL,
&gpe_info, NULL);
}
/*
- * Enable all GPEs in this block that have these attributes:
- * 1) are "runtime" or "run/wake" GPEs, and
- * 2) have a corresponding _Lxx or _Exx method
- *
- * Any other GPEs within this block must be enabled via the
- * acpi_enable_gpe() external interface.
+ * Enable all GPEs that have a corresponding method and aren't
+ * capable of generating wakeups. Any other GPEs within this block
+ * must be enabled via the acpi_enable_gpe() interface.
*/
wake_gpe_count = 0;
gpe_enabled_count = 0;
+ if (gpe_device == acpi_gbl_fadt_gpe_device)
+ gpe_device = NULL;
for (i = 0; i < gpe_block->register_count; i++) {
- for (j = 0; j < 8; j++) {
+ for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
+ acpi_status status;
+ acpi_size gpe_index;
+ int gpe_number;
/* Get the info block for this particular GPE */
+ gpe_index = (acpi_size)i * ACPI_GPE_REGISTER_WIDTH + j;
+ gpe_event_info = &gpe_block->event_info[gpe_index];
- gpe_event_info = &gpe_block->event_info[((acpi_size) i *
- ACPI_GPE_REGISTER_WIDTH)
- + j];
-
- if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
- ACPI_GPE_DISPATCH_METHOD) &&
- (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) {
- gpe_enabled_count++;
- }
-
- if (gpe_event_info->flags & ACPI_GPE_TYPE_WAKE) {
+ if (gpe_event_info->flags & ACPI_GPE_CAN_WAKE) {
wake_gpe_count++;
+ if (acpi_gbl_leave_wake_gpes_disabled)
+ continue;
}
+
+ if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_METHOD))
+ continue;
+
+ 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))
+ ACPI_ERROR((AE_INFO,
+ "Failed to enable GPE %02X\n",
+ gpe_number));
+ else
+ gpe_enabled_count++;
}
}
@@ -1062,15 +1049,7 @@ acpi_ev_initialize_gpe_block(struct acpi
"Found %u Wake, Enabled %u Runtime GPEs in this block\n",
wake_gpe_count, gpe_enabled_count));
- /* Enable all valid runtime GPEs found above */
-
- status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block, NULL);
- if (ACPI_FAILURE(status)) {
- ACPI_ERROR((AE_INFO, "Could not enable GPEs in GpeBlock %p",
- gpe_block));
- }
-
- return_ACPI_STATUS(status);
+ return_ACPI_STATUS(AE_OK);
}
/*******************************************************************************
Index: linux-2.6/drivers/acpi/acpica/evxface.c
===================================================================
--- linux-2.6.orig/drivers/acpi/acpica/evxface.c
+++ linux-2.6/drivers/acpi/acpica/evxface.c
@@ -617,13 +617,6 @@ acpi_install_gpe_handler(acpi_handle gpe
handler->context = context;
handler->method_node = gpe_event_info->dispatch.method_node;
- /* Disable the GPE before installing the handler */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- goto unlock_and_exit;
- }
-
/* Install the handler */
flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
@@ -707,13 +700,6 @@ acpi_remove_gpe_handler(acpi_handle gpe_
goto unlock_and_exit;
}
- /* Disable the GPE before removing the handler */
-
- status = acpi_ev_disable_gpe(gpe_event_info);
- if (ACPI_FAILURE(status)) {
- goto unlock_and_exit;
- }
-
/* Make sure all deferred tasks are completed */
(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
Index: linux-2.6/include/acpi/actypes.h
===================================================================
--- linux-2.6.orig/include/acpi/actypes.h
+++ linux-2.6/include/acpi/actypes.h
@@ -668,15 +668,16 @@ typedef u32 acpi_event_status;
/*
* GPE info flags - Per GPE
- * +-+-+-+---+---+-+
- * |7|6|5|4:3|2:1|0|
- * +-+-+-+---+---+-+
- * | | | | | |
- * | | | | | +--- Interrupt type: Edge or Level Triggered
- * | | | | +--- Type: Wake-only, Runtime-only, or wake/runtime
+ * +-+-+-+---+-+-+-+
+ * |7|6|5|4:3|2|1|0|
+ * +-+-+-+---+-+-+-+
+ * | | | | | | |
+ * | | | | | | +--- Interrupt type: Edge or Level Triggered
+ * | | | | | +--- GPE can wake the system
+ * | | | | +--- Unused
* | | | +--- Type of dispatch -- to method, handler, or none
- * | | +--- Enabled for runtime?
- * | +--- Enabled for wake?
+ * | | +--- Unused
+ * | +--- Unused
* +--- Unused
*/
#define ACPI_GPE_XRUPT_TYPE_MASK (u8) 0x01
@@ -687,22 +688,13 @@ typedef u32 acpi_event_status;
#define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x06
#define ACPI_GPE_TYPE_WAKE (u8) 0x02
#define ACPI_GPE_TYPE_RUNTIME (u8) 0x04 /* Default */
+#define ACPI_GPE_CAN_WAKE (u8) 0x02
#define ACPI_GPE_DISPATCH_MASK (u8) 0x18
#define ACPI_GPE_DISPATCH_HANDLER (u8) 0x08
#define ACPI_GPE_DISPATCH_METHOD (u8) 0x10
#define ACPI_GPE_DISPATCH_NOT_USED (u8) 0x00 /* Default */
-#define ACPI_GPE_RUN_ENABLE_MASK (u8) 0x20
-#define ACPI_GPE_RUN_ENABLED (u8) 0x20
-#define ACPI_GPE_RUN_DISABLED (u8) 0x00 /* Default */
-
-#define ACPI_GPE_WAKE_ENABLE_MASK (u8) 0x40
-#define ACPI_GPE_WAKE_ENABLED (u8) 0x40
-#define ACPI_GPE_WAKE_DISABLED (u8) 0x00 /* Default */
-
-#define ACPI_GPE_ENABLE_MASK (u8) 0x60 /* Both run/wake */
-
/*
* Flags for GPE and Lock interfaces
*/
Index: linux-2.6/drivers/acpi/system.c
===================================================================
--- linux-2.6.orig/drivers/acpi/system.c
+++ linux-2.6/drivers/acpi/system.c
@@ -387,10 +387,10 @@ static ssize_t counter_set(struct kobjec
if (index < num_gpes) {
if (!strcmp(buf, "disable\n") &&
(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_disable_gpe(handle, index);
+ result = acpi_set_gpe(handle, index, ACPI_GPE_DISABLE);
else if (!strcmp(buf, "enable\n") &&
!(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_enable_gpe(handle, index);
+ result = acpi_set_gpe(handle, index, ACPI_GPE_ENABLE);
else if (!strcmp(buf, "clear\n") &&
(status & ACPI_EVENT_FLAG_SET))
result = acpi_clear_gpe(handle, index, ACPI_NOT_ISR);
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2010-02-25 19:55 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-19 21:23 [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs Moore, Robert
2010-02-19 23:14 ` Rafael J. Wysocki
2010-02-24 22:05 ` Moore, Robert
2010-02-25 15:14 ` Alexey Starikovskiy
2010-02-25 19:56 ` Rafael J. Wysocki
2010-02-19 23:18 ` Rafael J. Wysocki
2010-02-19 23:18 ` Rafael J. Wysocki
2010-02-23 0:26 ` Jesse Barnes
2010-02-23 23:52 ` Rafael J. Wysocki
2010-02-23 23:52 ` Rafael J. Wysocki
2010-02-24 22:26 ` Jesse Barnes
2010-02-24 22:26 ` Jesse Barnes
2010-02-23 0:26 ` Jesse Barnes
-- strict thread matches above, loose matches on Subject: below --
2010-02-17 22:35 [PATCH 0/8] PCI run-time PM support (rev. 4) Rafael J. Wysocki
2010-02-17 22:41 ` [PATCH 4/8] ACPI: Use GPE reference counting to support shared GPEs Rafael J. Wysocki
2010-02-17 22:41 ` Rafael J. Wysocki
2010-02-18 7:05 ` Jin Dongming
2010-02-18 20:01 ` Rafael J. Wysocki
2010-02-18 20:01 ` Rafael J. Wysocki
2010-02-19 7:24 ` Jin Dongming
2010-02-19 21:08 ` Rafael J. Wysocki
2010-02-19 21:08 ` Rafael J. Wysocki
2010-02-19 7:24 ` Jin Dongming
2010-02-18 7:05 ` Jin Dongming
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.