From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkFOs-0007DC-Im for qemu-devel@nongnu.org; Tue, 13 May 2014 12:18:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WkFOi-0005Wf-0s for qemu-devel@nongnu.org; Tue, 13 May 2014 12:17:54 -0400 Received: from edge10.ethz.ch ([82.130.75.186]:24924) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkFOh-0005Vy-Qy for qemu-devel@nongnu.org; Tue, 13 May 2014 12:17:43 -0400 From: Fabian Aggeler Date: Tue, 13 May 2014 18:15:49 +0200 Message-ID: <1399997768-32014-5-git-send-email-aggelerf@ethz.ch> In-Reply-To: <1399997768-32014-1-git-send-email-aggelerf@ethz.ch> References: <1399997768-32014-1-git-send-email-aggelerf@ethz.ch> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v2 04/23] target-arm: preserve RAO/WI bits of ARMv7 SCTLR List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: edgar.iglesias@gmail.com, Sergey Fedorov , Svetlana Fedoseeva , Fabian Aggeler , peter.maydell@linaro.org From: Svetlana Fedoseeva Signed-off-by: Svetlana Fedoseeva Signed-off-by: Sergey Fedorov Signed-off-by: Fabian Aggeler --- target-arm/helper.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index 9c3269f..2b57ad9 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2083,6 +2083,11 @@ static void sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri, { ARMCPU *cpu = arm_env_get_cpu(env); + if (arm_feature(env, ARM_FEATURE_V7)) { + value |= SCTLR_XP | SCTLR_U | SCTLR_nTWE | SCTLR_nTWI | SCTLR_L + | SCTLR_CP15BEN | SCTLR_P; /* These bits are RAO/WI */ + } + env->cp15.c1_sys = value; /* ??? Lots of these bits are not implemented. */ /* This may enable/disable the MMU, so do a TLB flush. */ -- 1.8.3.2