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

Merge "arm64: issue isb when trapping CNTVCT_EL0 access"

Browse source
This commit is contained in:
Linux Build Service Account 2018-01-12 15:34:03 -08:00 • committed by Gerrit - the friendly Code Review server
commit 2f26ea48fb
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm64/kernel/traps.c
View file

@ -33,6 +33,7 @@
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/barrier.h>
#include <asm/bug.h> #include <asm/bug.h>
#include <asm/debug-monitors.h> #include <asm/debug-monitors.h>
#include <asm/esr.h> #include <asm/esr.h>
@ -453,6 +454,7 @@ static void cntvct_read_handler(unsigned int esr, struct pt_regs *regs)
{ {
int rt = (esr & ESR_ELx_SYS64_ISS_RT_MASK) >> ESR_ELx_SYS64_ISS_RT_SHIFT; int rt = (esr & ESR_ELx_SYS64_ISS_RT_MASK) >> ESR_ELx_SYS64_ISS_RT_SHIFT;
isb();
if (rt != 31) if (rt != 31)
regs->regs[rt] = arch_counter_get_cntvct(); regs->regs[rt] = arch_counter_get_cntvct();
regs->pc += 4; regs->pc += 4;