On Thursday, May 30, 2013 11:12:30 AM Yinghai Lu wrote:
> On Thu, May 30, 2013 at 10:42 AM, Yinghai Lu <yinghai@xxxxxxxxxx> wrote:
> > On Thu, May 30, 2013 at 9:36 AM, Rafael J. Wysocki <rjw@xxxxxxx> wrote:
>
> > do you need to remove
> > per_cpu(processors, pr->id) = NULL;
> > from processor_driver.c::acpi_processor_stop ?
>
> updated patch.
Thanks!
Appended is essentially the same one with a changelog and tags.
Thanks,
Rafael
---
From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Reported-and-tested-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
---
drivers/acpi/acpi_processor.c | 6 ++++++
drivers/acpi/processor_driver.c | 5 -----
2 files changed, 6 insertions(+), 5 deletions(-)
Index: linux-pm/drivers/acpi/processor_driver.c
===================================================================
--- linux-pm.orig/drivers/acpi/processor_driver.c
+++ linux-pm/drivers/acpi/processor_driver.c
@@ -78,9 +78,6 @@ static struct device_driver acpi_process
.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)
{
struct acpi_device *device = data;
@@ -268,8 +265,6 @@ static int acpi_processor_stop(struct de
thermal_cooling_device_unregister(pr->cdev);
pr->cdev = NULL;
}
-
- per_cpu(processors, pr->id) = NULL;
return 0;
}
Index: linux-pm/drivers/acpi/acpi_processor.c
===================================================================
--- linux-pm.orig/drivers/acpi/acpi_processor.c
+++ linux-pm/drivers/acpi/acpi_processor.c
@@ -29,6 +29,9 @@
ACPI_MODULE_NAME("processor");
+DEFINE_PER_CPU(struct acpi_processor *, processors);
+EXPORT_PER_CPU_SYMBOL(processors);
+
/* --------------------------------------------------------------------------
Errata Handling
-------------------------------------------------------------------------- */
@@ -387,6 +390,7 @@ static int __cpuinit acpi_processor_add(
* checks.
*/
per_cpu(processor_device_array, pr->id) = device;
+ per_cpu(processors, pr->id) = pr;
dev = get_cpu_device(pr->id);
result = acpi_bind_one(dev, pr->handle);
@@ -406,6 +410,7 @@ static int __cpuinit acpi_processor_add(
err:
free_cpumask_var(pr->throttling.shared_cpu_map);
device->driver_data = NULL;
+ per_cpu(processors, pr->id) = NULL;
err_free_pr:
kfree(pr);
return result;
@@ -440,6 +445,7 @@ static void acpi_processor_remove(struct
/* Clean up. */
per_cpu(processor_device_array, pr->id) = NULL;
+ per_cpu(processors, pr->id) = NULL;
try_offline_node(cpu_to_node(pr->id));
/* Remove the CPU. */
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
