lkml.org 
[lkml]   [2011]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/9] irq: convert generic-chip to use irq_domain
    Date
    From: Rob Herring <rob.herring@calxeda.com>

    Add irq domain support to irq generic-chip. This enables users of
    generic-chip to support dynamic irq assignment needed for DT interrupt
    binding. Users must be converted to use irq_data.hwirq for determining
    local interrupt numbers rather than using the Linux irq number.

    irq_base is kept for now as there are a few users of it. Once they
    are converted to use the irq domain, it can be removed.

    Signed-off-by: Rob Herring <rob.herring@calxeda.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    ---
    include/linux/irq.h | 2 +-
    kernel/irq/Kconfig | 1 +
    kernel/irq/generic-chip.c | 57 ++++++++++++++++++++++++++++----------------
    3 files changed, 38 insertions(+), 22 deletions(-)

    diff --git a/include/linux/irq.h b/include/linux/irq.h
    index bff29c5..9ba8a30 100644
    --- a/include/linux/irq.h
    +++ b/include/linux/irq.h
    @@ -664,7 +664,7 @@ struct irq_chip_generic {
    raw_spinlock_t lock;
    void __iomem *reg_base;
    unsigned int irq_base;
    - unsigned int irq_cnt;
    + struct irq_domain *domain;
    u32 mask_cache;
    u32 type_cache;
    u32 polarity_cache;
    diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
    index 5a38bf4..861f2fe 100644
    --- a/kernel/irq/Kconfig
    +++ b/kernel/irq/Kconfig
    @@ -51,6 +51,7 @@ config IRQ_EDGE_EOI_HANDLER
    # Generic configurable interrupt chip implementation
    config GENERIC_IRQ_CHIP
    bool
    + select IRQ_DOMAIN

    # Generic irq_domain hw <--> linux irq number translation
    config IRQ_DOMAIN
    diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c
    index c89295a..e32fac7 100644
    --- a/kernel/irq/generic-chip.c
    +++ b/kernel/irq/generic-chip.c
    @@ -5,6 +5,7 @@
    */
    #include <linux/io.h>
    #include <linux/irq.h>
    +#include <linux/irqdomain.h>
    #include <linux/slab.h>
    #include <linux/export.h>
    #include <linux/interrupt.h>
    @@ -39,7 +40,7 @@ void irq_gc_noop(struct irq_data *d)
    void irq_gc_mask_disable_reg(struct irq_data *d)
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    - u32 mask = 1 << (d->irq - gc->irq_base);
    + u32 mask = 1 << d->hwirq;

    irq_gc_lock(gc);
    irq_reg_writel(mask, gc->reg_base + cur_regs(d)->disable);
    @@ -57,7 +58,7 @@ void irq_gc_mask_disable_reg(struct irq_data *d)
    void irq_gc_mask_set_bit(struct irq_data *d)
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    - u32 mask = 1 << (d->irq - gc->irq_base);
    + u32 mask = 1 << d->hwirq;

    irq_gc_lock(gc);
    gc->mask_cache |= mask;
    @@ -75,7 +76,7 @@ void irq_gc_mask_set_bit(struct irq_data *d)
    void irq_gc_mask_clr_bit(struct irq_data *d)
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    - u32 mask = 1 << (d->irq - gc->irq_base);
    + u32 mask = 1 << d->hwirq;

    irq_gc_lock(gc);
    gc->mask_cache &= ~mask;
    @@ -93,7 +94,7 @@ void irq_gc_mask_clr_bit(struct irq_data *d)
    void irq_gc_unmask_enable_reg(struct irq_data *d)
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    - u32 mask = 1 << (d->irq - gc->irq_base);
    + u32 mask = 1 << d->hwirq;

    irq_gc_lock(gc);
    irq_reg_writel(mask, gc->reg_base + cur_regs(d)->enable);
    @@ -108,7 +109,7 @@ void irq_gc_unmask_enable_reg(struct irq_data *d)
    void irq_gc_ack_set_bit(struct irq_data *d)
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    - u32 mask = 1 << (d->irq - gc->irq_base);
    + u32 mask = 1 << d->hwirq;

    irq_gc_lock(gc);
    irq_reg_writel(mask, gc->reg_base + cur_regs(d)->ack);
    @@ -122,7 +123,7 @@ void irq_gc_ack_set_bit(struct irq_data *d)
    void irq_gc_ack_clr_bit(struct irq_data *d)
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    - u32 mask = ~(1 << (d->irq - gc->irq_base));
    + u32 mask = ~(1 << d->hwirq);

    irq_gc_lock(gc);
    irq_reg_writel(mask, gc->reg_base + cur_regs(d)->ack);
    @@ -136,7 +137,7 @@ void irq_gc_ack_clr_bit(struct irq_data *d)
    void irq_gc_mask_disable_reg_and_ack(struct irq_data *d)
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    - u32 mask = 1 << (d->irq - gc->irq_base);
    + u32 mask = 1 << d->hwirq;

    irq_gc_lock(gc);
    irq_reg_writel(mask, gc->reg_base + cur_regs(d)->mask);
    @@ -151,7 +152,7 @@ void irq_gc_mask_disable_reg_and_ack(struct irq_data *d)
    void irq_gc_eoi(struct irq_data *d)
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    - u32 mask = 1 << (d->irq - gc->irq_base);
    + u32 mask = 1 << d->hwirq;

    irq_gc_lock(gc);
    irq_reg_writel(mask, gc->reg_base + cur_regs(d)->eoi);
    @@ -169,7 +170,7 @@ void irq_gc_eoi(struct irq_data *d)
    int irq_gc_set_wake(struct irq_data *d, unsigned int on)
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    - u32 mask = 1 << (d->irq - gc->irq_base);
    + u32 mask = 1 << d->hwirq;

    if (!(mask & gc->wake_enabled))
    return -EINVAL;
    @@ -201,10 +202,13 @@ irq_alloc_generic_chip(const char *name, int num_ct, unsigned int irq_base,
    struct irq_chip_generic *gc;
    unsigned long sz = sizeof(*gc) + num_ct * sizeof(struct irq_chip_type);

    - gc = kzalloc(sz, GFP_KERNEL);
    + gc = kzalloc(sz + sizeof(struct irq_domain), GFP_KERNEL);
    if (gc) {
    raw_spin_lock_init(&gc->lock);
    gc->num_ct = num_ct;
    + gc->domain = (void *)gc + sz;
    + gc->domain->irq_base = irq_base;
    + gc->domain->ops = &irq_domain_simple_ops;
    gc->irq_base = irq_base;
    gc->reg_base = reg_base;
    gc->chip_types->chip.name = name;
    @@ -237,7 +241,7 @@ void irq_setup_generic_chip(struct irq_chip_generic *gc, u32 msk,
    unsigned int set)
    {
    struct irq_chip_type *ct = gc->chip_types;
    - unsigned int i;
    + unsigned int i, irq;

    raw_spin_lock(&gc_lock);
    list_add_tail(&gc->list, &gc_list);
    @@ -247,18 +251,26 @@ void irq_setup_generic_chip(struct irq_chip_generic *gc, u32 msk,
    if (flags & IRQ_GC_INIT_MASK_CACHE)
    gc->mask_cache = irq_reg_readl(gc->reg_base + ct->regs.mask);

    - for (i = gc->irq_base; msk; msk >>= 1, i++) {
    + gc->domain->nr_irq = fls(msk);
    + if ((int)gc->domain->irq_base == -1)
    + gc->domain->irq_base = irq_alloc_descs(-1, 1,
    + gc->domain->nr_irq,
    + numa_node_id());
    +
    + irq_domain_add(gc->domain);
    +
    + for (i = gc->domain->hwirq_base; msk; msk >>= 1, i++) {
    if (!(msk & 0x01))
    continue;

    + irq = irq_domain_to_irq(gc->domain, i);
    if (flags & IRQ_GC_INIT_NESTED_LOCK)
    - irq_set_lockdep_class(i, &irq_nested_lock_class);
    + irq_set_lockdep_class(irq, &irq_nested_lock_class);

    - irq_set_chip_and_handler(i, &ct->chip, ct->handler);
    - irq_set_chip_data(i, gc);
    - irq_modify_status(i, clr, set);
    + irq_set_chip_and_handler(irq, &ct->chip, ct->handler);
    + irq_set_chip_data(irq, gc);
    + irq_modify_status(irq, clr, set);
    }
    - gc->irq_cnt = i - gc->irq_base;
    }
    EXPORT_SYMBOL_GPL(irq_setup_generic_chip);

    @@ -298,7 +310,7 @@ EXPORT_SYMBOL_GPL(irq_setup_alt_chip);
    void irq_remove_generic_chip(struct irq_chip_generic *gc, u32 msk,
    unsigned int clr, unsigned int set)
    {
    - unsigned int i = gc->irq_base;
    + unsigned int i = gc->domain->irq_base;

    raw_spin_lock(&gc_lock);
    list_del(&gc->list);
    @@ -324,9 +336,10 @@ static int irq_gc_suspend(void)

    list_for_each_entry(gc, &gc_list, list) {
    struct irq_chip_type *ct = gc->chip_types;
    + struct irq_domain *d = gc->domain;

    if (ct->chip.irq_suspend)
    - ct->chip.irq_suspend(irq_get_irq_data(gc->irq_base));
    + ct->chip.irq_suspend(irq_get_irq_data(d->irq_base));
    }
    return 0;
    }
    @@ -337,9 +350,10 @@ static void irq_gc_resume(void)

    list_for_each_entry(gc, &gc_list, list) {
    struct irq_chip_type *ct = gc->chip_types;
    + struct irq_domain *d = gc->domain;

    if (ct->chip.irq_resume)
    - ct->chip.irq_resume(irq_get_irq_data(gc->irq_base));
    + ct->chip.irq_resume(irq_get_irq_data(d->irq_base));
    }
    }
    #else
    @@ -353,9 +367,10 @@ static void irq_gc_shutdown(void)

    list_for_each_entry(gc, &gc_list, list) {
    struct irq_chip_type *ct = gc->chip_types;
    + struct irq_domain *d = gc->domain;

    if (ct->chip.irq_pm_shutdown)
    - ct->chip.irq_pm_shutdown(irq_get_irq_data(gc->irq_base));
    + ct->chip.irq_pm_shutdown(irq_get_irq_data(d->irq_base));
    }
    }

    --
    1.7.5.4


    \
     
     \ /
      Last update: 2011-12-14 16:33    [W:0.047 / U:1.524 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site