From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH v3 07/18] xen/arm: IRQ: Rework gic_route_irq_to_guest function Date: Tue, 8 Apr 2014 15:43:56 +0100 Message-ID: <1396968247-8768-8-git-send-email-julien.grall@linaro.org> References: <1396968247-8768-1-git-send-email-julien.grall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WXXG9-0000AV-M4 for xen-devel@lists.xenproject.org; Tue, 08 Apr 2014 14:44:21 +0000 Received: by mail-ee0-f44.google.com with SMTP id e49so771196eek.17 for ; Tue, 08 Apr 2014 07:44:19 -0700 (PDT) In-Reply-To: <1396968247-8768-1-git-send-email-julien.grall@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org 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 --- 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 2035390..e7b1674 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -719,7 +719,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 d5122fc..d30b979 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -286,6 +286,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) @@ -874,15 +895,14 @@ void gic_inject(void) GICH[GICH_HCR] &= ~GICH_HCR_UIE; } -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) @@ -894,23 +914,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 5d8f7f1..1b94fd7 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -184,9 +184,6 @@ extern void __cpuinit init_maintenance_interrupt(void); extern void gic_raise_guest_irq(struct vcpu *v, unsigned int irq, 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: -- 1.7.10.4