/******************************************************************************
*
- * FUNCTION: acpi_hw_enable_gpe
+ * FUNCTION: acpi_hw_write_gpe_enable_reg
*
* PARAMETERS: gpe_event_info - Info block for the GPE to be enabled
*
* RETURN: Status
*
- * DESCRIPTION: Enable a single GPE.
+ * DESCRIPTION: Write a GPE enable register. Note: The bit for this GPE must
+ * already be cleared or set in the parent register
+ * enable_for_run mask.
*
******************************************************************************/
acpi_status
-acpi_hw_enable_gpe (
- struct acpi_gpe_event_info *gpe_event_info)
-{
- u32 in_byte;
- acpi_status status;
-
-
- ACPI_FUNCTION_ENTRY ();
-
-
- /*
- * Read the current value of the register, set the appropriate bit
- * to enable the GPE, and write out the new register.
- */
- status = acpi_hw_low_level_read (8, &in_byte,
- &gpe_event_info->register_info->enable_address);
- if (ACPI_FAILURE (status)) {
- return (status);
- }
-
- /* Write with the new GPE bit enabled */
-
- status = acpi_hw_low_level_write (8, (in_byte | gpe_event_info->bit_mask),
- &gpe_event_info->register_info->enable_address);
-
- return (status);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION: acpi_hw_enable_gpe_for_wakeup
- *
- * PARAMETERS: gpe_event_info - Info block for the GPE to be enabled
- *
- * RETURN: None
- *
- * DESCRIPTION: Keep track of which GPEs the OS has requested not be
- * disabled when going to sleep.
- *
- ******************************************************************************/
-
-void
-acpi_hw_enable_gpe_for_wakeup (
+acpi_hw_write_gpe_enable_reg (
struct acpi_gpe_event_info *gpe_event_info)
{
struct acpi_gpe_register_info *gpe_register_info;
-
-
- ACPI_FUNCTION_ENTRY ();
-
-
- /* Get the info block for the entire GPE register */
-
- gpe_register_info = gpe_event_info->register_info;
- if (!gpe_register_info) {
- return;
- }
-
- /*
- * Set the bit so we will not enable this GPE when sleeping (and disable
- * it upon wake)
- */
- gpe_register_info->wake_enable |= gpe_event_info->bit_mask;
- gpe_event_info->flags |= (ACPI_GPE_TYPE_WAKE | ACPI_GPE_ENABLED);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION: acpi_hw_disable_gpe
- *
- * PARAMETERS: gpe_event_info - Info block for the GPE to be disabled
- *
- * RETURN: Status
- *
- * DESCRIPTION: Disable a single GPE.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_hw_disable_gpe (
- struct acpi_gpe_event_info *gpe_event_info)
-{
- u32 in_byte;
acpi_status status;
- struct acpi_gpe_register_info *gpe_register_info;
ACPI_FUNCTION_ENTRY ();
gpe_register_info = gpe_event_info->register_info;
if (!gpe_register_info) {
- return (AE_BAD_PARAMETER);
- }
-
- /*
- * Read the current value of the register, clear the appropriate bit,
- * and write out the new register value to disable the GPE.
- */
- status = acpi_hw_low_level_read (8, &in_byte,
- &gpe_register_info->enable_address);
- if (ACPI_FAILURE (status)) {
- return (status);
+ return (AE_NOT_EXIST);
}
- /* Write the byte with this GPE bit cleared */
+ /* Write the entire GPE (runtime) enable register */
- status = acpi_hw_low_level_write (8, (in_byte & ~(gpe_event_info->bit_mask)),
+ status = acpi_hw_low_level_write (8, gpe_register_info->enable_for_run,
&gpe_register_info->enable_address);
- if (ACPI_FAILURE (status)) {
- return (status);
- }
-
- /* Make sure this GPE is disabled for wake, also */
-
- acpi_hw_disable_gpe_for_wakeup (gpe_event_info);
- return (AE_OK);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION: acpi_hw_disable_gpe_for_wakeup
- *
- * PARAMETERS: gpe_event_info - Info block for the GPE to be disabled
- *
- * RETURN: None
- *
- * DESCRIPTION: Keep track of which GPEs the OS has requested not be
- * disabled when going to sleep.
- *
- ******************************************************************************/
-void
-acpi_hw_disable_gpe_for_wakeup (
- struct acpi_gpe_event_info *gpe_event_info)
-{
- struct acpi_gpe_register_info *gpe_register_info;
-
-
- ACPI_FUNCTION_ENTRY ();
-
-
- /* Get the info block for the entire GPE register */
-
- gpe_register_info = gpe_event_info->register_info;
- if (!gpe_register_info) {
- return;
- }
-
- /* Clear the bit so we will disable this when sleeping */
-
- gpe_register_info->wake_enable &= ~(gpe_event_info->bit_mask);
+ return (status);
}
*
* PARAMETERS: gpe_event_info - Info block for the GPE to be cleared
*
- * RETURN: status_status
+ * RETURN: Status
*
* DESCRIPTION: Clear the status bit for a single GPE.
*
* Write a one to the appropriate bit in the status register to
* clear this GPE.
*/
- status = acpi_hw_low_level_write (8, gpe_event_info->bit_mask,
+ status = acpi_hw_low_level_write (8, gpe_event_info->register_bit,
&gpe_event_info->register_info->status_address);
return (status);
acpi_event_status *event_status)
{
u32 in_byte;
- u8 bit_mask;
+ u8 register_bit;
struct acpi_gpe_register_info *gpe_register_info;
acpi_status status;
acpi_event_status local_event_status = 0;
/* Get the register bitmask for this GPE */
- bit_mask = gpe_event_info->bit_mask;
-
- /* GPE Enabled? */
+ register_bit = gpe_event_info->register_bit;
- status = acpi_hw_low_level_read (8, &in_byte, &gpe_register_info->enable_address);
- if (ACPI_FAILURE (status)) {
- goto unlock_and_exit;
- }
+ /* GPE currently enabled? (enabled for runtime?) */
- if (bit_mask & in_byte) {
+ if (register_bit & gpe_register_info->enable_for_run) {
local_event_status |= ACPI_EVENT_FLAG_ENABLED;
}
- /* GPE Enabled for wake? */
+ /* GPE enabled for wake? */
- if (bit_mask & gpe_register_info->wake_enable) {
+ if (register_bit & gpe_register_info->enable_for_wake) {
local_event_status |= ACPI_EVENT_FLAG_WAKE_ENABLED;
}
- /* GPE active (set)? */
+ /* GPE currently active (status bit == 1)? */
status = acpi_hw_low_level_read (8, &in_byte, &gpe_register_info->status_address);
if (ACPI_FAILURE (status)) {
goto unlock_and_exit;
}
- if (bit_mask & in_byte) {
+ if (register_bit & in_byte) {
local_event_status |= ACPI_EVENT_FLAG_SET;
}
/******************************************************************************
*
- * FUNCTION: acpi_hw_prepare_gpe_block_for_sleep
+ * FUNCTION: acpi_hw_enable_runtime_gpe_block
*
* PARAMETERS: gpe_xrupt_info - GPE Interrupt info
* gpe_block - Gpe Block info
*
* RETURN: Status
*
- * DESCRIPTION: Disable all runtime GPEs and enable all wakeup GPEs -- within
- * a single GPE block
+ * DESCRIPTION: Enable all "runtime" GPEs within a GPE block. (Includes
+ * combination wake/run GPEs.)
*
******************************************************************************/
-static acpi_status
-acpi_hw_prepare_gpe_block_for_sleep (
+acpi_status
+acpi_hw_enable_runtime_gpe_block (
struct acpi_gpe_xrupt_info *gpe_xrupt_info,
struct acpi_gpe_block_info *gpe_block)
{
u32 i;
- struct acpi_gpe_register_info *gpe_register_info;
- u32 in_value;
acpi_status status;
- /* Get the register info for the entire GPE block */
-
- gpe_register_info = gpe_block->register_info;
+ /* NOTE: assumes that all GPEs are currently disabled */
/* Examine each GPE Register within the block */
for (i = 0; i < gpe_block->register_count; i++) {
- /*
- * Read the enabled/disabled status of all GPEs. We
- * will be using it to restore all the GPEs later.
- *
- * NOTE: Wake GPEs are are ALL disabled at this time, so when we wake
- * and restore this register, they will be automatically disabled.
- */
- status = acpi_hw_low_level_read (8, &in_value,
- &gpe_register_info->enable_address);
- if (ACPI_FAILURE (status)) {
- return (status);
+ if (!gpe_block->register_info[i].enable_for_run) {
+ continue;
}
- gpe_register_info->enable = (u8) in_value;
+ /* Enable all "runtime" GPEs in this register */
- /*
- * 1) Disable all runtime GPEs
- * 2) Enable all wakeup GPEs
- */
- status = acpi_hw_low_level_write (8, gpe_register_info->wake_enable,
- &gpe_register_info->enable_address);
+ status = acpi_hw_low_level_write (8, gpe_block->register_info[i].enable_for_run,
+ &gpe_block->register_info[i].enable_address);
if (ACPI_FAILURE (status)) {
return (status);
}
-
- /* Point to next GPE register */
-
- gpe_register_info++;
}
return (AE_OK);
/******************************************************************************
*
- * FUNCTION: acpi_hw_prepare_gpes_for_sleep
+ * FUNCTION: acpi_hw_enable_wakeup_gpe_block
*
- * PARAMETERS: None
+ * PARAMETERS: gpe_xrupt_info - GPE Interrupt info
+ * gpe_block - Gpe Block info
*
* RETURN: Status
*
- * DESCRIPTION: Disable all runtime GPEs, enable all wake GPEs.
- * Called with interrupts disabled. The interrupt handler also
- * modifies gpe_register_info->Enable, so it should not be
- * given the chance to run until after the runtime GPEs are
- * re-enabled.
+ * DESCRIPTION: Enable all "wake" GPEs within a GPE block. (Includes
+ * combination wake/run GPEs.)
*
******************************************************************************/
acpi_status
-acpi_hw_prepare_gpes_for_sleep (
- void)
+acpi_hw_enable_wakeup_gpe_block (
+ struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+ struct acpi_gpe_block_info *gpe_block)
{
+ u32 i;
acpi_status status;
- ACPI_FUNCTION_ENTRY ();
+ /* Examine each GPE Register within the block */
+ for (i = 0; i < gpe_block->register_count; i++) {
+ if (!gpe_block->register_info[i].enable_for_wake) {
+ continue;
+ }
- status = acpi_ev_walk_gpe_list (acpi_hw_prepare_gpe_block_for_sleep);
- return (status);
+ /* Enable all "wake" GPEs in this register */
+
+ status = acpi_hw_low_level_write (8, gpe_block->register_info[i].enable_for_wake,
+ &gpe_block->register_info[i].enable_address);
+ if (ACPI_FAILURE (status)) {
+ return (status);
+ }
+ }
+
+ return (AE_OK);
}
/******************************************************************************
*
- * FUNCTION: acpi_hw_restore_gpe_block_on_wake
+ * FUNCTION: acpi_hw_disable_all_gpes
*
- * PARAMETERS: gpe_xrupt_info - GPE Interrupt info
- * gpe_block - Gpe Block info
+ * PARAMETERS: Flags - ACPI_NOT_ISR or ACPI_ISR
*
* RETURN: Status
*
- * DESCRIPTION: Enable all runtime GPEs and disable all wake GPEs -- in one
- * GPE block
+ * DESCRIPTION: Disable and clear all GPEs
*
******************************************************************************/
-static acpi_status
-acpi_hw_restore_gpe_block_on_wake (
- struct acpi_gpe_xrupt_info *gpe_xrupt_info,
- struct acpi_gpe_block_info *gpe_block)
+acpi_status
+acpi_hw_disable_all_gpes (
+ u32 flags)
{
- u32 i;
- struct acpi_gpe_register_info *gpe_register_info;
acpi_status status;
- /* This callback processes one entire GPE block */
+ ACPI_FUNCTION_TRACE ("hw_disable_all_gpes");
- /* Get the register info for the entire GPE block */
- gpe_register_info = gpe_block->register_info;
+ status = acpi_ev_walk_gpe_list (acpi_hw_disable_gpe_block, flags);
+ status = acpi_ev_walk_gpe_list (acpi_hw_clear_gpe_block, flags);
+ return_ACPI_STATUS (status);
+}
- /* Examine each GPE register within the block */
- for (i = 0; i < gpe_block->register_count; i++) {
- /* Clear the entire status register */
+/******************************************************************************
+ *
+ * FUNCTION: acpi_hw_enable_all_runtime_gpes
+ *
+ * PARAMETERS: Flags - ACPI_NOT_ISR or ACPI_ISR
+ *
+ * RETURN: Status
+ *
+ * DESCRIPTION: Enable all GPEs of the given type
+ *
+ ******************************************************************************/
- status = acpi_hw_low_level_write (8, 0xFF,
- &gpe_block->register_info[i].status_address);
- if (ACPI_FAILURE (status)) {
- return (status);
- }
+acpi_status
+acpi_hw_enable_all_runtime_gpes (
+ u32 flags)
+{
+ acpi_status status;
- /*
- * Restore the GPE Enable register, which will do the following:
- *
- * 1) Disable all wakeup GPEs
- * 2) Enable all runtime GPEs
- *
- * (On sleep, we saved the enabled status of all GPEs)
- */
- status = acpi_hw_low_level_write (8, gpe_register_info->enable,
- &gpe_register_info->enable_address);
- if (ACPI_FAILURE (status)) {
- return (status);
- }
- /* Point to next GPE register */
+ ACPI_FUNCTION_TRACE ("hw_enable_all_runtime_gpes");
- gpe_register_info++;
- }
- return (AE_OK);
+ status = acpi_ev_walk_gpe_list (acpi_hw_enable_runtime_gpe_block, flags);
+ return_ACPI_STATUS (status);
}
/******************************************************************************
*
- * FUNCTION: acpi_hw_restore_gpes_on_wake
+ * FUNCTION: acpi_hw_enable_all_wakeup_gpes
*
- * PARAMETERS: None
+ * PARAMETERS: Flags - ACPI_NOT_ISR or ACPI_ISR
*
* RETURN: Status
*
- * DESCRIPTION: Enable all runtime GPEs and disable all wake GPEs -- in all
- * GPE blocks
+ * DESCRIPTION: Enable all GPEs of the given type
*
******************************************************************************/
acpi_status
-acpi_hw_restore_gpes_on_wake (
- void)
+acpi_hw_enable_all_wakeup_gpes (
+ u32 flags)
{
acpi_status status;
- ACPI_FUNCTION_ENTRY ();
+ ACPI_FUNCTION_TRACE ("hw_enable_all_wakeup_gpes");
- status = acpi_ev_walk_gpe_list (acpi_hw_restore_gpe_block_on_wake);
- return (status);
+ status = acpi_ev_walk_gpe_list (acpi_hw_enable_wakeup_gpe_block, flags);
+ return_ACPI_STATUS (status);
}
+
git://git.onelab.eu / linux-2.6.git / blobdiff