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

Commit 59ce4ce1 authored by Greg Hackmann's avatar Greg Hackmann Committed by Kyle Yan
Browse files

arm64: issue isb when trapping CNTVCT_EL0 access. 



Change-Id: I385717fec3acb7e19504915f82f60c35c6a8fca5
Signed-off-by: default avatarGreg Hackmann <ghackmann@google.com>
Signed-off-by: default avatarKyle Yan <kyan@codeaurora.org>
parent e9632ce8

arch/arm64/kernel/traps.c

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



#include <asm/atomic.h>

#include <asm/barrier.h>

#include <asm/bug.h>

#include <asm/debug-monitors.h>

#include <asm/esr.h>
@@ -544,6 +545,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();

	if (rt != 31)

		regs->regs[rt] = arch_counter_get_cntvct();

	regs->pc += 4;