lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'release' and 'gpe-ack' into release

Browse Source
This commit is contained in:
Len Brown
2008-02-07 03:11:47 -05:00
parent 5531d28504 17bc54eef9
commit 7924e4f651
2 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/acpi/events/evgpe.c
View File

@@ -501,6 +501,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
* an interrupt handler. * an interrupt handler.
* *
******************************************************************************/ ******************************************************************************/
static void acpi_ev_asynch_enable_gpe(void *context);
static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context) static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
{ {
@@ -576,22 +577,30 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
method_node))); method_node)));
} }
} }
/* Defer enabling of GPE until all notify handlers are done */
acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_asynch_enable_gpe,
gpe_event_info);
return_VOID;
}
if ((local_gpe_event_info.flags & ACPI_GPE_XRUPT_TYPE_MASK) == static void acpi_ev_asynch_enable_gpe(void *context)
{
struct acpi_gpe_event_info *gpe_event_info = context;
acpi_status status;
if ((gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
ACPI_GPE_LEVEL_TRIGGERED) { ACPI_GPE_LEVEL_TRIGGERED) {
/* /*
* GPE is level-triggered, we clear the GPE status bit after * GPE is level-triggered, we clear the GPE status bit after
* handling the event. * handling the event.
*/ */
status = acpi_hw_clear_gpe(&local_gpe_event_info); status = acpi_hw_clear_gpe(gpe_event_info);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
return_VOID; return_VOID;
} }
} }
/* Enable this GPE */ /* Enable this GPE */
(void)acpi_hw_write_gpe_enable_reg(gpe_event_info);
(void)acpi_hw_write_gpe_enable_reg(&local_gpe_event_info);
return_VOID; return_VOID;
} }

42
drivers/acpi/osl.c
View File

@@ -665,25 +665,6 @@ static void acpi_os_execute_deferred(struct work_struct *work)
dpc->function(dpc->context); dpc->function(dpc->context);
kfree(dpc); kfree(dpc);
/* Yield cpu to notify thread */
cond_resched();
return;
}
static void acpi_os_execute_notify(struct work_struct *work)
{
struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
if (!dpc) {
printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
return;
}
dpc->function(dpc->context);
kfree(dpc);
return; return;
} }
@@ -707,7 +688,7 @@ acpi_status acpi_os_execute(acpi_execute_type type,
{ {
acpi_status status = AE_OK; acpi_status status = AE_OK;
struct acpi_os_dpc *dpc; struct acpi_os_dpc *dpc;
struct workqueue_struct *queue;
ACPI_DEBUG_PRINT((ACPI_DB_EXEC, ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
"Scheduling function [%p(%p)] for deferred execution.\n", "Scheduling function [%p(%p)] for deferred execution.\n",
function, context)); function, context));
@@ -731,20 +712,13 @@ acpi_status acpi_os_execute(acpi_execute_type type,
dpc->function = function; dpc->function = function;
dpc->context = context; dpc->context = context;
if (type == OSL_NOTIFY_HANDLER) { INIT_WORK(&dpc->work, acpi_os_execute_deferred);
INIT_WORK(&dpc->work, acpi_os_execute_notify); queue = (type == OSL_NOTIFY_HANDLER) ? kacpi_notify_wq : kacpid_wq;
if (!queue_work(kacpi_notify_wq, &dpc->work)) { if (!queue_work(queue, &dpc->work)) {
status = AE_ERROR; ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
kfree(dpc); "Call to queue_work() failed.\n"));
} status = AE_ERROR;
} else { kfree(dpc);
INIT_WORK(&dpc->work, acpi_os_execute_deferred);
if (!queue_work(kacpid_wq, &dpc->work)) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Call to queue_work() failed.\n"));
status = AE_ERROR;
kfree(dpc);
}
} }
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
} }