From patchwork Wed Apr 15 16:02:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 47228 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 7DFC62121F for ; Wed, 15 Apr 2015 16:14:36 +0000 (UTC) Received: by wixv7 with SMTP id v7sf12744866wix.0 for ; Wed, 15 Apr 2015 09:14:35 -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=a0yHbtIwMP9XIa66N2Xz4W9APhv+HkeHia88j6ja+KY=; b=ZZRZhKlOFi+Ntz/a8G3elxR/uIp/47QRbKTF/21cLMzC2T/zE8/alkZaqktOE2JKI6 NA5ivoJsPZPr3u+gwRspShFGgoajKMT7Fyxu2mxpazRd4abPNjtMDDsnoqePHxk2wGhE 36y89CDZvPhAVxtzL1jH7ff67je4kFbRoA0n6V5b5vZmauuT/pgxTmKQJ3nNaLK6WSqK N+vGFvfpOq1TGvaa1VVqFHLpdiRCe+TU2yrznbhtBXcZDmnx0X8gW9kVO+B7jIVP2aww 21C4/goRBTd8aJMNvkPihyU0nKOE2f9QEhqQtRGbXzGCjLTLjNluvfPLcSJmpIsue90A UiHA== X-Gm-Message-State: ALoCoQmks+UkXIA5dFBiwdmWpKRiG9RM8pBj8wrcAXhNk9CgzW+5Llh91zf7XbKOPjpG4pfu+X7U X-Received: by 10.112.162.228 with SMTP id yd4mr1318530lbb.8.1429114475789; Wed, 15 Apr 2015 09:14:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.115.240 with SMTP id jr16ls225437lab.69.gmail; Wed, 15 Apr 2015 09:14:35 -0700 (PDT) X-Received: by 10.112.93.72 with SMTP id cs8mr24594477lbb.15.1429114475649; Wed, 15 Apr 2015 09:14:35 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id q8si4258609laq.28.2015.04.15.09.14.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Apr 2015 09:14:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by lagv1 with SMTP id v1so36578331lag.3 for ; Wed, 15 Apr 2015 09:14:35 -0700 (PDT) X-Received: by 10.113.10.134 with SMTP id ea6mr24241618lbd.29.1429114475548; Wed, 15 Apr 2015 09:14:35 -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 l1csp2612357lbt; Wed, 15 Apr 2015 09:14:34 -0700 (PDT) X-Received: by 10.55.21.12 with SMTP id f12mr53173232qkh.87.1429114474112; Wed, 15 Apr 2015 09:14:34 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c41si5083570qge.65.2015.04.15.09.14.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 15 Apr 2015 09:14:34 -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]:33047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiPxQ-0003Uq-Ee for patch@linaro.org; Wed, 15 Apr 2015 12:14:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiPmq-00035N-8Z for qemu-devel@nongnu.org; Wed, 15 Apr 2015 12:03:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiPmm-000248-HY for qemu-devel@nongnu.org; Wed, 15 Apr 2015 12:03:36 -0400 Received: from mail-oi0-f50.google.com ([209.85.218.50]:34558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiPmm-00023y-Bu for qemu-devel@nongnu.org; Wed, 15 Apr 2015 12:03:32 -0400 Received: by oiko83 with SMTP id o83so28273774oik.1 for ; Wed, 15 Apr 2015 09:03:32 -0700 (PDT) X-Received: by 10.202.53.11 with SMTP id c11mr16455760oia.60.1429113778919; Wed, 15 Apr 2015 09:02:58 -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.57 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Apr 2015 09:02:58 -0700 (PDT) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Wed, 15 Apr 2015 11:02:22 -0500 Message-Id: <1429113742-8371-17-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.218.50 Cc: Fabian Aggeler , Greg Bellows Subject: [Qemu-devel] [PATCH v3 16/16] hw/intc/arm_gic: add gic_update() for grouping 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.52 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 GICs with grouping (GICv2 or GICv1 with Security Extensions) have a different exception generation model which is more complicated than without interrupt grouping. We add a new function to handle this model. Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows --- v1 -> v2 - Fix issue in gic_update_with_grouping() using the wrong combination of flag and CPU control bank for checking if group 1 interrupts are enabled. --- hw/intc/arm_gic.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++- hw/intc/gic_internal.h | 1 + 2 files changed, 87 insertions(+), 1 deletion(-) diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index c03b3dd..570bd4f 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -52,6 +52,87 @@ static inline bool ns_access(void) return true; } +inline void gic_update_with_grouping(GICState *s) +{ + int best_irq; + int best_prio; + int irq; + int irq_level; + int fiq_level; + int cpu; + int cm; + bool next_int; + bool next_grp0; + bool gicc_grp0_enabled; + bool gicc_grp1_enabled; + + for (cpu = 0; cpu < NUM_CPU(s); cpu++) { + cm = 1 << cpu; + gicc_grp0_enabled = s->cpu_control[cpu][0] & GICC_CTLR_S_EN_GRP0; + gicc_grp1_enabled = s->cpu_control[cpu][1] & GICC_CTLR_NS_EN_GRP1; + next_int = 0; + next_grp0 = 0; + + s->current_pending[cpu] = 1023; + if ((!s->enabled_grp[0] && !s->enabled_grp[1]) + || (!gicc_grp0_enabled && !gicc_grp1_enabled)) { + qemu_irq_lower(s->parent_irq[cpu]); + qemu_irq_lower(s->parent_fiq[cpu]); + return; + } + + /* Determine highest priority pending interrupt */ + best_prio = 0x100; + best_irq = 1023; + for (irq = 0; irq < s->num_irq; irq++) { + if (GIC_TEST_ENABLED(irq, cm) && gic_test_pending(s, irq, cm)) { + if (GIC_GET_PRIORITY(irq, cpu) < best_prio) { + best_prio = GIC_GET_PRIORITY(irq, cpu); + best_irq = irq; + } + } + } + + /* Priority of IRQ higher than priority mask? */ + if (best_prio < s->priority_mask[cpu]) { + s->current_pending[cpu] = best_irq; + if (GIC_TEST_GROUP0(best_irq, cm) && s->enabled_grp[0]) { + /* TODO: Add subpriority handling (binary point register) */ + if (best_prio < s->running_priority[cpu]) { + next_int = true; + next_grp0 = true; + } + } else if (!GIC_TEST_GROUP0(best_irq, cm) && s->enabled_grp[1]) { + /* TODO: Add subpriority handling (binary point register) */ + if (best_prio < s->running_priority[cpu]) { + next_int = true; + next_grp0 = false; + } + } + } + + fiq_level = 0; + irq_level = 0; + if (next_int) { + if (next_grp0 && (s->cpu_control[cpu][0] & GICC_CTLR_S_FIQ_EN)) { + if (gicc_grp0_enabled) { + fiq_level = 1; + DPRINTF("Raised pending FIQ %d (cpu %d)\n", best_irq, cpu); + } + } else { + if ((next_grp0 && gicc_grp0_enabled) + || (!next_grp0 && gicc_grp1_enabled)) { + irq_level = 1; + DPRINTF("Raised pending IRQ %d (cpu %d)\n", best_irq, cpu); + } + } + } + /* Set IRQ/FIQ signal */ + qemu_set_irq(s->parent_irq[cpu], irq_level); + qemu_set_irq(s->parent_fiq[cpu], fiq_level); + } +} + inline void gic_update_no_grouping(GICState *s) { int best_irq; @@ -95,7 +176,11 @@ inline void gic_update_no_grouping(GICState *s) /* Update interrupt status after enabled or pending bits have been changed. */ void gic_update(GICState *s) { - gic_update_no_grouping(s); + if (s->revision >= 2 || s->security_extn) { + gic_update_with_grouping(s); + } else { + gic_update_no_grouping(s); + } } void gic_set_pending_private(GICState *s, int cpu, int irq) diff --git a/hw/intc/gic_internal.h b/hw/intc/gic_internal.h index e16a7e5..01859ed 100644 --- a/hw/intc/gic_internal.h +++ b/hw/intc/gic_internal.h @@ -73,6 +73,7 @@ void gic_set_pending_private(GICState *s, int cpu, int irq); uint32_t gic_acknowledge_irq(GICState *s, int cpu); void gic_complete_irq(GICState *s, int cpu, int irq); +inline void gic_update_with_grouping(GICState *s); inline void gic_update_no_grouping(GICState *s); void gic_update(GICState *s); void gic_init_irqs_and_distributor(GICState *s);