|
@@ -440,6 +440,58 @@ static struct notifier_block acpi_cpu_notifier =
|
|
.notifier_call = acpi_cpu_soft_notify,
|
|
.notifier_call = acpi_cpu_soft_notify,
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+static int __cpuinit acpi_processor_start(struct acpi_processor *pr)
|
|
|
|
+{
|
|
|
|
+ struct acpi_device *device = per_cpu(processor_device_array, pr->id);
|
|
|
|
+ int result = 0;
|
|
|
|
+
|
|
|
|
+#ifdef CONFIG_CPU_FREQ
|
|
|
|
+ acpi_processor_ppc_has_changed(pr, 0);
|
|
|
|
+#endif
|
|
|
|
+ acpi_processor_get_throttling_info(pr);
|
|
|
|
+ acpi_processor_get_limit_info(pr);
|
|
|
|
+
|
|
|
|
+ if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
|
|
|
|
+ acpi_processor_power_init(pr, device);
|
|
|
|
+
|
|
|
|
+ pr->cdev = thermal_cooling_device_register("Processor", device,
|
|
|
|
+ &processor_cooling_ops);
|
|
|
|
+ if (IS_ERR(pr->cdev)) {
|
|
|
|
+ result = PTR_ERR(pr->cdev);
|
|
|
|
+ goto err_power_exit;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ dev_dbg(&device->dev, "registered as cooling_device%d\n",
|
|
|
|
+ pr->cdev->id);
|
|
|
|
+
|
|
|
|
+ result = sysfs_create_link(&device->dev.kobj,
|
|
|
|
+ &pr->cdev->device.kobj,
|
|
|
|
+ "thermal_cooling");
|
|
|
|
+ if (result) {
|
|
|
|
+ printk(KERN_ERR PREFIX "Create sysfs link\n");
|
|
|
|
+ goto err_thermal_unregister;
|
|
|
|
+ }
|
|
|
|
+ result = sysfs_create_link(&pr->cdev->device.kobj,
|
|
|
|
+ &device->dev.kobj,
|
|
|
|
+ "device");
|
|
|
|
+ if (result) {
|
|
|
|
+ printk(KERN_ERR PREFIX "Create sysfs link\n");
|
|
|
|
+ goto err_remove_sysfs_thermal;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+err_remove_sysfs_thermal:
|
|
|
|
+ sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
|
|
|
|
+err_thermal_unregister:
|
|
|
|
+ thermal_cooling_device_unregister(pr->cdev);
|
|
|
|
+err_power_exit:
|
|
|
|
+ acpi_processor_power_exit(pr, device);
|
|
|
|
+
|
|
|
|
+ return result;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+
|
|
static int __cpuinit acpi_processor_add(struct acpi_device *device)
|
|
static int __cpuinit acpi_processor_add(struct acpi_device *device)
|
|
{
|
|
{
|
|
struct acpi_processor *pr = NULL;
|
|
struct acpi_processor *pr = NULL;
|
|
@@ -494,49 +546,13 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
|
|
result = -EFAULT;
|
|
result = -EFAULT;
|
|
goto err_free_cpumask;
|
|
goto err_free_cpumask;
|
|
}
|
|
}
|
|
-
|
|
|
|
-#ifdef CONFIG_CPU_FREQ
|
|
|
|
- acpi_processor_ppc_has_changed(pr, 0);
|
|
|
|
-#endif
|
|
|
|
- acpi_processor_get_throttling_info(pr);
|
|
|
|
- acpi_processor_get_limit_info(pr);
|
|
|
|
-
|
|
|
|
- if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
|
|
|
|
- acpi_processor_power_init(pr, device);
|
|
|
|
-
|
|
|
|
- pr->cdev = thermal_cooling_device_register("Processor", device,
|
|
|
|
- &processor_cooling_ops);
|
|
|
|
- if (IS_ERR(pr->cdev)) {
|
|
|
|
- result = PTR_ERR(pr->cdev);
|
|
|
|
- goto err_power_exit;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- dev_dbg(&device->dev, "registered as cooling_device%d\n",
|
|
|
|
- pr->cdev->id);
|
|
|
|
-
|
|
|
|
- result = sysfs_create_link(&device->dev.kobj,
|
|
|
|
- &pr->cdev->device.kobj,
|
|
|
|
- "thermal_cooling");
|
|
|
|
- if (result) {
|
|
|
|
- printk(KERN_ERR PREFIX "Create sysfs link\n");
|
|
|
|
- goto err_thermal_unregister;
|
|
|
|
- }
|
|
|
|
- result = sysfs_create_link(&pr->cdev->device.kobj,
|
|
|
|
- &device->dev.kobj,
|
|
|
|
- "device");
|
|
|
|
- if (result) {
|
|
|
|
- printk(KERN_ERR PREFIX "Create sysfs link\n");
|
|
|
|
|
|
+ result = acpi_processor_start(pr);
|
|
|
|
+ if (result)
|
|
goto err_remove_sysfs;
|
|
goto err_remove_sysfs;
|
|
- }
|
|
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
err_remove_sysfs:
|
|
err_remove_sysfs:
|
|
- sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
|
|
|
|
-err_thermal_unregister:
|
|
|
|
- thermal_cooling_device_unregister(pr->cdev);
|
|
|
|
-err_power_exit:
|
|
|
|
- acpi_processor_power_exit(pr, device);
|
|
|
|
sysfs_remove_link(&device->dev.kobj, "sysdev");
|
|
sysfs_remove_link(&device->dev.kobj, "sysdev");
|
|
err_free_cpumask:
|
|
err_free_cpumask:
|
|
free_cpumask_var(pr->throttling.shared_cpu_map);
|
|
free_cpumask_var(pr->throttling.shared_cpu_map);
|