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-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "drivers: soc: qcom: update rimps memlat while saving pmu counters"

Browse source
This commit is contained in:
qctecmdr 2020-10-09 19:37:40 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8227ad733d
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/soc/qcom/rimps_memlat.c
View file

@ -620,7 +620,8 @@ static void save_cpugrp_pmu_events(struct memlat_cpu_grp *cpu_grp, u8 cpu)
for (i = 0; i < NUM_COMMON_EVS; i++) {
u8 hw_id = pmu[i].hw_cntr_idx;
if (hw_id == INVALID_PMU_HW_IDX)
if ((hw_id == INVALID_PMU_HW_IDX) ||
!cpus_data->common_evs[i])
continue;
perf_event_read_local(cpus_data->common_evs[i],
&ev_count, NULL, NULL);
@ -639,7 +640,8 @@ static void save_mon_pmu_events(struct memlat_mon *mon, u8 cpu)
for (i = 0; i < NUM_MON_EVS; i++) {
u8 hw_id = pmu[i].hw_cntr_idx;
if (hw_id == INVALID_PMU_HW_IDX)
if (hw_id == INVALID_PMU_HW_IDX ||
!ev_data->mon_evs[i])
continue;
perf_event_read_local(ev_data->mon_evs[i],
&ev_count, NULL, NULL);
@ -658,6 +660,7 @@ static void free_common_evs(struct memlat_cpu_grp *cpu_grp, cpumask_t *mask)
if (!cpus_data->common_evs[i])
continue;
perf_event_release_kernel(cpus_data->common_evs[i]);
cpus_data->common_evs[i] = NULL;
}
}
}
@ -674,6 +677,7 @@ static void free_mon_evs(struct memlat_mon *mon, cpumask_t *mask)
continue;
perf_event_release_kernel(ev_data->mon_evs[i]);
ev_data->mon_evs[i] = NULL;
}
}
}
@ -755,8 +759,12 @@ exit:
static int memlat_event_hotplug_coming_up(unsigned int cpu)
{
per_cpu(cpu_is_hp, cpu) = false;
return memlat_hp_restart_events(cpu, true);
int ret;
ret = memlat_hp_restart_events(cpu, true);
if (!ret)
per_cpu(cpu_is_hp, cpu) = false;
return ret;
}
static int memlat_event_hotplug_going_down(unsigned int cpu)