acpi: use queue_work_on() instead of binding workqueue worker to cpu0
ACPI works need to be executed on cpu0 and acpi/osl.c achieves this by creating singlethread workqueue and then binding it to cpu0 from a work which is quite unorthodox. Make it create regular workqueues and use queue_work_on() instead. This is in preparation of concurrency managed workqueue and the extra workers won't be a problem after it's implemented. Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
parent
82805ab77d
commit
8fec62b2d9
@ -191,36 +191,11 @@ acpi_status __init acpi_os_initialize(void)
|
||||
return AE_OK;
|
||||
}
|
||||
|
||||
static void bind_to_cpu0(struct work_struct *work)
|
||||
{
|
||||
set_cpus_allowed_ptr(current, cpumask_of(0));
|
||||
kfree(work);
|
||||
}
|
||||
|
||||
static void bind_workqueue(struct workqueue_struct *wq)
|
||||
{
|
||||
struct work_struct *work;
|
||||
|
||||
work = kzalloc(sizeof(struct work_struct), GFP_KERNEL);
|
||||
INIT_WORK(work, bind_to_cpu0);
|
||||
queue_work(wq, work);
|
||||
}
|
||||
|
||||
acpi_status acpi_os_initialize1(void)
|
||||
{
|
||||
/*
|
||||
* On some machines, a software-initiated SMI causes corruption unless
|
||||
* the SMI runs on CPU 0. An SMI can be initiated by any AML, but
|
||||
* typically it's done in GPE-related methods that are run via
|
||||
* workqueues, so we can avoid the known corruption cases by binding
|
||||
* the workqueues to CPU 0.
|
||||
*/
|
||||
kacpid_wq = create_singlethread_workqueue("kacpid");
|
||||
bind_workqueue(kacpid_wq);
|
||||
kacpi_notify_wq = create_singlethread_workqueue("kacpi_notify");
|
||||
bind_workqueue(kacpi_notify_wq);
|
||||
kacpi_hotplug_wq = create_singlethread_workqueue("kacpi_hotplug");
|
||||
bind_workqueue(kacpi_hotplug_wq);
|
||||
kacpid_wq = create_workqueue("kacpid");
|
||||
kacpi_notify_wq = create_workqueue("kacpi_notify");
|
||||
kacpi_hotplug_wq = create_workqueue("kacpi_hotplug");
|
||||
BUG_ON(!kacpid_wq);
|
||||
BUG_ON(!kacpi_notify_wq);
|
||||
BUG_ON(!kacpi_hotplug_wq);
|
||||
@ -766,7 +741,14 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
|
||||
else
|
||||
INIT_WORK(&dpc->work, acpi_os_execute_deferred);
|
||||
|
||||
ret = queue_work(queue, &dpc->work);
|
||||
/*
|
||||
* On some machines, a software-initiated SMI causes corruption unless
|
||||
* the SMI runs on CPU 0. An SMI can be initiated by any AML, but
|
||||
* typically it's done in GPE-related methods that are run via
|
||||
* workqueues, so we can avoid the known corruption cases by always
|
||||
* queueing on CPU 0.
|
||||
*/
|
||||
ret = queue_work_on(0, queue, &dpc->work);
|
||||
|
||||
if (!ret) {
|
||||
printk(KERN_ERR PREFIX
|
||||
|
Loading…
Reference in New Issue
Block a user