From patchwork Thu Oct 30 22:12:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 39961 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 435CD2405B for ; Fri, 31 Oct 2014 18:47:02 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id d17sf1065695eek.11 for ; Fri, 31 Oct 2014 11:47: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: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=eoaluqkNrt/qZtWeCqE7ZHyIP4y7ooMaNXcUzKHb4B0=; b=Jj0dNnBlxi3VxZbjuKqEaS1Enj9lXRmJ9ela/KJI17GmNnQsJJdQPrszBMeGeK6OvD MprFC3WzHCLdwfXV1PFlNDYOAYvzG+O+qF7E0Xm5wP6NZvWvHKDks1/oryKrnHfq8uRO Wewu2AslkEeo21yB3OzFqv+EKs7peakYuH3OmOSxug+cziK/0guXGrsOl1x+7DO3E8Wr NV3rIY+9fFMaK83nc5HsXIEV6TxyQKm6uX/AYv0sNyrLr7FjHh6C22IJxGWAoWhk6pVV kZbBa6adGvVf1ysK5loLPmc1GG+Twn9sc4Kyubm7fnb3l4z3cdEDD26oeFMW0ahp0h+j XK2Q== X-Gm-Message-State: ALoCoQlDfKLzPxDXX7oxyAdWeuR7dSyhWKnZgk0n1CrEQE0ITkulXb2g+QFNFpvuUuZpT0E1fxIc X-Received: by 10.152.6.130 with SMTP id b2mr17872laa.10.1414781221474; Fri, 31 Oct 2014 11:47:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.52 with SMTP id o20ls540217laa.3.gmail; Fri, 31 Oct 2014 11:47:01 -0700 (PDT) X-Received: by 10.152.198.166 with SMTP id jd6mr28602370lac.81.1414781221326; Fri, 31 Oct 2014 11:47:01 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id ke10si18218102lbc.41.2014.10.31.11.47.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 11:47:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id s18so1362398lam.13 for ; Fri, 31 Oct 2014 11:47:01 -0700 (PDT) X-Received: by 10.113.6.1 with SMTP id cq1mr7107697lbd.32.1414781221146; Fri, 31 Oct 2014 11:47:01 -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 c5csp245437lbz; Fri, 31 Oct 2014 11:47:00 -0700 (PDT) X-Received: by 10.140.97.200 with SMTP id m66mr3321566qge.17.1414781219887; Fri, 31 Oct 2014 11:46:59 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b66si18374053qga.118.2014.10.31.11.46.58 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 31 Oct 2014 11:46:59 -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]:41098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkHDr-0007vp-KQ for patch@linaro.org; Fri, 31 Oct 2014 14:46:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkE4x-00062Z-IM for qemu-devel@nongnu.org; Fri, 31 Oct 2014 11:26:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xjxxd-0006Bj-IV for qemu-devel@nongnu.org; Thu, 30 Oct 2014 18:12:59 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:45660) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xjxxd-0006BB-CR for qemu-devel@nongnu.org; Thu, 30 Oct 2014 18:12:53 -0400 Received: by mail-pd0-f182.google.com with SMTP id fp1so6008465pdb.27 for ; Thu, 30 Oct 2014 15:12:52 -0700 (PDT) X-Received: by 10.66.240.228 with SMTP id wd4mr18860026pac.113.1414707172862; Thu, 30 Oct 2014 15:12:52 -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.51 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 Oct 2014 15:12:52 -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:06 -0500 Message-Id: <1414707132-24588-11-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.192.182 Cc: daniel.thompson@linaro.org Subject: [Qemu-devel] [PATCH v2 10/16] hw/intc/arm_gic: Implement Non-secure view of RPR 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.54 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 For GICs with Security Extensions Non-secure reads have a restricted view on the current running priority. Signed-off-by: Fabian Aggeler --- hw/intc/arm_gic.c | 17 ++++++++++++++++- hw/intc/gic_internal.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index 3761d12..9b021d7 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -314,6 +314,21 @@ void gic_set_cpu_control(GICState *s, int cpu, uint32_t value) } } +uint8_t gic_get_running_priority(GICState *s, int cpu) +{ + if (s->security_extn && ns_access()) { + if (s->running_priority[cpu] & 0x80) { + /* Running priority in upper half, return Non-secure view */ + return s->running_priority[cpu] << 1; + } else { + /* Running priority in lower half, RAZ */ + return 0; + } + } else { + return s->running_priority[cpu]; + } +} + void gic_complete_irq(GICState *s, int cpu, int irq) { int update = 0; @@ -849,7 +864,7 @@ static uint32_t gic_cpu_read(GICState *s, int cpu, int offset) case 0x0c: /* Acknowledge */ return gic_acknowledge_irq(s, cpu); case 0x14: /* Running Priority */ - return s->running_priority[cpu]; + return gic_get_running_priority(s, cpu); case 0x18: /* Highest Pending Interrupt */ return s->current_pending[cpu]; case 0x1c: /* Aliased Binary Point */ diff --git a/hw/intc/gic_internal.h b/hw/intc/gic_internal.h index e360de6..821ce16 100644 --- a/hw/intc/gic_internal.h +++ b/hw/intc/gic_internal.h @@ -78,6 +78,7 @@ void gic_init_irqs_and_distributor(GICState *s); 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); static inline bool gic_test_pending(GICState *s, int irq, int cm)