From patchwork Tue Sep 30 21:49: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: 38207 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 703A62032C for ; Tue, 30 Sep 2014 22:06:53 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id gq15sf59028lab.11 for ; Tue, 30 Sep 2014 15:06:52 -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=HkW2fvZMlu9NcM5N392IhfQ5MZP+PXJ5hX2yfgwDdhg=; b=fFeB5UFJeppa6kv+sqYl/IsT9dmaHt0yVIehpnKho8higSkFqbUxpISOxH6NUhHnSN eST/MgUrYOrOlAHb5GLQwCsfp/FvlM66heTWAfkGsGlGFMRD+zq+LRHnsbuRljb2YNeD LEFit6v9Fhi9MZCQ5GL83nfDyiiLdptMNLQySicULGUJ3sTYteBaUBczaR9KrzvGudXj v3DvaFGL/4q7qc5vqDvn8CYs32vNg78JqlPAIC0sjgVCPlmgwXTBfjI4lEIV7gASbNJO s5EqJ7w6NiaYk259wOAAuwU5VLW7WXGEn11R2W2e9unecJLsspvsfkN9JsM+v1bGJogE itTg== X-Gm-Message-State: ALoCoQnHN1baByZAslFj+urAMZDwm5jj2V5l9K7tZpBO49xTtT2YoE02hGELiZnJEuuhMb+dzy+i X-Received: by 10.152.42.229 with SMTP id r5mr5242lal.8.1412114812234; Tue, 30 Sep 2014 15:06:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.66 with SMTP id o2ls99858laj.8.gmail; Tue, 30 Sep 2014 15:06:52 -0700 (PDT) X-Received: by 10.152.2.41 with SMTP id 9mr50362353lar.79.1412114812130; Tue, 30 Sep 2014 15:06:52 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com [209.85.215.45]) by mx.google.com with ESMTPS id j10si24525002laf.95.2014.09.30.15.06.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Sep 2014 15:06:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by mail-la0-f45.google.com with SMTP id q1so9554632lam.18 for ; Tue, 30 Sep 2014 15:06:52 -0700 (PDT) X-Received: by 10.112.163.103 with SMTP id yh7mr47610502lbb.73.1412114812037; Tue, 30 Sep 2014 15:06:52 -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 of9csp431063lbb; Tue, 30 Sep 2014 15:06:51 -0700 (PDT) X-Received: by 10.224.46.6 with SMTP id h6mr68073613qaf.45.1412114810701; Tue, 30 Sep 2014 15:06:50 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id h36si8388913qgd.66.2014.09.30.15.06.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 30 Sep 2014 15:06:50 -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]:46662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5ZJ-0001AZ-RU for patch@linaro.org; Tue, 30 Sep 2014 18:06:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5JZ-0000tm-OM for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZ5JU-0003yP-V9 for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:33 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:57841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5JT-0003xB-Ms for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:28 -0400 Received: by mail-pd0-f180.google.com with SMTP id fp1so5894259pdb.11 for ; Tue, 30 Sep 2014 14:50:21 -0700 (PDT) X-Received: by 10.70.89.132 with SMTP id bo4mr68676877pdb.35.1412113821922; Tue, 30 Sep 2014 14:50:21 -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.20 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Sep 2014 14:50:21 -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:30 -0500 Message-Id: <1412113785-21525-19-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.192.180 Cc: Sergey Fedorov , Greg Bellows Subject: [Qemu-devel] [PATCH v5 18/33] 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.45 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 --- 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 f7148d1..1b6ce8a 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 778c21c..4ad55d5 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 }; @@ -4365,16 +4368,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];