From patchwork Thu Oct 30 22:12:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 39921 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 5CD382405B for ; Fri, 31 Oct 2014 15:54:46 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id f15sf4365870lbj.3 for ; Fri, 31 Oct 2014 08:54:45 -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=Y358IPUKTRdvQbBF4dZELS05KWcnXCl1DJsKcbCqNGE=; b=eW4/kb/exOpwTAd3UE1b2Kn/CB4HjTp+hrEbHvM8d1Uo9VpKD9B3DCpnj0nr+2iHkc BV/eqNQ2SnuIUjHUpUULEDwf0iSxq9NrRDdyqXBsqLjBb7aCN7vRSXZIZmIMhF1lTt4F S4GgPafVk/AkutIQ1RpU47BFsFAdNwtL2qB+I4UiXPIVZI1BKf4Ui19EghL7ORnRdniL C6PsKYHLIq2aEzcaiOsLR2Cv0SyvFpZ5Y0WUJ9CD1tK/3WNfhT1PqgOVX9IJHuem0ZH3 lmIyXv6AAoyoTGUr7/hw2rEwVsb3toxBg+O9tEmRiJXEtc25JQDTPtSqeLqHOXC4QJoc OZfQ== X-Gm-Message-State: ALoCoQm5MsNFkJFQbBjbMUIAs195Me9p349fG6RZTMDtCbiUVJFwMEhjxJXupynpFiyhNJo5/kG6 X-Received: by 10.152.6.130 with SMTP id b2mr10155laa.10.1414770885178; Fri, 31 Oct 2014 08:54:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.4 with SMTP id j4ls285226lae.59.gmail; Fri, 31 Oct 2014 08:54:44 -0700 (PDT) X-Received: by 10.152.5.201 with SMTP id u9mr8911328lau.24.1414770884904; Fri, 31 Oct 2014 08:54:44 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id ld12si17312853lac.105.2014.10.31.08.54.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 08:54:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id hs14so6587526lab.33 for ; Fri, 31 Oct 2014 08:54:44 -0700 (PDT) X-Received: by 10.112.130.41 with SMTP id ob9mr26759729lbb.74.1414770884433; Fri, 31 Oct 2014 08:54:44 -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 c5csp223699lbz; Fri, 31 Oct 2014 08:54:43 -0700 (PDT) X-Received: by 10.224.61.7 with SMTP id r7mr38919984qah.9.1414770882700; Fri, 31 Oct 2014 08:54:42 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n14si17592641qae.122.2014.10.31.08.54.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 31 Oct 2014 08:54:42 -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]:38511 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkEXB-0001SG-SJ for patch@linaro.org; Fri, 31 Oct 2014 11:54:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkE4x-0005Vv-Ik for qemu-devel@nongnu.org; Fri, 31 Oct 2014 11:26:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xjxxc-0006AG-8a for qemu-devel@nongnu.org; Thu, 30 Oct 2014 18:12:58 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:39178) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xjxxb-00069T-Vi for qemu-devel@nongnu.org; Thu, 30 Oct 2014 18:12:52 -0400 Received: by mail-pa0-f47.google.com with SMTP id kx10so6338941pab.20 for ; Thu, 30 Oct 2014 15:12:51 -0700 (PDT) X-Received: by 10.70.103.15 with SMTP id fs15mr20157037pdb.129.1414707171330; Thu, 30 Oct 2014 15:12:51 -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 h3sm7270163pdl.22.2014.10.30.15.12.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 Oct 2014 15:12:50 -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, christoffer.dall@linaro.org Date: Thu, 30 Oct 2014 17:12:05 -0500 Message-Id: <1414707132-24588-10-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1414707132-24588-1-git-send-email-greg.bellows@linaro.org> References: <1414707132-24588-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: daniel.thompson@linaro.org Subject: [Qemu-devel] [PATCH v2 09/16] hw/intc/arm_gic: Make ICCBPR/GICC_BPR 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.215.46 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 This register is banked in GICs with Security Extensions. Storing the non-secure copy of BPR in the abpr, which is an alias to the non-secure copy for secure access. ABPR itself is only accessible from secure state if the GIC implements Security Extensions. Signed-off-by: Fabian Aggeler --- v1 -> v2 - Fix ABPR read handling when security extensions are not present - Fix BPR write to take into consideration the minimum value written to ABPR and restrict BPR->ABPR mirroring to GICv2 and up. - Fix ABPR write to take into consideration the minumum value written - Fix ABPR write condition break-down to include mirroring of ABPR writes to BPR. --- hw/intc/arm_gic.c | 54 ++++++++++++++++++++++++++++++++++++---- include/hw/intc/arm_gic_common.h | 11 +++++--- 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index 3c0414f..3761d12 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -840,7 +840,12 @@ static uint32_t gic_cpu_read(GICState *s, int cpu, int offset) case 0x04: /* Priority mask */ return s->priority_mask[cpu]; case 0x08: /* Binary Point */ - return s->bpr[cpu]; + if (s->security_extn && ns_access()) { + /* BPR is banked. Non-secure copy stored in ABPR. */ + return s->abpr[cpu]; + } else { + return s->bpr[cpu]; + } case 0x0c: /* Acknowledge */ return gic_acknowledge_irq(s, cpu); case 0x14: /* Running Priority */ @@ -848,7 +853,14 @@ static uint32_t gic_cpu_read(GICState *s, int cpu, int offset) case 0x18: /* Highest Pending Interrupt */ return s->current_pending[cpu]; case 0x1c: /* Aliased Binary Point */ - return s->abpr[cpu]; + if (!s->security_extn || (s->security_extn && ns_access())) { + /* If Security Extensions are present ABPR is a secure register, + * only accessible from secure state. + */ + return 0; + } else { + return s->abpr[cpu]; + } case 0xd0: case 0xd4: case 0xd8: case 0xdc: return s->apr[(offset - 0xd0) / 4][cpu]; default: @@ -867,13 +879,45 @@ static void gic_cpu_write(GICState *s, int cpu, int offset, uint32_t value) s->priority_mask[cpu] = (value & 0xff); break; case 0x08: /* Binary Point */ - s->bpr[cpu] = (value & 0x7); + if (s->security_extn && ns_access()) { + /* BPR is banked. Non-secure copy stored in ABPR. */ + /* The non-secure (ABPR) must not be below an implementation + * defined minimum value between 1-4. + * NOTE: BPR_MIN is currently set to 0, which is always true given + * the value is unsigned, so no check is necessary. + */ + s->abpr[cpu] = (GIC_MIN_ABPR <= (value & 0x7)) + ? (value & 0x7) : GIC_MIN_ABPR; + } else { + s->bpr[cpu] = (value & 0x7); + if (s->revision >= 2) { + /* On GICv2 without sec ext, GICC_ABPR is an alias of GICC_BPR + * so mirror the write. + */ + s->abpr[cpu] = s->bpr[cpu]; + } + } break; case 0x10: /* End Of Interrupt */ return gic_complete_irq(s, cpu, value & 0x3ff); case 0x1c: /* Aliased Binary Point */ - if (s->revision >= 2) { - s->abpr[cpu] = (value & 0x7); + /* This register only exists on GICv2 or GICv1 w/security. Writes when + * the register is not implemented (no sec ext) are ignored. + */ + if (s->security_extn) { + if (!ns_access()) { + s->abpr[cpu] = (GIC_MIN_ABPR <= (value & 0x7)) + ? (value & 0x7) : GIC_MIN_ABPR; + } + } else { + if (s->revision >= 2) { + /* In a GICv2 impl without the security extension, the + * GICC_ABPR is an alias to GICC_BPR, so mirror the write. + */ + s->abpr[cpu] = (GIC_MIN_ABPR <= (value & 0x7)) + ? (value & 0x7) : GIC_MIN_ABPR; + s->bpr[cpu] = s->abpr[cpu]; + } } break; case 0xd0: case 0xd4: case 0xd8: case 0xdc: diff --git a/include/hw/intc/arm_gic_common.h b/include/hw/intc/arm_gic_common.h index 1daa672..3b0459a 100644 --- a/include/hw/intc/arm_gic_common.h +++ b/include/hw/intc/arm_gic_common.h @@ -36,6 +36,9 @@ #define MAX_NR_GROUP_PRIO 128 #define GIC_NR_APRS (MAX_NR_GROUP_PRIO / 32) +#define GIC_MIN_BPR 0 +#define GIC_MIN_ABPR (GIC_MIN_BPR + 1) + typedef struct gic_irq_state { /* The enable bits are only banked for per-cpu interrupts. */ uint8_t enabled; @@ -78,9 +81,11 @@ typedef struct GICState { uint16_t running_priority[GIC_NCPU]; uint16_t current_pending[GIC_NCPU]; - /* We present the GICv2 without security extensions to a guest and - * therefore the guest can configure the GICC_CTLR to configure group 1 - * binary point in the abpr. + /* If we present the GICv2 without security extensions to a guest, + * the guest can configure the GICC_CTLR to configure group 1 binary point + * in the abpr. + * For a GIC with Security Extensions we use use bpr for the + * secure copy and abpr as storage for the non-secure copy of the register. */ uint8_t bpr[GIC_NCPU]; uint8_t abpr[GIC_NCPU];