evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf: replace cpu_up/down with device_online/offline

Browse source 
The cpu_up/down calls do not update userspace cpu
online information accurately. Use the device_on/offline
API to correct this.

Change-Id: I97ab55f4f917bd9cbb31dd89785eecdbe4d2f9ca
Signed-off-by: Neil Leeder <nleeder@codeaurora.org>
[satyap: merge conflict resolution and move changes in
         arch/arm64/kernel/perf_event.c to drivers/perf/arm_pmu.c
         to align with kernel 4.4]
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
This commit is contained in:
Neil Leeder 2015-11-20 14:45:09 -05:00 • committed by David Keitel
parent 1170e6d78b
commit 38dccacd2b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/perf/arm_pmu.c
View file

@ -1164,7 +1164,9 @@ static __ref void reset_pmu_force(void)
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
if (!cpu_online(cpu)) { if (!cpu_online(cpu)) {
save_online_mask |= BIT(cpu); save_online_mask |= BIT(cpu);
ret = cpu_up(cpu); lock_device_hotplug();
ret = device_online(get_cpu_device(cpu));
unlock_device_hotplug();
if (ret) if (ret)
pr_err("Failed to bring up CPU: %d, ret: %d\n", pr_err("Failed to bring up CPU: %d, ret: %d\n",
cpu, ret); cpu, ret);
@ -1176,7 +1178,9 @@ static __ref void reset_pmu_force(void)
armpmu_release_hardware(cpu_pmu); armpmu_release_hardware(cpu_pmu);
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
if ((save_online_mask & BIT(cpu)) && cpu_online(cpu)) { if ((save_online_mask & BIT(cpu)) && cpu_online(cpu)) {
ret = cpu_down(cpu); lock_device_hotplug();
ret = device_online(get_cpu_device(cpu));
unlock_device_hotplug();
if (ret) if (ret)
pr_err("Failed to bring down CPU: %d, ret: %d\n", pr_err("Failed to bring down CPU: %d, ret: %d\n",
cpu, ret); cpu, ret);