Commit 805f0c26 authored by Boris Brezillon's avatar Boris Brezillon Committed by Greg Kroah-Hartman

irqchip/atmel-aic: Fix potential deadlock in ->xlate()

commit 5eb0d6eb upstream.

aic5_irq_domain_xlate() and aic_irq_domain_xlate() take the generic chip
lock without disabling interrupts, which can lead to a deadlock if an
interrupt occurs while the lock is held in one of these functions.

Replace irq_gc_{lock,unlock}() calls by
irq_gc_{lock_irqsave,unlock_irqrestore}() ones to prevent this bug from
happening.

Fixes: b1479ebb ("irqchip: atmel-aic: Add atmel AIC/AIC5 drivers")
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Link: http://lkml.kernel.org/r/1473775109-4192-2-git-send-email-boris.brezillon@free-electrons.comSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17b54ccf
...@@ -176,6 +176,7 @@ static int aic_irq_domain_xlate(struct irq_domain *d, ...@@ -176,6 +176,7 @@ static int aic_irq_domain_xlate(struct irq_domain *d,
{ {
struct irq_domain_chip_generic *dgc = d->gc; struct irq_domain_chip_generic *dgc = d->gc;
struct irq_chip_generic *gc; struct irq_chip_generic *gc;
unsigned long flags;
unsigned smr; unsigned smr;
int idx; int idx;
int ret; int ret;
...@@ -194,12 +195,12 @@ static int aic_irq_domain_xlate(struct irq_domain *d, ...@@ -194,12 +195,12 @@ static int aic_irq_domain_xlate(struct irq_domain *d,
gc = dgc->gc[idx]; gc = dgc->gc[idx];
irq_gc_lock(gc); irq_gc_lock_irqsave(gc, flags);
smr = irq_reg_readl(gc, AT91_AIC_SMR(*out_hwirq)); smr = irq_reg_readl(gc, AT91_AIC_SMR(*out_hwirq));
ret = aic_common_set_priority(intspec[2], &smr); ret = aic_common_set_priority(intspec[2], &smr);
if (!ret) if (!ret)
irq_reg_writel(gc, smr, AT91_AIC_SMR(*out_hwirq)); irq_reg_writel(gc, smr, AT91_AIC_SMR(*out_hwirq));
irq_gc_unlock(gc); irq_gc_unlock_irqrestore(gc, flags);
return ret; return ret;
} }
......
...@@ -258,6 +258,7 @@ static int aic5_irq_domain_xlate(struct irq_domain *d, ...@@ -258,6 +258,7 @@ static int aic5_irq_domain_xlate(struct irq_domain *d,
unsigned int *out_type) unsigned int *out_type)
{ {
struct irq_chip_generic *bgc = irq_get_domain_generic_chip(d, 0); struct irq_chip_generic *bgc = irq_get_domain_generic_chip(d, 0);
unsigned long flags;
unsigned smr; unsigned smr;
int ret; int ret;
...@@ -269,13 +270,13 @@ static int aic5_irq_domain_xlate(struct irq_domain *d, ...@@ -269,13 +270,13 @@ static int aic5_irq_domain_xlate(struct irq_domain *d,
if (ret) if (ret)
return ret; return ret;
irq_gc_lock(bgc); irq_gc_lock_irqsave(bgc, flags);
irq_reg_writel(bgc, *out_hwirq, AT91_AIC5_SSR); irq_reg_writel(bgc, *out_hwirq, AT91_AIC5_SSR);
smr = irq_reg_readl(bgc, AT91_AIC5_SMR); smr = irq_reg_readl(bgc, AT91_AIC5_SMR);
ret = aic_common_set_priority(intspec[2], &smr); ret = aic_common_set_priority(intspec[2], &smr);
if (!ret) if (!ret)
irq_reg_writel(bgc, intspec[2] | smr, AT91_AIC5_SMR); irq_reg_writel(bgc, intspec[2] | smr, AT91_AIC5_SMR);
irq_gc_unlock(bgc); irq_gc_unlock_irqrestore(bgc, flags);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment