Commit 21a3d3d4 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Zhang Rui

thermal/x86_pkg_temp: Replace open coded cpu search

find_next_sibling() iterates over the online cpus and searches for a cpu
with the same package id as the current cpu. This is a pointless exercise
as topology_core_cpumask() allows a simple cpumask search for an online cpu
on the same package.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 89baa56b
...@@ -384,18 +384,6 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val) ...@@ -384,18 +384,6 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
return 0; return 0;
} }
static int find_siblings_cpu(int cpu)
{
int i;
int id = topology_physical_package_id(cpu);
for_each_online_cpu(i)
if (i != cpu && topology_physical_package_id(i) == id)
return i;
return 0;
}
static int pkg_temp_thermal_device_add(unsigned int cpu) static int pkg_temp_thermal_device_add(unsigned int cpu)
{ {
int err; int err;
...@@ -488,9 +476,10 @@ static int pkg_temp_thermal_device_remove(unsigned int cpu) ...@@ -488,9 +476,10 @@ static int pkg_temp_thermal_device_remove(unsigned int cpu)
mutex_lock(&phy_dev_list_mutex); mutex_lock(&phy_dev_list_mutex);
/* If we are loosing the first cpu for this package, we need change */ /* If we are loosing the first cpu for this package, we need change */
if (phdev->first_cpu == cpu) { if (phdev->first_cpu == cpu) {
phdev->first_cpu = find_siblings_cpu(cpu); int target = cpumask_any_but(topology_core_cpumask(cpu), cpu);
pr_debug("thermal_device_remove: first cpu switched %d\n",
phdev->first_cpu); phdev->first_cpu = target;
pr_debug("CPU %d down. New first_cpu%d\n", cpu, target);
} }
/* /*
* It is possible that no siblings left as this was the last cpu * It is possible that no siblings left as this was the last cpu
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment