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

Commit 5d574072 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "BACKPORT: arm64: Add CNTFRQ_EL0 trap handler"

parents d81280ed 84609efe

arch/arm64/include/asm/esr.h

+3 −0
Original line number Diff line number Diff line
@@ -146,6 +146,9 @@ 
#define ESR_ELx_SYS64_ISS_SYS_CNTVCT	(ESR_ELx_SYS64_ISS_SYS_VAL(3, 3, 2, 14, 0) | \

					 ESR_ELx_SYS64_ISS_DIR_READ)



#define ESR_ELx_SYS64_ISS_SYS_CNTFRQ	(ESR_ELx_SYS64_ISS_SYS_VAL(3, 3, 0, 14, 0) | \

					 ESR_ELx_SYS64_ISS_DIR_READ)



#ifndef __ASSEMBLY__

#include <asm/types.h>

arch/arm64/kernel/traps.c

+12 −0
Original line number Diff line number Diff line
@@ -458,11 +458,23 @@ static void cntvct_read_handler(unsigned int esr, struct pt_regs *regs) 
	regs->pc += 4;

}



static void cntfrq_read_handler(unsigned int esr, struct pt_regs *regs)

{

	int rt = (esr & ESR_ELx_SYS64_ISS_RT_MASK) >> ESR_ELx_SYS64_ISS_RT_SHIFT;



	if (rt != 31)

		regs->regs[rt] = read_sysreg(cntfrq_el0);

	regs->pc += 4;

}



asmlinkage void __exception do_sysinstr(unsigned int esr, struct pt_regs *regs)

{

	if ((esr & ESR_ELx_SYS64_ISS_SYS_OP_MASK) == ESR_ELx_SYS64_ISS_SYS_CNTVCT) {

		cntvct_read_handler(esr, regs);

		return;

	} else if ((esr & ESR_ELx_SYS64_ISS_SYS_OP_MASK) == ESR_ELx_SYS64_ISS_SYS_CNTFRQ) {

		cntfrq_read_handler(esr, regs);

		return;

	}



	do_undefinstr(regs);