[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v4 08/18] xen/arm: IRQ: Move IRQ management from gic.c to irq.c
The file gic.c contains functions and variables which is not related to the GIC: - release_irq - setup_irq - gic_route_irq_to_guest - {,local_}irq_desc Move all theses functions/variables in irq.c Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx> Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx> --- Changes in v3: - Split the patch in 2: refactoring + code motion Changes in v2: - Patch added --- xen/arch/arm/gic.c | 102 ++------------------------------------------- xen/arch/arm/irq.c | 97 ++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/gic.h | 4 ++ 3 files changed, 104 insertions(+), 99 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 90b129d..77dfecf 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -52,8 +52,6 @@ static struct { spinlock_t lock; } gic; -static irq_desc_t irq_desc[NR_IRQS]; -static DEFINE_PER_CPU(irq_desc_t[NR_LOCAL_IRQS], local_irq_desc); static DEFINE_PER_CPU(uint64_t, lr_mask); static unsigned nr_lrs; @@ -88,12 +86,6 @@ unsigned int gic_number_lines(void) return gic.lines; } -irq_desc_t *__irq_to_desc(int irq) -{ - if (irq < NR_LOCAL_IRQS) return &this_cpu(local_irq_desc)[irq]; - return &irq_desc[irq-NR_LOCAL_IRQS]; -} - void gic_save_state(struct vcpu *v) { int i; @@ -285,9 +277,9 @@ static int gic_route_irq(unsigned int irq, bool_t level, /* 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) +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)); @@ -591,59 +583,6 @@ void gic_route_spis(void) } } -void release_irq(unsigned int irq) -{ - struct irq_desc *desc; - unsigned long flags; - struct irqaction *action; - - desc = irq_to_desc(irq); - - desc->handler->shutdown(desc); - - spin_lock_irqsave(&desc->lock,flags); - action = desc->action; - desc->action = NULL; - desc->status &= ~IRQ_GUEST; - - spin_unlock_irqrestore(&desc->lock,flags); - - /* Wait to make sure it's not being used on another CPU */ - do { smp_mb(); } while ( desc->status & IRQ_INPROGRESS ); - - if (action && action->free_on_release) - xfree(action); -} - -static int __setup_irq(struct irq_desc *desc, struct irqaction *new) -{ - if ( desc->action != NULL ) - return -EBUSY; - - desc->action = new; - dsb(sy); - - return 0; -} - -int setup_dt_irq(const struct dt_irq *irq, struct irqaction *new) -{ - int rc; - unsigned long flags; - struct irq_desc *desc; - - desc = irq_to_desc(irq->irq); - - spin_lock_irqsave(&desc->lock, flags); - rc = __setup_irq(desc, new); - spin_unlock_irqrestore(&desc->lock, flags); - - if ( !rc ) - desc->handler->startup(desc); - - return rc; -} - static inline void gic_set_lr(int lr, struct pending_irq *p, unsigned int state) { @@ -782,41 +721,6 @@ void gic_inject(void) gic_inject_irq_start(); } -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; - - action = xmalloc(struct irqaction); - if (!action) - return -ENOMEM; - - action->dev_id = d; - action->name = devname; - action->free_on_release = 1; - - spin_lock_irqsave(&desc->lock, flags); - - retval = __setup_irq(desc, action); - if ( retval ) - { - xfree(action); - goto out; - } - - 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); - return retval; -} - static void do_sgi(struct cpu_user_regs *regs, int othercpu, enum gic_sgi sgi) { /* Lower the priority */ diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index b3bfebc..f3a30bd 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -44,6 +44,15 @@ hw_irq_controller no_irq_type = { .end = end_none }; +static irq_desc_t irq_desc[NR_IRQS]; +static DEFINE_PER_CPU(irq_desc_t[NR_LOCAL_IRQS], local_irq_desc); + +irq_desc_t *__irq_to_desc(int irq) +{ + if (irq < NR_LOCAL_IRQS) return &this_cpu(local_irq_desc)[irq]; + return &irq_desc[irq-NR_LOCAL_IRQS]; +} + int __init arch_init_one_irq_desc(struct irq_desc *desc) { return 0; @@ -188,6 +197,94 @@ out_no_end: irq_exit(); } +void release_irq(unsigned int irq) +{ + struct irq_desc *desc; + unsigned long flags; + struct irqaction *action; + + desc = irq_to_desc(irq); + + desc->handler->shutdown(desc); + + spin_lock_irqsave(&desc->lock,flags); + action = desc->action; + desc->action = NULL; + desc->status &= ~IRQ_GUEST; + + spin_unlock_irqrestore(&desc->lock,flags); + + /* Wait to make sure it's not being used on another CPU */ + do { smp_mb(); } while ( desc->status & IRQ_INPROGRESS ); + + if ( action && action->free_on_release ) + xfree(action); +} + +static int __setup_irq(struct irq_desc *desc, struct irqaction *new) +{ + if ( desc->action != NULL ) + return -EBUSY; + + desc->action = new; + dsb(sy); + + return 0; +} + +int setup_dt_irq(const struct dt_irq *irq, struct irqaction *new) +{ + int rc; + unsigned long flags; + struct irq_desc *desc; + + desc = irq_to_desc(irq->irq); + + spin_lock_irqsave(&desc->lock, flags); + rc = __setup_irq(desc, new); + spin_unlock_irqrestore(&desc->lock, flags); + + if ( !rc ) + desc->handler->startup(desc); + + return rc; +} + +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; + + action = xmalloc(struct irqaction); + if (!action) + return -ENOMEM; + + action->dev_id = d; + action->name = devname; + action->free_on_release = 1; + + spin_lock_irqsave(&desc->lock, flags); + + retval = __setup_irq(desc, action); + if ( retval ) + { + xfree(action); + goto out; + } + + 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); + return retval; +} + /* * pirq event channels. We don't use these on ARM, instead we use the * features of the GIC to inject virtualised normal interrupts. diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 9489c04..0e6e325 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -153,6 +153,7 @@ #ifndef __ASSEMBLY__ #include <xen/device_tree.h> +#include <xen/irq.h> #define DT_MATCH_GIC DT_MATCH_COMPATIBLE("arm,cortex-a15-gic"), \ DT_MATCH_COMPATIBLE("arm,cortex-a7-gic") @@ -170,6 +171,9 @@ extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); extern void gic_route_dt_irq(const struct dt_irq *irq, const cpumask_t *cpu_mask, unsigned int priority); +extern void gic_route_irq_to_guest(struct domain *, struct irq_desc *desc, + bool_t level, const cpumask_t *cpu_mask, + unsigned int priority); extern void gic_route_ppis(void); extern void gic_route_spis(void); -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |