Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Thomass Gleixner:
"A bugfix for the atmel aic5 irq chip driver which caches the wrong
data and thereby breaking resume"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/atmel-aic5: Use per chip mask caches in mask/unmask()
+16
-8
+16
-8
drivers/irqchip/irq-atmel-aic5.c
+16
-8
drivers/irqchip/irq-atmel-aic5.c
···
88
88
{
89
89
struct irq_domain *domain = d->domain;
90
90
struct irq_domain_chip_generic *dgc = domain->gc;
91
-
struct irq_chip_generic *gc = dgc->gc[0];
91
+
struct irq_chip_generic *bgc = dgc->gc[0];
92
+
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
92
93
93
-
/* Disable interrupt on AIC5 */
94
-
irq_gc_lock(gc);
94
+
/*
95
+
* Disable interrupt on AIC5. We always take the lock of the
96
+
* first irq chip as all chips share the same registers.
97
+
*/
98
+
irq_gc_lock(bgc);
95
99
irq_reg_writel(gc, d->hwirq, AT91_AIC5_SSR);
96
100
irq_reg_writel(gc, 1, AT91_AIC5_IDCR);
97
101
gc->mask_cache &= ~d->mask;
98
-
irq_gc_unlock(gc);
102
+
irq_gc_unlock(bgc);
99
103
}
100
104
101
105
static void aic5_unmask(struct irq_data *d)
102
106
{
103
107
struct irq_domain *domain = d->domain;
104
108
struct irq_domain_chip_generic *dgc = domain->gc;
105
-
struct irq_chip_generic *gc = dgc->gc[0];
109
+
struct irq_chip_generic *bgc = dgc->gc[0];
110
+
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
106
111
107
-
/* Enable interrupt on AIC5 */
108
-
irq_gc_lock(gc);
112
+
/*
113
+
* Enable interrupt on AIC5. We always take the lock of the
114
+
* first irq chip as all chips share the same registers.
115
+
*/
116
+
irq_gc_lock(bgc);
109
117
irq_reg_writel(gc, d->hwirq, AT91_AIC5_SSR);
110
118
irq_reg_writel(gc, 1, AT91_AIC5_IECR);
111
119
gc->mask_cache |= d->mask;
112
-
irq_gc_unlock(gc);
120
+
irq_gc_unlock(bgc);
113
121
}
114
122
115
123
static int aic5_retrigger(struct irq_data *d)