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

Merge "qcom: PMRESR register read returns zero for un supported group events"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-28 11:12:23 -07:00 • committed by Gerrit - the friendly Code Review server
commit a471a0b077
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/soc/qcom/perf_event_kryo.c
View file

@ -118,12 +118,7 @@ static void kryo_write_pmresr(int reg, int l_h, u32 val)
static u32 kryo_read_pmresr(int reg, int l_h) static u32 kryo_read_pmresr(int reg, int l_h)
{ {
u32 val; u32 val = 0;
if (reg > KRYO_MAX_L1_REG) {
pr_err("Invalid read of RESR reg %d\n", reg);
return 0;
}
if (l_h == RESR_L) { if (l_h == RESR_L) {
switch (reg) { switch (reg) {
@ -136,6 +131,9 @@ static u32 kryo_read_pmresr(int reg, int l_h)
case 2: case 2:
asm volatile("mrs %0, " pmresr2l_el0 : "=r" (val)); asm volatile("mrs %0, " pmresr2l_el0 : "=r" (val));
break; break;
default:
WARN_ONCE(1, "Invalid read of RESR reg %d\n", reg);
break;
} }
} else { } else {
switch (reg) { switch (reg) {
@ -148,6 +146,9 @@ static u32 kryo_read_pmresr(int reg, int l_h)
case 2: case 2:
asm volatile("mrs %0," pmresr2h_el0 : "=r" (val)); asm volatile("mrs %0," pmresr2h_el0 : "=r" (val));
break; break;
default:
WARN_ONCE(1, "Invalid read of RESR reg %d\n", reg);
break;
} }
} }