From patchwork Mon Jun 30 23:09:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 32829 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5A279203C0 for ; Tue, 1 Jul 2014 00:39:05 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rd18sf56999272iec.6 for ; Mon, 30 Jun 2014 17:39:04 -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=cdB/xSNzx4rMQnbwSPQaa2waLLm9HAQ9tt1OAmHqylI=; b=E5xjTz0nYPe9iw8aLB1hQCnThEv1cYZqR9JMxiywZFI9z8mCmW5PsqF623Hdi4837W 1t9vcy2iogIbS4sLJ19LCjXceq0RhNkiMonnBs0wG5ld4hZk7y4xbR2i++5unJQP2ZYX UQqG/1+bdYEc+f4fWREU2k+7nUXbZar/w8ga+BpQ+z1f/VLHIG6w9rQ6qMyuDvErK79K AGrapaSKkwnBpdURBA05MjeQBfOpwvcOqSAFYPp9TNBYr7Q8JxPtbJCJ+DPWmnMMk766 DnNT0aWCbdGWGuWZtB73Cbtx+2Bo7RLph50OaktFbCVZQKLhPmCFe6eOqoIvsdhzUlla 6cag== X-Gm-Message-State: ALoCoQnZq+vW7MMrm9rWD+GTSYCxRgM2S4s5X6rkJ1iG0ZL2GMX8WaHYg9XvgBDvdRmWDfzDdlQf X-Received: by 10.182.68.16 with SMTP id r16mr22942291obt.26.1404175144908; Mon, 30 Jun 2014 17:39:04 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.205 with SMTP id u71ls846397qge.52.gmail; Mon, 30 Jun 2014 17:39:04 -0700 (PDT) X-Received: by 10.221.49.200 with SMTP id vb8mr27640440vcb.17.1404175144775; Mon, 30 Jun 2014 17:39:04 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id h18si10085724vdj.68.2014.06.30.17.39.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 17:39:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id ik5so8223746vcb.21 for ; Mon, 30 Jun 2014 17:39:04 -0700 (PDT) X-Received: by 10.58.210.168 with SMTP id mv8mr38180069vec.12.1404175144667; Mon, 30 Jun 2014 17:39:04 -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.221.37.5 with SMTP id tc5csp178723vcb; Mon, 30 Jun 2014 17:39:04 -0700 (PDT) X-Received: by 10.229.56.66 with SMTP id x2mr26923028qcg.22.1404175144270; Mon, 30 Jun 2014 17:39:04 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y46si27445571qgy.90.2014.06.30.17.39.04 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 30 Jun 2014 17:39:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:37143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1ktG-0008Ip-OX for patch@linaro.org; Mon, 30 Jun 2014 19:21:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kjI-0006Tw-CU for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:11:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1kjD-0003ej-4k for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:11:20 -0400 Received: from mail-oa0-f49.google.com ([209.85.219.49]:37916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kjC-0003eN-VR for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:11:15 -0400 Received: by mail-oa0-f49.google.com with SMTP id i7so9471545oag.8 for ; Mon, 30 Jun 2014 16:11:14 -0700 (PDT) X-Received: by 10.182.60.65 with SMTP id f1mr6417721obr.78.1404169874698; Mon, 30 Jun 2014 16:11:14 -0700 (PDT) Received: from gbellows-linaro.bellowshome.net (99-179-1-128.lightspeed.austtx.sbcglobal.net. [99.179.1.128]) by mx.google.com with ESMTPSA id cu7sm76370192oec.12.2014.06.30.16.11.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 16:11:13 -0700 (PDT) From: greg.bellows@linaro.org To: qemu-devel@nongnu.org Date: Mon, 30 Jun 2014 18:09:24 -0500 Message-Id: <1404169773-20264-25-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1404169773-20264-1-git-send-email-greg.bellows@linaro.org> References: <1404169773-20264-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.219.49 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, Fabian Aggeler , Greg Bellows , serge.fdrv@gmail.com, edgar.iglesias@gmail.com, christoffer.dall@linaro.org Subject: [Qemu-devel] [PATCH v4 24/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.220.176 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 --- target-arm/cpu.h | 11 ++++++++++- target-arm/helper.c | 50 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index a80b966..35291a6 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -222,7 +222,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 1eb819d..8326d1f 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -312,7 +312,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))); } static void dacr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) @@ -1521,11 +1521,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, @@ -2289,6 +2290,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, @@ -4013,13 +4019,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; } @@ -4279,13 +4285,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_pl(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; } @@ -4294,12 +4316,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); @@ -4343,10 +4365,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; } @@ -4355,10 +4377,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; }