From patchwork Tue Apr 22 12:58:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 28793 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ED46B203AC for ; Tue, 22 Apr 2014 13:05:29 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rl12sf35069719iec.10 for ; Tue, 22 Apr 2014 06:05:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=a0qFCYhwWec5e3+EA3hiaMyuHuJ5NH+tV8GyCt93Ods=; b=ZzMFb7lP9c0EFMqRiFeanyvjk8Y0JCuU2FpKrgdmM3MPsolDmTdoQU5v4gcFifXHIY e208jBYx/uj1jPwZnFGx4VyBSy8xkAB02RjUig6MAb4RTwXfDbmxmMau41BWmJnQS7g7 cVFkFoRGxv0mX05cMMrgDCgVTR3XQtxj9bs9bhEEOCiFORR/x8CS3HKKXQwtcHMVOKaa c37IxYV/TX8irqWFIecyMLv/HqnI2+5t4b8JtZRh1thuKGLrgxkm2CoAFC4bzOuDa+Y5 ekjufAghKOUtCZ1N7hcSmlQhVa32XgKdwVuJ6EK7dOmMGhcgdJx8FssdDbOnRwt4UKYm 0/Aw== X-Gm-Message-State: ALoCoQkD1ZG9yh2s4XYAdfqzHfIEo5gNhCQIe0QW+UGWFdJcDAuSNHy8EAlRxXsE3rK5GgNASe/v X-Received: by 10.43.31.81 with SMTP id sf17mr18272188icb.4.1398171929369; Tue, 22 Apr 2014 06:05:29 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.106 with SMTP id o97ls66441qgd.50.gmail; Tue, 22 Apr 2014 06:05:29 -0700 (PDT) X-Received: by 10.220.190.197 with SMTP id dj5mr35593229vcb.19.1398171929191; Tue, 22 Apr 2014 06:05:29 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id sn5si6867342vdc.191.2014.04.22.06.05.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Apr 2014 06:05:29 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so9253814veb.40 for ; Tue, 22 Apr 2014 06:05:29 -0700 (PDT) X-Received: by 10.221.29.137 with SMTP id ry9mr37002154vcb.6.1398171929086; Tue, 22 Apr 2014 06:05:29 -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.220.221.72 with SMTP id ib8csp22964vcb; Tue, 22 Apr 2014 06:05:28 -0700 (PDT) X-Received: by 10.58.134.101 with SMTP id pj5mr277135veb.38.1398171928657; Tue, 22 Apr 2014 06:05:28 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id ol2si6879735vcb.89.2014.04.22.06.05.28 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 22 Apr 2014 06:05:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WcaKe-0002Pe-BC; Tue, 22 Apr 2014 13:01:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WcaIb-0001hs-4A for xen-devel@lists.xenproject.org; Tue, 22 Apr 2014 12:59:45 +0000 Received: from [85.158.143.35:15672] by server-1.bemta-4.messagelabs.com id F8/BE-09853-E9766535; Tue, 22 Apr 2014 12:59:10 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-9.tower-21.messagelabs.com!1398171546!255336!1 X-Originating-IP: [74.125.83.50] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10839 invoked from network); 22 Apr 2014 12:59:06 -0000 Received: from mail-ee0-f50.google.com (HELO mail-ee0-f50.google.com) (74.125.83.50) by server-9.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 22 Apr 2014 12:59:06 -0000 Received: by mail-ee0-f50.google.com with SMTP id c13so4547923eek.23 for ; Tue, 22 Apr 2014 05:59:05 -0700 (PDT) X-Received: by 10.15.67.142 with SMTP id u14mr55442629eex.19.1398171545911; Tue, 22 Apr 2014 05:59:05 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id x45sm112862825eef.15.2014.04.22.05.59.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Apr 2014 05:59:05 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 22 Apr 2014 13:58:39 +0100 Message-Id: <1398171530-27391-8-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398171530-27391-1-git-send-email-julien.grall@linaro.org> References: <1398171530-27391-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v4 07/18] xen/arm: IRQ: Rework gic_route_irq_to_guest function X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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 List-Archive: The function gic_route_irq_to_guest contains code which is not related to the GIC. Split the function in 2 parts: - route_dt_irq_to_guest: setup the desc - gic_route_irq_to_guest: setup correctly the GIC and the desc handler Signed-off-by: Julien Grall Acked-by: Ian Campbell --- Changes in v3: - Patch added (split from "Move IRQ management from gic.c to irq.c") --- xen/arch/arm/domain_build.c | 2 +- xen/arch/arm/gic.c | 43 ++++++++++++++++++++++------------ xen/arch/arm/platforms/xgene-storm.c | 2 +- xen/include/asm-arm/gic.h | 3 --- xen/include/asm-arm/irq.h | 3 +++ 5 files changed, 33 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 7bc9bf6..5b636c8 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -726,7 +726,7 @@ static int map_device(struct domain *d, const struct dt_device_node *dev) DPRINT("irq %u = %u type = 0x%x\n", i, irq.irq, irq.type); /* Don't check return because the IRQ can be use by multiple device */ - gic_route_irq_to_guest(d, &irq, dt_node_name(dev)); + route_dt_irq_to_guest(d, &irq, dt_node_name(dev)); } /* Map the address ranges */ diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 8d3c155..90b129d 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -282,6 +282,27 @@ static int gic_route_irq(unsigned int irq, bool_t level, return 0; } +/* Program the GIC to route an interrupt to a guest + * - desc.lock must be held + */ +static void gic_route_irq_to_guest(struct domain *d, struct irq_desc *desc, + bool_t level, const cpumask_t *cpu_mask, + unsigned int priority) +{ + struct pending_irq *p; + ASSERT(spin_is_locked(&desc->lock)); + + desc->handler = &gic_guest_irq_type; + desc->status |= IRQ_GUEST; + + gic_set_irq_properties(desc->irq, level, cpumask_of(smp_processor_id()), + GIC_PRI_IRQ); + + /* TODO: do not assume delivery to vcpu0 */ + p = irq_to_pending(d->vcpu[0], desc->irq); + p->desc = desc; +} + /* Program the GIC to route an interrupt with a dt_irq */ void gic_route_dt_irq(const struct dt_irq *irq, const cpumask_t *cpu_mask, unsigned int priority) @@ -761,15 +782,14 @@ void gic_inject(void) gic_inject_irq_start(); } -int gic_route_irq_to_guest(struct domain *d, const struct dt_irq *irq, - const char * devname) +int route_dt_irq_to_guest(struct domain *d, const struct dt_irq *irq, + const char * devname) { struct irqaction *action; struct irq_desc *desc = irq_to_desc(irq->irq); unsigned long flags; int retval; bool_t level; - struct pending_irq *p; action = xmalloc(struct irqaction); if (!action) @@ -781,23 +801,16 @@ int gic_route_irq_to_guest(struct domain *d, const struct dt_irq *irq, spin_lock_irqsave(&desc->lock, flags); - desc->handler = &gic_guest_irq_type; - desc->status |= IRQ_GUEST; - - level = dt_irq_is_level_triggered(irq); - - gic_set_irq_properties(irq->irq, level, cpumask_of(smp_processor_id()), - GIC_PRI_IRQ); - retval = __setup_irq(desc, action); - if (retval) { + if ( retval ) + { xfree(action); goto out; } - /* TODO: do not assume delivery to vcpu0 */ - p = irq_to_pending(d->vcpu[0], irq->irq); - p->desc = desc; + level = dt_irq_is_level_triggered(irq); + gic_route_irq_to_guest(d, desc, level, cpumask_of(smp_processor_id()), + GIC_PRI_IRQ); out: spin_unlock_irqrestore(&desc->lock, flags); diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index af3b71c..70aab73 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -66,7 +66,7 @@ static int map_one_spi(struct domain *d, const char *what, printk("Additional IRQ %u (%s)\n", irq.irq, what); - ret = gic_route_irq_to_guest(d, &irq, what); + ret = route_dt_irq_to_guest(d, &irq, what); if ( ret ) printk("Failed to route %s to dom%d\n", what, d->domain_id); diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 071280b..9489c04 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -181,9 +181,6 @@ extern void __cpuinit init_maintenance_interrupt(void); extern void gic_set_guest_irq(struct vcpu *v, unsigned int irq, unsigned int state, unsigned int priority); extern void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq); -extern int gic_route_irq_to_guest(struct domain *d, - const struct dt_irq *irq, - const char * devname); /* Accept an interrupt from the GIC and dispatch its handler */ extern void gic_interrupt(struct cpu_user_regs *regs, int is_fiq); diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h index 9380987..b52c26f 100644 --- a/xen/include/asm-arm/irq.h +++ b/xen/include/asm-arm/irq.h @@ -44,6 +44,9 @@ int request_dt_irq(const struct dt_irq *irq, const char *devname, void *dev_id); int setup_dt_irq(const struct dt_irq *irq, struct irqaction *new); +int route_dt_irq_to_guest(struct domain *d, const struct dt_irq *irq, + const char *devname); + #endif /* _ASM_HW_IRQ_H */ /* * Local variables: