UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ACPI / processor: Initialize per_cpu(processors, pr->id) properly 

Commit ac212b6 (ACPI / processor: Use common hotplug infrastructure)
forgot about initializing the per-CPU 'processors' variables which
lead to ACPI cpuidle failure to use C-states and caused boot slowdown
on multi-CPU machines.

Fix the problem by adding per_cpu(processors, pr->id) initialization
to acpi_processor_add() and add make acpi_processor_remove() clean it
up as appropriate.

Also modify acpi_processor_stop() so that it doesn't clear
per_cpu(processors, pr->id) on processor driver removal which would
then cause problems to happen when the driver is loaded again.

This version of the patch contains fixes from Yinghai Lu.

Reported-and-tested-by: Yinghai Lu <yinghai@kernel.org>
Reported-and-tested-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Rafael J. Wysocki 2013-05-30 21:55:46 +02:00
parent 1001b4d4a8
commit 2e4f1db49d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/acpi/acpi_processor.c
View File

@ -29,6 +29,9 @@
ACPI_MODULE_NAME("processor"); ACPI_MODULE_NAME("processor");
DEFINE_PER_CPU(struct acpi_processor *, processors);
EXPORT_PER_CPU_SYMBOL(processors);
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Errata Handling Errata Handling
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
@ -387,6 +390,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device,
* checks. * checks.
*/ */
per_cpu(processor_device_array, pr->id) = device; per_cpu(processor_device_array, pr->id) = device;
per_cpu(processors, pr->id) = pr;
dev = get_cpu_device(pr->id); dev = get_cpu_device(pr->id);
ACPI_HANDLE_SET(dev, pr->handle); ACPI_HANDLE_SET(dev, pr->handle);
@ -407,6 +411,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device,
err: err:
free_cpumask_var(pr->throttling.shared_cpu_map); free_cpumask_var(pr->throttling.shared_cpu_map);
device->driver_data = NULL; device->driver_data = NULL;
per_cpu(processors, pr->id) = NULL;
err_free_pr: err_free_pr:
kfree(pr); kfree(pr);
return result; return result;
@ -441,6 +446,7 @@ static void acpi_processor_remove(struct acpi_device *device)
/* Clean up. */ /* Clean up. */
per_cpu(processor_device_array, pr->id) = NULL; per_cpu(processor_device_array, pr->id) = NULL;
per_cpu(processors, pr->id) = NULL;
try_offline_node(cpu_to_node(pr->id)); try_offline_node(cpu_to_node(pr->id));
/* Remove the CPU. */ /* Remove the CPU. */

5
drivers/acpi/processor_driver.c
View File

@ -78,9 +78,6 @@ static struct device_driver acpi_processor_driver = {
.remove = acpi_processor_stop, .remove = acpi_processor_stop,
}; };
DEFINE_PER_CPU(struct acpi_processor *, processors);
EXPORT_PER_CPU_SYMBOL(processors);
static void acpi_processor_notify(acpi_handle handle, u32 event, void *data) static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
{ {
struct acpi_device *device = data; struct acpi_device *device = data;
@ -268,8 +265,6 @@ static int acpi_processor_stop(struct device *dev)
thermal_cooling_device_unregister(pr->cdev); thermal_cooling_device_unregister(pr->cdev);
pr->cdev = NULL; pr->cdev = NULL;
} }
per_cpu(processors, pr->id) = NULL;
return 0; return 0;
} }