From patchwork Wed Apr 15 16:02:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 47225 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 878DB21550 for ; Wed, 15 Apr 2015 16:11:12 +0000 (UTC) Received: by widjs5 with SMTP id js5sf12610468wid.3 for ; Wed, 15 Apr 2015 09:11:11 -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=Q6gqRS2iQrMA5LIERTM3sC6JIzrp+MGb6bRPbAGziXA=; b=Fu6e8jsVogguGdtB0R/0Z+SD0O/YoKhNsuvviWzOyjI3NDHTD8qiUyunYleVxvY6Cz 1Mg+JxCfSSYadD/UvzFiRBxYU+xCNbiAhK/kQf1K5DjrNw0repoIZG4HYdL6KMOWylBW E2gDUezswfB14p5kOcqtwEe5xH7xbbqlsopJmu3ePXRllIu5TAUxv2+n+Hwabs4hIid4 5UHWGmq9taZ9XXzyFEjY6LVc47sbsBh5JmUAOWUPfawef4VMqv+R1E3YWVemlHjdTfuG CVEtXvjLmjkGBUpKpEjC2YlPkHo0tQ1fIo/2MbwNk6hPuMIk7S7JnaLHZcCewr6hzz/Q LGvg== X-Gm-Message-State: ALoCoQm/F8A248RnQ45XhH0Ud+tbQYFZ2bFVMDzxggX4HZYSV2qcm78ZKwsHR53ULgjt4ZkPdIjV X-Received: by 10.152.26.134 with SMTP id l6mr4993832lag.10.1429114271852; Wed, 15 Apr 2015 09:11:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.194 with SMTP id v2ls239187lag.59.gmail; Wed, 15 Apr 2015 09:11:11 -0700 (PDT) X-Received: by 10.152.198.200 with SMTP id je8mr16576908lac.29.1429114271708; Wed, 15 Apr 2015 09:11:11 -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 q3si4224799lah.142.2015.04.15.09.11.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Apr 2015 09:11:11 -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 layy10 with SMTP id y10so36518435lay.0 for ; Wed, 15 Apr 2015 09:11:11 -0700 (PDT) X-Received: by 10.152.26.34 with SMTP id i2mr24158337lag.117.1429114271603; Wed, 15 Apr 2015 09:11:11 -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.67.65 with SMTP id l1csp2610485lbt; Wed, 15 Apr 2015 09:11:10 -0700 (PDT) X-Received: by 10.55.31.167 with SMTP id n39mr52797835qkh.59.1429114270233; Wed, 15 Apr 2015 09:11:10 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b90si5078443qgb.50.2015.04.15.09.11.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 15 Apr 2015 09:11:10 -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]:33013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiPu8-00067H-GH for patch@linaro.org; Wed, 15 Apr 2015 12:11:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiPmb-0002dI-Sj for qemu-devel@nongnu.org; Wed, 15 Apr 2015 12:03:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiPmZ-0001zC-1d for qemu-devel@nongnu.org; Wed, 15 Apr 2015 12:03:21 -0400 Received: from mail-ob0-f170.google.com ([209.85.214.170]:34772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiPmY-0001z6-UA for qemu-devel@nongnu.org; Wed, 15 Apr 2015 12:03:19 -0400 Received: by obfe9 with SMTP id e9so25436608obf.1 for ; Wed, 15 Apr 2015 09:03:18 -0700 (PDT) X-Received: by 10.182.110.193 with SMTP id ic1mr18377468obb.59.1429113770694; Wed, 15 Apr 2015 09:02:50 -0700 (PDT) Received: from gbellows-linaro.gateway.pace.com (99-179-1-214.lightspeed.austtx.sbcglobal.net. [99.179.1.214]) by mx.google.com with ESMTPSA id x142sm2567707oie.19.2015.04.15.09.02.48 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Apr 2015 09:02:49 -0700 (PDT) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Wed, 15 Apr 2015 11:02:17 -0500 Message-Id: <1429113742-8371-12-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1429113742-8371-1-git-send-email-greg.bellows@linaro.org> References: <1429113742-8371-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.214.170 Cc: Fabian Aggeler , Greg Bellows Subject: [Qemu-devel] [PATCH v3 11/16] hw/intc/arm_gic: Handle grouping for GICC_HPPIR 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 Grouping (GICv2) and Security Extensions change the behaviour of reads of the highest priority pending interrupt register (ICCHPIR/GICC_HPPIR). Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows --- hw/intc/arm_gic.c | 29 ++++++++++++++++++++++++++++- hw/intc/gic_internal.h | 1 + 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index e65a271..d6f8dae 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -329,6 +329,33 @@ uint8_t gic_get_running_priority(GICState *s, int cpu) } } +uint16_t gic_get_current_pending_irq(GICState *s, int cpu) +{ + bool isGrp0; + uint16_t pendingId = s->current_pending[cpu]; + + if (pendingId < GIC_MAXIRQ && (s->revision >= 2 || s->security_extn)) { + isGrp0 = GIC_TEST_GROUP0(pendingId, (1 << cpu)); + if ((isGrp0 && !s->enabled_grp[0]) + || (!isGrp0 && !s->enabled_grp[1])) { + return 1023; + } + if (s->security_extn) { + if (isGrp0 && ns_access()) { + /* Group0 interrupts hidden from Non-secure access */ + return 1023; + } + if (!isGrp0 && !ns_access() + && !(s->cpu_control[cpu][0] & GICC_CTLR_S_ACK_CTL)) { + /* Group1 interrupts only seen by Secure access if + * AckCtl bit set. */ + return 1022; + } + } + } + return pendingId; +} + void gic_complete_irq(GICState *s, int cpu, int irq) { int update = 0; @@ -867,7 +894,7 @@ static uint32_t gic_cpu_read(GICState *s, int cpu, int offset) case 0x14: /* Running Priority */ return gic_get_running_priority(s, cpu); case 0x18: /* Highest Pending Interrupt */ - return s->current_pending[cpu]; + return gic_get_current_pending_irq(s, cpu); case 0x1c: /* Aliased Binary Point */ if (!s->security_extn || (s->security_extn && ns_access())) { /* If Security Extensions are present ABPR is a secure register, diff --git a/hw/intc/gic_internal.h b/hw/intc/gic_internal.h index 821ce16..fbb1f66 100644 --- a/hw/intc/gic_internal.h +++ b/hw/intc/gic_internal.h @@ -79,6 +79,7 @@ void gic_set_priority(GICState *s, int cpu, int irq, uint8_t val); uint32_t gic_get_cpu_control(GICState *s, int cpu); void gic_set_cpu_control(GICState *s, int cpu, uint32_t value); uint8_t gic_get_running_priority(GICState *s, int cpu); +uint16_t gic_get_current_pending_irq(GICState *s, int cpu); static inline bool gic_test_pending(GICState *s, int irq, int cm)