renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-12 23:54:19 +08:00
Code

thermal/x86_pkg_temp: Sanitize callback (de)initialization

Browse Source 
The threshold callbacks are installed before the initialization of the
online cpus has succeeded and removed after the teardown has been
done. That's both wrong as callbacks might be invoked into a half
initialized or torn down state.

Move them to the proper places: Last in init() and first in exit().

While at it shorten the insane long and horrible named function names.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
This commit is contained in:
Thomas Gleixner 2016-11-22 17:57:06 +00:00 committed by Zhang Rui
parent 21a3d3d4c8
commit 09a674cd69
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/thermal/x86_pkg_temp_thermal.c
View File

@ -281,7 +281,7 @@ static struct thermal_zone_device_ops tzone_ops = {
.set_trip_temp = sys_set_trip_temp, .set_trip_temp = sys_set_trip_temp,
}; };
static bool pkg_temp_thermal_platform_thermal_rate_control(void) static bool pkg_thermal_rate_control(void)
{ {
return true; return true;
} }
@ -355,7 +355,7 @@ static void pkg_temp_thermal_threshold_work_fn(struct work_struct *work)
} }
} }
static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val) static int pkg_thermal_notify(__u64 msr_val)
{ {
unsigned long flags; unsigned long flags;
int cpu = smp_processor_id(); int cpu = smp_processor_id();
@ -579,10 +579,6 @@ static int __init pkg_temp_thermal_init(void)
return -ENODEV; return -ENODEV;
spin_lock_init(&pkg_work_lock); spin_lock_init(&pkg_work_lock);
platform_thermal_package_notify =
pkg_temp_thermal_platform_thermal_notify;
platform_thermal_package_rate_control =
pkg_temp_thermal_platform_thermal_rate_control;
cpu_notifier_register_begin(); cpu_notifier_register_begin();
for_each_online_cpu(i) for_each_online_cpu(i)
@ -591,6 +587,9 @@ static int __init pkg_temp_thermal_init(void)
__register_hotcpu_notifier(&pkg_temp_thermal_notifier); __register_hotcpu_notifier(&pkg_temp_thermal_notifier);
cpu_notifier_register_done(); cpu_notifier_register_done();
platform_thermal_package_notify = pkg_thermal_notify;
platform_thermal_package_rate_control = pkg_thermal_rate_control;
pkg_temp_debugfs_init(); /* Don't care if fails */ pkg_temp_debugfs_init(); /* Don't care if fails */
return 0; return 0;
@ -600,9 +599,6 @@ err_ret:
put_core_offline(i); put_core_offline(i);
cpu_notifier_register_done(); cpu_notifier_register_done();
kfree(pkg_work_scheduled); kfree(pkg_work_scheduled);
platform_thermal_package_notify = NULL;
platform_thermal_package_rate_control = NULL;
return -ENODEV; return -ENODEV;
} }
@ -611,6 +607,9 @@ static void __exit pkg_temp_thermal_exit(void)
struct phy_dev_entry *phdev, *n; struct phy_dev_entry *phdev, *n;
int i; int i;
platform_thermal_package_notify = NULL;
platform_thermal_package_rate_control = NULL;
cpu_notifier_register_begin(); cpu_notifier_register_begin();
__unregister_hotcpu_notifier(&pkg_temp_thermal_notifier); __unregister_hotcpu_notifier(&pkg_temp_thermal_notifier);
mutex_lock(&phy_dev_list_mutex); mutex_lock(&phy_dev_list_mutex);
@ -625,8 +624,6 @@ static void __exit pkg_temp_thermal_exit(void)
kfree(phdev); kfree(phdev);
} }
mutex_unlock(&phy_dev_list_mutex); mutex_unlock(&phy_dev_list_mutex);
platform_thermal_package_notify = NULL;
platform_thermal_package_rate_control = NULL;
for_each_online_cpu(i) for_each_online_cpu(i)
cancel_delayed_work_sync( cancel_delayed_work_sync(
&per_cpu(pkg_temp_thermal_threshold_work, i)); &per_cpu(pkg_temp_thermal_threshold_work, i));