From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 08/19] xen: arm: implement handling of ACTLR_EL1 trap Date: Tue, 31 Mar 2015 11:07:31 +0100 Message-ID: <1427796462-24376-8-git-send-email-ian.campbell@citrix.com> References: <1427796446.2115.34.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1427796446.2115.34.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org While annotating ACTLR I noticed that we don't appear to handle the 64-bit version of this trap. Do so and annotate everything. Signed-off-by: Ian Campbell --- xen/arch/arm/traps.c | 20 ++++++++++++++++++++ xen/include/asm-arm/sysregs.h | 1 + 2 files changed, 21 insertions(+) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 70e1b4d..ca43f79 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1647,6 +1647,13 @@ static void do_cp15_32(struct cpu_user_regs *regs, if ( !vtimer_emulate(regs, hsr) ) return inject_undef_exception(regs, hsr); break; + + /* + * HSR_EL2.TASC / HSR.TAC + * + * ARMv7 (DDI 0406C.b): B1.14.6 + * ARMv8 (DDI 0487A.d): G6.2.1 + */ case HSR_CPREG32(ACTLR): if ( psr_mode_is_user(regs) ) return inject_undef_exception(regs, hsr); @@ -1849,9 +1856,22 @@ static void do_sysreg(struct cpu_user_regs *regs, const union hsr hsr) { register_t *x = select_user_reg(regs, hsr.sysreg.reg); + struct vcpu *v = current; switch ( hsr.bits & HSR_SYSREG_REGS_MASK ) { + /* + * HSR_EL2.TASC + * + * ARMv8 (DDI 0487A.d): D7.2.1 + */ + case HSR_SYSREG_ACTLR_EL1: + if ( psr_mode_is_user(regs) ) + return inject_undef_exception(regs, hsr); + if ( hsr.sysreg.read ) + *x = v->arch.actlr; + break; + /* RAZ/WI registers: */ /* - Debug */ case HSR_SYSREG_MDSCR_EL1: diff --git a/xen/include/asm-arm/sysregs.h b/xen/include/asm-arm/sysregs.h index 2284fd7..d75e154 100644 --- a/xen/include/asm-arm/sysregs.h +++ b/xen/include/asm-arm/sysregs.h @@ -72,6 +72,7 @@ case HSR_SYSREG_##REG##n_EL1(15) #define HSR_SYSREG_SCTLR_EL1 HSR_SYSREG(3,0,c1, c0,0) +#define HSR_SYSREG_ACTLR_EL1 HSR_SYSREG(3,0,c1, c0,1) #define HSR_SYSREG_TTBR0_EL1 HSR_SYSREG(3,0,c2, c0,0) #define HSR_SYSREG_TTBR1_EL1 HSR_SYSREG(3,0,c2, c0,1) #define HSR_SYSREG_TCR_EL1 HSR_SYSREG(3,0,c2, c0,2) -- 1.7.10.4