From patchwork Fri Oct 10 16:03:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 38619 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8024D205D8 for ; Fri, 10 Oct 2014 16:23:06 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf2334141lbv.8 for ; Fri, 10 Oct 2014 09:23:01 -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: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=1XMhSb3Pg1dRAO7MkDYnTkS05l3j5rH/A1ndnPF4sL0=; b=G3mlzDOdTSYr9tM+2pgY6A0NK2982PVtp1NUDL7EPxTEWcsTNlvdP2A+iojLs8SN67 jge0ga4TFrh2s0QTeskI8MPIsObX3rzzdrnZgFiSPCHpOVtkpMA485kcK9HS0GdyT/kB J/dDXBPQGlVs+TnEIFWXstPGImSmANAg+z3XyeZTHROYWejdjrpDyEBhQeD9g36ZzhWM tZmY2RDmCI29b4gX/SsmBW2nGIs2TthTUZPsS0dDe7k9pnb9gyJQgrhS/Olof2K6Kz2b XWVYDrXvzYpqZyV6tjC2QA3IpjeP0N8YiwdTbSoiFIkNIrnQ2Bk2pKIcGf4swFg5vtQk vUrg== X-Gm-Message-State: ALoCoQk68Krz2xXk249qtTJcFLNhE5vDuT1btjmNt+2UJB/n2gIYyBeFypTMBSW1NOLPNHm6a9Wd X-Received: by 10.112.168.225 with SMTP id zz1mr1146091lbb.8.1412958179857; Fri, 10 Oct 2014 09:22:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.132 with SMTP id ay4ls285468lab.46.gmail; Fri, 10 Oct 2014 09:22:59 -0700 (PDT) X-Received: by 10.112.142.104 with SMTP id rv8mr5723739lbb.59.1412958179715; Fri, 10 Oct 2014 09:22:59 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com [209.85.217.173]) by mx.google.com with ESMTPS id ab7si10051042lbc.57.2014.10.10.09.22.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:22:57 -0700 (PDT) Received-SPF: temperror (google.com: error in processing during lookup of patch+caf_=patchwork-forward=linaro.org@linaro.org: DNS timeout) client-ip=209.85.217.173; Received: by mail-lb0-f173.google.com with SMTP id 10so3405524lbg.32 for ; Fri, 10 Oct 2014 09:22:57 -0700 (PDT) X-Received: by 10.152.7.145 with SMTP id j17mr5877633laa.67.1412958177553; Fri, 10 Oct 2014 09:22:57 -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.84.229 with SMTP id c5csp459273lbz; Fri, 10 Oct 2014 09:22:56 -0700 (PDT) X-Received: by 10.224.44.2 with SMTP id y2mr10602103qae.30.1412958176234; Fri, 10 Oct 2014 09:22:56 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g88si11668372qgg.113.2014.10.10.09.22.55 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:22:56 -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]:49604 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccxy-000403-R2 for patch@linaro.org; Fri, 10 Oct 2014 12:22:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccg0-0007D1-Kk for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xccft-00086A-Tb for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:20 -0400 Received: from mail-oi0-f45.google.com ([209.85.218.45]:55964) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccft-00085y-QC for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:13 -0400 Received: by mail-oi0-f45.google.com with SMTP id i138so7206258oig.32 for ; Fri, 10 Oct 2014 09:04:13 -0700 (PDT) X-Received: by 10.202.62.214 with SMTP id l205mr2869727oia.74.1412957053403; Fri, 10 Oct 2014 09:04:13 -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 d6sm5382455obt.12.2014.10.10.09.04.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:04:12 -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: Fri, 10 Oct 2014 11:03:30 -0500 Message-Id: <1412957023-11105-20-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1412957023-11105-1-git-send-email-greg.bellows@linaro.org> References: <1412957023-11105-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.218.45 Subject: [Qemu-devel] [PATCH v6 19/32] 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=temperror (google.com: error in processing during lookup of patch+caf_=patchwork-forward=linaro.org@linaro.org: DNS timeout) 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 --- 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 64208bc..7f314ba 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 */ + uint64_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 d08e4b7..12bf7e4 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2416,6 +2416,9 @@ static const ARMCPRegInfo v7_el3_cp_reginfo[] = { .access = PL3_RW | PL1_R, .resetvalue = 0, .writefn = nsacr_write, .readfn = nsacr_read, .fieldoffset = offsetof(CPUARMState, cp15.c1_nsacr) }, + { .name = "MVBAR", .cp = 15, .crn = 12, .crm = 0, .opc1 = 0, .opc2 = 1, + .access = PL3_RW, .writefn = vbar_write, .resetvalue = 0, + .fieldoffset = offsetof(CPUARMState, cp15.mvbar) }, REGINFO_SENTINEL }; @@ -4363,16 +4366,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];