From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aS1gh-0004WW-1Y for qemu-devel@nongnu.org; Sat, 06 Feb 2016 07:10:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aS1gd-00057v-OR for qemu-devel@nongnu.org; Sat, 06 Feb 2016 07:10:02 -0500 Date: Sat, 6 Feb 2016 13:04:03 +0100 From: "Edgar E. Iglesias" Message-ID: <20160206120403.GB3913@toto> References: <1454506721-11843-1-git-send-email-peter.maydell@linaro.org> <1454506721-11843-3-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1454506721-11843-3-git-send-email-peter.maydell@linaro.org> Subject: Re: [Qemu-devel] [PATCH 2/7] target-arm: Implement MDCR_EL3 and SDCR List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, patches@linaro.org On Wed, Feb 03, 2016 at 01:38:36PM +0000, Peter Maydell wrote: > Implement the MDCR_EL3 register (which is SDCR for AArch32). > For the moment we implement it as reads-as-written. > > Signed-off-by: Peter Maydell > --- > target-arm/cpu.h | 1 + > target-arm/helper.c | 24 ++++++++++++++++++++++++ > 2 files changed, 25 insertions(+) > > diff --git a/target-arm/cpu.h b/target-arm/cpu.h > index 52284e9..cf2df50 100644 > --- a/target-arm/cpu.h > +++ b/target-arm/cpu.h > @@ -382,6 +382,7 @@ typedef struct CPUARMState { > uint64_t mdscr_el1; > uint64_t oslsr_el1; /* OS Lock Status */ > uint64_t mdcr_el2; > + uint64_t mdcr_el3; Should we maybe arrayify these even if we waste space? Anyway: Reviewed-by: Edgar E. Iglesias > /* If the counter is enabled, this stores the last time the counter > * was reset. Otherwise it stores the counter value > */ > diff --git a/target-arm/helper.c b/target-arm/helper.c > index b631b83..8b96b80 100644 > --- a/target-arm/helper.c > +++ b/target-arm/helper.c > @@ -364,6 +364,23 @@ static CPAccessResult access_el3_aa32ns_aa64any(CPUARMState *env, > return CP_ACCESS_OK; > } > > +/* Some secure-only AArch32 registers trap to EL3 if used from > + * Secure EL1 (but are just ordinary UNDEF in other non-EL3 contexts). > + * We assume that the .access field is set to PL1_RW. > + */ > +static CPAccessResult access_trap_aa32s_el1(CPUARMState *env, > + const ARMCPRegInfo *ri) > +{ > + if (arm_current_el(env) == 3) { > + return CP_ACCESS_OK; > + } > + if (arm_is_secure_below_el3(env)) { > + return CP_ACCESS_TRAP_EL3; > + } > + /* This will be EL1 NS and EL2 NS, which just UNDEF */ > + return CP_ACCESS_TRAP_UNCATEGORIZED; > +} > + > static void dacr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) > { > ARMCPU *cpu = arm_env_get_cpu(env); > @@ -3532,6 +3549,13 @@ static const ARMCPRegInfo el3_cp_reginfo[] = { > .cp = 15, .opc1 = 0, .crn = 1, .crm = 1, .opc2 = 0, > .access = PL3_RW, .fieldoffset = offsetoflow32(CPUARMState, cp15.scr_el3), > .writefn = scr_write }, > + { .name = "MDCR_EL3", .state = ARM_CP_STATE_AA64, > + .opc0 = 3, .opc1 = 6, .crn = 1, .crm = 3, .opc2 = 1, > + .access = PL3_RW, .fieldoffset = offsetof(CPUARMState, cp15.mdcr_el3) }, > + { .name = "SDCR", .type = ARM_CP_ALIAS, > + .cp = 15, .opc1 = 0, .crn = 1, .crm = 3, .opc2 = 1, > + .access = PL1_RW, .accessfn = access_trap_aa32s_el1, > + .fieldoffset = offsetoflow32(CPUARMState, cp15.mdcr_el3) }, > { .name = "SDER32_EL3", .state = ARM_CP_STATE_AA64, > .opc0 = 3, .opc1 = 6, .crn = 1, .crm = 1, .opc2 = 1, > .access = PL3_RW, .resetvalue = 0, > -- > 1.9.1 >