From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eieSt-00063O-HN for qemu-devel@nongnu.org; Mon, 05 Feb 2018 05:57:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eieSs-0007Cp-Mj for qemu-devel@nongnu.org; Mon, 05 Feb 2018 05:57:35 -0500 From: Peter Maydell Date: Mon, 5 Feb 2018 10:57:19 +0000 Message-Id: <20180205105720.14620-8-peter.maydell@linaro.org> In-Reply-To: <20180205105720.14620-1-peter.maydell@linaro.org> References: <20180205105720.14620-1-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 7/8] target/arm: Implement writing to CONTROL_NS for v8M List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org In commit 50f11062d4c896 we added support for MSR/MRS access to the NS banked special registers, but we forgot to implement the support for writing to CONTROL_NS. Correct the omission. Signed-off-by: Peter Maydell --- target/arm/helper.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/target/arm/helper.c b/target/arm/helper.c index 3332565101..abb4d94a7f 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10388,6 +10388,16 @@ void HELPER(v7m_msr)(CPUARMState *env, uint32_t maskreg, uint32_t val) } env->v7m.faultmask[M_REG_NS] = val & 1; return; + case 0x94: /* CONTROL_NS */ + if (!env->v7m.secure) { + return; + } + write_v7m_control_spsel_for_secstate(env, + val & R_V7M_CONTROL_SPSEL_MASK, + M_REG_NS); + env->v7m.control[M_REG_NS] &= ~R_V7M_CONTROL_NPRIV_MASK; + env->v7m.control[M_REG_NS] |= val & R_V7M_CONTROL_NPRIV_MASK; + return; case 0x98: /* SP_NS */ { /* This gives the non-secure SP selected based on whether we're -- 2.16.1