From patchwork Tue Sep 30 21:49:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 38215 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 43ABF2032C for ; Tue, 30 Sep 2014 22:14:19 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id n15sf6215206lbi.11 for ; Tue, 30 Sep 2014 15:14:18 -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=CLZhAS29pBOW2PRzPc/XDfpc1JWP8rOJjZCIIaTvRmQ=; b=eC8kyBgrctvyV5AT4cm+F7XJMcfxAZv+IxX7z5ii17o0B1QmgtnOWReXQsMLSci2vE QIBBssmcHEWed5u3EEb8Ur21ID1GG2OgnoCBSqbMk+9XsdhV3VZd0UXgstb6zE928x82 Ly3xCucbX3rJTnxiKk7l0IGHX6xa8owDqc8VX/tPhjGIbw8cYFduKgPzkQhhvOG14+Jt eu92jn30dGc+8kmVJKrREiJ0G+0k1zHQY5T2hfCzjJbvPaqmZ8oX/KVdwru8h4DYs0o5 MNNSl2KTb3qwZ9WY3HODbbPDdEhyf8ZSsGO4OfDYIPETsM+ub6vLKI8TyWe7lprGU1h2 z55A== X-Gm-Message-State: ALoCoQkr5ebAI4YWtIYpgOTnBPamE1BcKKGm3jwDgs3hupG3toI5S8uG4PkcG9cHZzBXYzLz67e8 X-Received: by 10.112.189.69 with SMTP id gg5mr829759lbc.14.1412115258019; Tue, 30 Sep 2014 15:14:18 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.10.1 with SMTP id e1ls101825lab.51.gmail; Tue, 30 Sep 2014 15:14:17 -0700 (PDT) X-Received: by 10.152.7.145 with SMTP id j17mr49940968laa.77.1412115257878; Tue, 30 Sep 2014 15:14:17 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com [209.85.217.169]) by mx.google.com with ESMTPS id x5si24524425lal.109.2014.09.30.15.14.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Sep 2014 15:14:17 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by mail-lb0-f169.google.com with SMTP id u10so7455782lbd.0 for ; Tue, 30 Sep 2014 15:14:17 -0700 (PDT) X-Received: by 10.152.204.231 with SMTP id lb7mr49936823lac.44.1412115257698; Tue, 30 Sep 2014 15:14:17 -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 of9csp431942lbb; Tue, 30 Sep 2014 15:14:17 -0700 (PDT) X-Received: by 10.224.80.10 with SMTP id r10mr44195314qak.24.1412115256636; Tue, 30 Sep 2014 15:14:16 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id d4si20457352qci.8.2014.09.30.15.14.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 30 Sep 2014 15:14:16 -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]:46870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5gU-0003P2-4c for patch@linaro.org; Tue, 30 Sep 2014 18:14:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5K4-0001NK-FZ for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:51:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZ5Jz-00047r-4w for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:51:04 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:62655) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5JX-0003yG-GT for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:59 -0400 Received: by mail-pa0-f47.google.com with SMTP id rd3so9758891pab.6 for ; Tue, 30 Sep 2014 14:50:28 -0700 (PDT) X-Received: by 10.66.139.106 with SMTP id qx10mr72880118pab.126.1412113828090; Tue, 30 Sep 2014 14:50:28 -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.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Sep 2014 14:50:27 -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:34 -0500 Message-Id: <1412113785-21525-23-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.47 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH v5 22/33] target-arm: add TCR_EL3 and make TTBCR 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.217.169 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 Adds TCR_EL3 system register and makes existing TTBCR banked. Adjust translation functions to use TCR/TTBCR instance depending on CPU state. 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 | 11 ++++++++++- target-arm/helper.c | 48 +++++++++++++++++++++++++++++++++++------------- target-arm/internals.h | 2 +- 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index c99158e..477c219 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -221,7 +221,16 @@ typedef struct CPUARMState { uint64_t ttbr1_el1; }; }; - uint64_t c2_control; /* MMU translation table base control. */ + union { /* MMU translation table base control. */ + struct { + uint64_t ttbcr_ns; + uint64_t ttbcr_s; + }; + struct { + uint64_t tcr_el1; + 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. */ uint32_t c2_data; /* MPU data cachable bits. */ diff --git a/target-arm/helper.c b/target-arm/helper.c index 2a6a129..bdb76e0 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1678,11 +1678,12 @@ static const ARMCPRegInfo vmsa_cp_reginfo[] = { .opc0 = 3, .crn = 2, .crm = 0, .opc1 = 0, .opc2 = 2, .access = PL1_RW, .writefn = vmsa_tcr_el1_write, .resetfn = vmsa_ttbcr_reset, .raw_writefn = raw_write, - .fieldoffset = offsetof(CPUARMState, cp15.c2_control) }, + .fieldoffset = offsetof(CPUARMState, cp15.tcr_el1) }, { .name = "TTBCR", .cp = 15, .crn = 2, .crm = 0, .opc1 = 0, .opc2 = 2, .access = PL1_RW, .type = ARM_CP_NO_MIGRATE, .writefn = vmsa_ttbcr_write, .resetfn = arm_cp_reset_ignore, .raw_writefn = vmsa_ttbcr_raw_write, - .fieldoffset = offsetoflow32(CPUARMState, cp15.c2_control) }, + .bank_fieldoffsets = { offsetoflow32(CPUARMState, cp15.ttbcr_s), + offsetoflow32(CPUARMState, cp15.ttbcr_ns) } }, /* 64-bit FAR; this entry also gives us the AArch32 DFAR */ { .name = "FAR_EL1", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .crn = 6, .crm = 0, .opc1 = 0, .opc2 = 0, @@ -2421,6 +2422,11 @@ static const ARMCPRegInfo v8_el3_cp_reginfo[] = { .opc0 = 3, .crn = 2, .crm = 0, .opc1 = 6, .opc2 = 0, .access = PL3_RW, .writefn = vmsa_ttbr_write, .resetvalue = 0, .fieldoffset = offsetof(CPUARMState, cp15.ttbr0_el3) }, + { .name = "TCR_EL3", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .crn = 2, .crm = 0, .opc1 = 6, .opc2 = 2, + .access = PL3_RW, .writefn = vmsa_tcr_el1_write, + .resetfn = vmsa_ttbcr_reset, .raw_writefn = raw_write, + .fieldoffset = offsetof(CPUARMState, cp15.tcr_el3) }, { .name = "ELR_EL3", .state = ARM_CP_STATE_AA64, .type = ARM_CP_NO_MIGRATE, .opc0 = 3, .opc1 = 6, .crn = 4, .crm = 0, .opc2 = 1, @@ -4515,13 +4521,13 @@ static bool get_level1_table_address(CPUARMState *env, uint32_t *table, * table registers. */ if (address & env->cp15.c2_mask) { - if ((env->cp15.c2_control & TTBCR_PD1)) { + if (A32_BANKED_CURRENT_REG_GET(env, ttbcr) & TTBCR_PD1) { /* Translation table walk disabled for TTBR1 */ return false; } *table = A32_BANKED_CURRENT_REG_GET(env, ttbr1) & 0xffffc000; } else { - if ((env->cp15.c2_control & TTBCR_PD0)) { + if (A32_BANKED_CURRENT_REG_GET(env, ttbcr) & TTBCR_PD0) { /* Translation table walk disabled for TTBR0 */ return false; } @@ -4781,13 +4787,29 @@ static int get_phys_addr_lpae(CPUARMState *env, target_ulong address, int32_t va_size = 32; int32_t tbi = 0; uint32_t cur_el = arm_current_el(env); + uint64_t tcr; - if (arm_el_is_aa64(env, 1)) { + if (arm_el_is_aa64(env, 3)) { + switch (cur_el) { + case 3: + tcr = env->cp15.tcr_el3; + break; + case 1: + case 0: + default: + tcr = env->cp15.tcr_el1; + } + + } else { + tcr = A32_BANKED_CURRENT_REG_GET(env, ttbcr); + } + + if (arm_el_is_aa64(env, 1) && (cur_el == 0 || cur_el == 1)) { va_size = 64; if (extract64(address, 55, 1)) - tbi = extract64(env->cp15.c2_control, 38, 1); + tbi = extract64(tcr, 38, 1); else - tbi = extract64(env->cp15.c2_control, 37, 1); + tbi = extract64(tcr, 37, 1); tbi *= 8; } @@ -4796,12 +4818,12 @@ static int get_phys_addr_lpae(CPUARMState *env, target_ulong address, * This is a Non-secure PL0/1 stage 1 translation, so controlled by * TTBCR/TTBR0/TTBR1 in accordance with ARM ARM DDI0406C table B-32: */ - uint32_t t0sz = extract32(env->cp15.c2_control, 0, 6); + uint32_t t0sz = extract32(tcr, 0, 6); if (arm_el_is_aa64(env, 1)) { t0sz = MIN(t0sz, 39); t0sz = MAX(t0sz, 16); } - uint32_t t1sz = extract32(env->cp15.c2_control, 16, 6); + uint32_t t1sz = extract32(tcr, 16, 6); if (arm_el_is_aa64(env, 1)) { t1sz = MIN(t1sz, 39); t1sz = MAX(t1sz, 16); @@ -4845,10 +4867,10 @@ static int get_phys_addr_lpae(CPUARMState *env, target_ulong address, } else { ttbr = A32_BANKED_CURRENT_REG_GET(env, ttbr0); } - epd = extract32(env->cp15.c2_control, 7, 1); + epd = extract32(tcr, 7, 1); tsz = t0sz; - tg = extract32(env->cp15.c2_control, 14, 2); + tg = extract32(tcr, 14, 2); if (tg == 1) { /* 64KB pages */ granule_sz = 13; } @@ -4857,10 +4879,10 @@ static int get_phys_addr_lpae(CPUARMState *env, target_ulong address, } } else { ttbr = A32_BANKED_CURRENT_REG_GET(env, ttbr1); - epd = extract32(env->cp15.c2_control, 23, 1); + epd = extract32(tcr, 23, 1); tsz = t1sz; - tg = extract32(env->cp15.c2_control, 30, 2); + tg = extract32(tcr, 30, 2); if (tg == 3) { /* 64KB pages */ granule_sz = 13; } diff --git a/target-arm/internals.h b/target-arm/internals.h index 43a2e7d..dba7766 100644 --- a/target-arm/internals.h +++ b/target-arm/internals.h @@ -155,7 +155,7 @@ static inline bool extended_addresses_enabled(CPUARMState *env) { return arm_el_is_aa64(env, 1) || ((arm_feature(env, ARM_FEATURE_LPAE) - && (env->cp15.c2_control & TTBCR_EAE))); + && (A32_BANKED_CURRENT_REG_GET(env, ttbcr) & TTBCR_EAE))); } /* Valid Syndrome Register EC field values */