From patchwork Mon Nov 17 16:47:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 40954 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3829524035 for ; Mon, 17 Nov 2014 16:54:42 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id t10sf2103382eei.8 for ; Mon, 17 Nov 2014 08:54:41 -0800 (PST) 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=hMBnyanLhsrhZgwiBPZVt79UM8J8kvNIZ8HubPNfaA0=; b=X6SeJDa2RvThpIHq3dgIdhtoUy3AO2XDSUTDNwSgxcLLWPZNGW8UY63waPfYog+eBA H4ZYapqeIIFndyiRKe2jgagcxbyQ+axqPPRM8CX0H+8JwMs1ukCyW4DKzliEIpj0zdGm nPdhRPbsPjBWsW1Qw6NzHe3A3zrE5IOSq1kQbZTmNHbKpeycy78TJj7Dz0mpEI0cFx/b hC9VUxJ6JQn+q4ifjyeCBT78KEwNraAi+GY3leoAO+ekCL8VqBHLsCbfIXFSvquwvn8k iLlZQD7B74v4s+NiuBp3GwSHV2T+yZI1liN6/TfyxnS8IzQbctdaSpfotb8IWJR61INp wJWg== X-Gm-Message-State: ALoCoQlFqCHUbTbJE+UBLhOKq1NhJvSVVUgF/AsD/EEiG4Y2HmL7YJD4E6umMl4l8sBnPNn6b0Ge X-Received: by 10.152.36.135 with SMTP id q7mr636648laj.8.1416243281464; Mon, 17 Nov 2014 08:54:41 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.170 with SMTP id p10ls91569lal.35.gmail; Mon, 17 Nov 2014 08:54:41 -0800 (PST) X-Received: by 10.112.52.37 with SMTP id q5mr28832565lbo.32.1416243281104; Mon, 17 Nov 2014 08:54:41 -0800 (PST) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id yf4si52457140lbb.124.2014.11.17.08.54.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 08:54:41 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by mail-la0-f52.google.com with SMTP id q1so757227lam.25 for ; Mon, 17 Nov 2014 08:54:41 -0800 (PST) X-Received: by 10.152.42.226 with SMTP id r2mr28948359lal.29.1416243280967; Mon, 17 Nov 2014 08:54:40 -0800 (PST) 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.184.201 with SMTP id ew9csp1187889lbc; Mon, 17 Nov 2014 08:54:40 -0800 (PST) X-Received: by 10.140.17.67 with SMTP id 61mr35400229qgc.59.1416243279504; Mon, 17 Nov 2014 08:54:39 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c18si1162106qaq.43.2014.11.17.08.54.38 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 17 Nov 2014 08:54:39 -0800 (PST) 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]:48879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPZV-0003YM-Tt for patch@linaro.org; Mon, 17 Nov 2014 11:54:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPTc-0001da-V1 for qemu-devel@nongnu.org; Mon, 17 Nov 2014 11:48:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqPTY-0007CZ-6L for qemu-devel@nongnu.org; Mon, 17 Nov 2014 11:48:32 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:33757) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPTY-0007CP-1g for qemu-devel@nongnu.org; Mon, 17 Nov 2014 11:48:28 -0500 Received: by mail-pa0-f47.google.com with SMTP id kq14so3657764pab.20 for ; Mon, 17 Nov 2014 08:48:27 -0800 (PST) X-Received: by 10.68.106.194 with SMTP id gw2mr30363102pbb.109.1416242907467; Mon, 17 Nov 2014 08:48:27 -0800 (PST) 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 r2sm18499056pdi.60.2014.11.17.08.48.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 08:48:26 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch, peter.maydell@linaro.org Date: Mon, 17 Nov 2014 10:47:44 -0600 Message-Id: <1416242878-876-13-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1416242878-876-1-git-send-email-greg.bellows@linaro.org> References: <1416242878-876-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@linaro.org Subject: [Qemu-devel] [PATCH v11 12/26] target-arm: add MVBAR support 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.52 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 Use MVBAR register as exception vector base address for exceptions taken to CPU monitor mode. Signed-off-by: Sergey Fedorov Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows Reviewed-by: Peter Maydell --- v8 -> v9 - Fixed declaration order of the MVBARR register components v7 -> v8 - Changed the mvbar cp15 storage from uint64_t to uint32_t --- target-arm/cpu.h | 1 + target-arm/helper.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 12bd6ec..cdf2dd7 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -211,6 +211,7 @@ typedef struct CPUARMState { uint32_t c9_pminten; /* perf monitor interrupt enables */ uint64_t mair_el1; uint64_t vbar_el[4]; /* vector base address register */ + uint32_t mvbar; /* (monitor) vector base address register */ uint32_t c13_fcse; /* FCSE PID. */ uint64_t contextidr_el1; /* Context ID. */ uint64_t tpidr_el0; /* User RW Thread register. */ diff --git a/target-arm/helper.c b/target-arm/helper.c index 284f255..a2643fe 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2356,6 +2356,9 @@ static const ARMCPRegInfo el3_cp_reginfo[] = { { .name = "NSACR", .cp = 15, .opc1 = 0, .crn = 1, .crm = 1, .opc2 = 2, .access = PL3_W | PL1_R, .resetvalue = 0, .fieldoffset = offsetof(CPUARMState, cp15.nsacr) }, + { .name = "MVBAR", .cp = 15, .opc1 = 0, .crn = 12, .crm = 0, .opc2 = 1, + .access = PL3_RW, .writefn = vbar_write, .resetvalue = 0, + .fieldoffset = offsetof(CPUARMState, cp15.mvbar) }, REGINFO_SENTINEL }; @@ -4272,16 +4275,16 @@ void arm_cpu_do_interrupt(CPUState *cs) cpu_abort(cs, "Unhandled exception 0x%x\n", cs->exception_index); return; /* Never happens. Keep compiler happy. */ } - /* High vectors. */ - if (env->cp15.c1_sys & SCTLR_V) { - /* when enabled, base address cannot be remapped. */ + + if (new_mode == ARM_CPU_MODE_MON) { + addr += env->cp15.mvbar; + } else if (env->cp15.c1_sys & SCTLR_V) { + /* High vectors. When enabled, base address cannot be remapped. */ addr += 0xffff0000; } else { /* ARM v7 architectures provide a vector base address register to remap * the interrupt vector table. - * This register is only followed in non-monitor mode, and has a secure - * and un-secure copy. Since the cpu is always in a un-secure operation - * and is never in monitor mode this feature is always active. + * This register is only followed in non-monitor mode, and is banked. * Note: only bits 31:5 are valid. */ addr += env->cp15.vbar_el[1];