Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d439c969 authored by Greg Hackmann's avatar Greg Hackmann Committed by Venkata Narendra Kumar Gutta
Browse files

arm64: issue isb when trapping CNTVCT_EL0 access. 



Change-Id: I385717fec3acb7e19504915f82f60c35c6a8fca5
Signed-off-by: default avatarGreg Hackmann <ghackmann@google.com>
Git-commit: e16a20b1b9121c93a9c21b272a81672aad4e100b
Git-repo: https://android.googlesource.com/kernel/common/


Signed-off-by: default avatarVenkata Narendra Kumar Gutta <vnkgutta@codeaurora.org>
parent 657b1f68

arch/arm64/kernel/traps.c

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/mm_types.h>



#include <asm/atomic.h>

#include <asm/barrier.h>

#include <asm/bug.h>

#include <asm/cpufeature.h>

#include <asm/daifflags.h>
@@ -484,6 +485,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;



	isb();

	pt_regs_write_reg(regs, rt, arch_counter_get_cntvct());

	arm64_skip_faulting_instruction(regs, AARCH64_INSN_SIZE);

}