From patchwork Tue Sep 30 21:49:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 38210 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 878632032C for ; Tue, 30 Sep 2014 22:09:04 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id b6sf1062646lbj.9 for ; Tue, 30 Sep 2014 15:09:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=ri5NyoA3YyCagXbNGIw5jcUnJJLV74OQsL9zUKQ/4rs=; b=bMaXXr0FarOdiqzhBLf0O1oarUYfy4uOFeUncrsmI3pIuF71tFvJmhMQIlP5vxAJHk l7mo389L9Vmuwr2TkJZDBTDIRBL2ltRKbGYf/WxR2/sfuzdXjfB49UsTYM3xaiJxltDs AkREA6QyLpYe9+qe2oR6Nywc05d1xVX5cli+7WKQsRXKEfbFX69HgF3CzMoM8meXwsEU FOtv1lX7tHuX1ao9zbQfDHB/GVps9FoxykAeC7S80aik9H6ZeySxunRUtyGAEW/BAjzK EcwXp/OVdw7UA5mMame5GbbOcNy2j97W5E7CE5L7+T0VBmS9kFRfs4FjfuqxMbMqaGvE IGfg== X-Gm-Message-State: ALoCoQk7y2wIgIylgkcgr1o3LMcOvlocsF1wJ+u2XUP9tcbzAessW6gPCjO/ufELYoZzYfaZHVsd X-Received: by 10.180.221.236 with SMTP id qh12mr1383350wic.4.1412114943333; Tue, 30 Sep 2014 15:09:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.201 with SMTP id u9ls93581lau.107.gmail; Tue, 30 Sep 2014 15:09:03 -0700 (PDT) X-Received: by 10.112.34.239 with SMTP id c15mr47029096lbj.64.1412114943178; Tue, 30 Sep 2014 15:09:03 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com [209.85.215.54]) by mx.google.com with ESMTPS id ej8si6141832lad.66.2014.09.30.15.09.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Sep 2014 15:09:02 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id gm9so3305108lab.41 for ; Tue, 30 Sep 2014 15:09:02 -0700 (PDT) X-Received: by 10.152.45.1 with SMTP id i1mr568488lam.56.1412114942858; Tue, 30 Sep 2014 15:09:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp431332lbb; Tue, 30 Sep 2014 15:09:02 -0700 (PDT) X-Received: by 10.140.19.142 with SMTP id 14mr23400863qgh.28.1412114941645; Tue, 30 Sep 2014 15:09:01 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id d66si8983205qga.63.2014.09.30.15.09.01 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 30 Sep 2014 15:09:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Received: from localhost ([::1]:46711 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5bQ-0004s0-Qp for patch@linaro.org; Tue, 30 Sep 2014 18:09:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5Jh-0000yP-Th for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZ5Jc-00040W-80 for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:41 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:61014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5JX-0003zG-Fw for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:36 -0400 Received: by mail-pa0-f48.google.com with SMTP id eu11so2532568pac.7 for ; Tue, 30 Sep 2014 14:50:29 -0700 (PDT) X-Received: by 10.70.123.42 with SMTP id lx10mr65405818pdb.90.1412113829560; Tue, 30 Sep 2014 14:50:29 -0700 (PDT) Received: from gbellows-linaro.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com. [67.52.129.61]) by mx.google.com with ESMTPSA id qy1sm16027662pbc.27.2014.09.30.14.50.28 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Sep 2014 14:50:29 -0700 (PDT) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch Date: Tue, 30 Sep 2014 16:49:35 -0500 Message-Id: <1412113785-21525-24-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1412113785-21525-1-git-send-email-greg.bellows@linaro.org> References: <1412113785-21525-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.48 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH v5 23/33] target-arm: make c2_mask and c2_base_mask banked X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: greg.bellows@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Fabian Aggeler Since TTBCR is banked we will bank c2_mask and c2_base_mask too. This avoids recalculating them on switches from secure to non-secure world. Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows ---------- v4 -> v5 - Changed c2_mask updates to use the TTBCR cpreg bank flag for selcting the secure bank instead of the A32_BANKED_CURRENT macro. This more accurately chooses the correct bank matching that of the TTBCR being accessed. --- target-arm/cpu.h | 10 ++++++++-- target-arm/helper.c | 24 ++++++++++++++++++------ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 477c219..54bce55 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -231,8 +231,14 @@ typedef struct CPUARMState { uint64_t tcr_el3; }; }; - uint32_t c2_mask; /* MMU translation table base selection mask. */ - uint32_t c2_base_mask; /* MMU translation table base 0 mask. */ + struct { /* MMU translation table base selection mask. */ + uint32_t c2_mask_ns; + uint32_t c2_mask_s; + }; + struct { /* MMU translation table base 0 mask. */ + uint32_t c2_base_mask_ns; + uint32_t c2_base_mask_s; + }; uint32_t c2_data; /* MPU data cachable bits. */ uint32_t c2_insn; /* MPU instruction cachable bits. */ uint32_t c3; /* MMU domain access control register diff --git a/target-arm/helper.c b/target-arm/helper.c index bdb76e0..a77ab95 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1597,8 +1597,14 @@ static void vmsa_ttbcr_raw_write(CPUARMState *env, const ARMCPRegInfo *ri, * and the c2_mask and c2_base_mask values are meaningless. */ raw_write(env, ri, value); - env->cp15.c2_mask = ~(((uint32_t)0xffffffffu) >> maskshift); - env->cp15.c2_base_mask = ~((uint32_t)0x3fffu >> maskshift); + + /* Update the masks corresponding to the the TTBCR bank being written */ + A32_BANKED_REG_SET(env, c2_mask, + ((ri->type & ARM_CP_BANK_S) == ARM_CP_BANK_S), + ~(((uint32_t)0xffffffffu) >> maskshift)); + A32_BANKED_REG_SET(env, c2_base_mask, + ((ri->type & ARM_CP_BANK_S) == ARM_CP_BANK_S), + ~((uint32_t)0x3fffu >> maskshift)); } static void vmsa_ttbcr_write(CPUARMState *env, const ARMCPRegInfo *ri, @@ -1617,9 +1623,15 @@ static void vmsa_ttbcr_write(CPUARMState *env, const ARMCPRegInfo *ri, static void vmsa_ttbcr_reset(CPUARMState *env, const ARMCPRegInfo *ri) { - env->cp15.c2_base_mask = 0xffffc000u; + /* Rest both the TTBCR as well as the masks corresponding to the bank of + * the TTBCR being reset. + */ + A32_BANKED_REG_SET(env, c2_base_mask, + ((ri->type & ARM_CP_BANK_S) == ARM_CP_BANK_S), + 0xffffc000u); + A32_BANKED_REG_SET(env, c2_mask, + ((ri->type & ARM_CP_BANK_S) == ARM_CP_BANK_S), 0); raw_write(env, ri, 0); - env->cp15.c2_mask = 0; } static void vmsa_tcr_el1_write(CPUARMState *env, const ARMCPRegInfo *ri, @@ -4520,7 +4532,7 @@ static bool get_level1_table_address(CPUARMState *env, uint32_t *table, * Aarch32 there is a secure and non-secure instance of the translation * table registers. */ - if (address & env->cp15.c2_mask) { + if (address & A32_BANKED_CURRENT_REG_GET(env, c2_mask)) { if (A32_BANKED_CURRENT_REG_GET(env, ttbcr) & TTBCR_PD1) { /* Translation table walk disabled for TTBR1 */ return false; @@ -4532,7 +4544,7 @@ static bool get_level1_table_address(CPUARMState *env, uint32_t *table, return false; } *table = A32_BANKED_CURRENT_REG_GET(env, ttbr0) & - env->cp15.c2_base_mask; + A32_BANKED_CURRENT_REG_GET(env, c2_base_mask); } *table |= (address >> 18) & 0x3ffc; return true;