Some chips have weird bit mask access patterns instead of the linear
you expect. Allow them to calculate the cached mask themself.

Signed-off-by: Thomas Gleixner <t...@linutronix.de>
---
 include/linux/irq.h       |    3 +++
 kernel/irq/generic-chip.c |    8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

Index: linux-2.6/include/linux/irq.h
===================================================================
--- linux-2.6.orig/include/linux/irq.h
+++ linux-2.6/include/linux/irq.h
@@ -296,6 +296,7 @@ static inline irq_hw_number_t irqd_to_hw
  * @irq_suspend:       function called from core code on suspend once per chip
  * @irq_resume:                function called from core code on resume once 
per chip
  * @irq_pm_shutdown:   function called from core code on shutdown once per chip
+ * @irq_calc_mask:     Optional function to set irq_data.mask for special cases
  * @irq_print_chip:    optional to print special chip info in show_interrupts
  * @flags:             chip specific flags
  */
@@ -327,6 +328,8 @@ struct irq_chip {
        void            (*irq_resume)(struct irq_data *data);
        void            (*irq_pm_shutdown)(struct irq_data *data);
 
+       void            (*irq_calc_mask)(struct irq_data *data);
+
        void            (*irq_print_chip)(struct irq_data *data, struct 
seq_file *p);
 
        unsigned long   flags;
Index: linux-2.6/kernel/irq/generic-chip.c
===================================================================
--- linux-2.6.orig/kernel/irq/generic-chip.c
+++ linux-2.6/kernel/irq/generic-chip.c
@@ -240,6 +240,7 @@ void irq_setup_generic_chip(struct irq_c
                            unsigned int set)
 {
        struct irq_chip_type *ct = gc->chip_types;
+       struct irq_chip *chip = &ct->chip;
        unsigned int i;
        u32 *mskptr = &gc->mask_cache, mskreg = ct->regs.mask;
 
@@ -267,9 +268,12 @@ void irq_setup_generic_chip(struct irq_c
                if (!(flags & IRQ_GC_NO_MASK)) {
                        struct irq_data *d = irq_get_irq_data(i);
 
-                       d->mask = 1 << (i - gc->irq_base);
+                       if (chip->irq_calc_mask)
+                               chip->irq_calc_mask(d);
+                       else
+                               d->mask = 1 << (i - gc->irq_base);
                }
-               irq_set_chip_and_handler(i, &ct->chip, ct->handler);
+               irq_set_chip_and_handler(i, chip, ct->handler);
                irq_set_chip_data(i, gc);
                irq_modify_status(i, clr, set);
        }


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to