A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-06 03:45:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "devfreq: memlat: fix potential deadlock during CPU hotplug"

Browse source
This commit is contained in:
qctecmdr 2020-06-11 10:59:14 -07:00 • committed by Gerrit - the friendly Code Review server
commit dedd7a1e0b
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/devfreq/arm-memlat-mon.c
View file

@ -461,8 +461,10 @@ static int memlat_event_hotplug_coming_up(unsigned int cpu)
if (!cpu_grp)
return -ENODEV;
mutex_lock(&cpu_grp->mons_lock);
ret = memlat_hp_restart_events(cpu, true);
per_cpu(cpu_is_hp, cpu) = false;
if (cpu_grp->num_active_mons) {
ret = memlat_hp_restart_events(cpu, true);
per_cpu(cpu_is_hp, cpu) = false;
}
mutex_unlock(&cpu_grp->mons_lock);
return ret;
@ -477,8 +479,10 @@ static int memlat_event_hotplug_going_down(unsigned int cpu)
return -ENODEV;
/* avoid race between cpu hotplug and update_counts */
mutex_lock(&cpu_grp->mons_lock);
per_cpu(cpu_is_hp, cpu) = true;
ret = memlat_hp_restart_events(cpu, false);
if (cpu_grp->num_active_mons) {
per_cpu(cpu_is_hp, cpu) = true;
ret = memlat_hp_restart_events(cpu, false);
}
mutex_unlock(&cpu_grp->mons_lock);
return ret;
@ -629,6 +633,7 @@ static void stop_hwmon(struct memlat_hwmon *hw)
hp_idle_register_cnt--;
mutex_unlock(&notify_lock);
}
mutex_unlock(&cpu_grp->mons_lock);
mutex_lock(&notify_lock);
if (!hp_idle_register_cnt) {
cpuhp_remove_state_nocalls(CPUHP_AP_ONLINE_DYN);
@ -639,7 +644,6 @@ static void stop_hwmon(struct memlat_hwmon *hw)
}
}
mutex_unlock(&notify_lock);
mutex_unlock(&cpu_grp->mons_lock);
}
/**