linux-kernel - [tip:irq/urgent] irqchip/atmel-aic5: Use per chip mask caches in mask/unmask()

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-d32dc9aa10c739363c775baf4499416b2e0dc11f@git.kernel.org>
Date:	Tue, 22 Sep 2015 07:00:32 -0700
From:	tip-bot for Ludovic Desroches <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	ludovic.desroches@...el.com, alexandre.belloni@...e-electrons.com,
	Wenyou.Yang@...el.com, nicolas.ferre@...el.com, hpa@...or.com,
	jason@...edaemon.net, tglx@...utronix.de,
	linux-arm-kernel@...ts.infradead.org,
	boris.brezillon@...e-electrons.com, linux-kernel@...r.kernel.org,
	mingo@...nel.org, marc.zyngier@....com, sasha.levin@...cle.com
Subject: [tip:irq/urgent] irqchip/atmel-aic5:
  Use per chip mask caches in mask/unmask()

Commit-ID:  d32dc9aa10c739363c775baf4499416b2e0dc11f
Gitweb:     http://git.kernel.org/tip/d32dc9aa10c739363c775baf4499416b2e0dc11f
Author:     Ludovic Desroches <ludovic.desroches@...el.com>
AuthorDate: Mon, 21 Sep 2015 15:46:04 +0200
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Tue, 22 Sep 2015 15:55:51 +0200

irqchip/atmel-aic5: Use per chip mask caches in mask/unmask()

When masking/unmasking interrupts, mask_cache is updated and used later
for suspend/resume. Unfortunately, it always was the mask_cache
associated with the first irq chip which was updated. So when performing
resume, only irqs 0-31 could be enabled.

Fixes: b1479ebb7720 ("irqchip: atmel-aic: Add atmel AIC/AIC5 drivers")
Signed-off-by: Ludovic Desroches <ludovic.desroches@...el.com>
Cc: <sasha.levin@...cle.com>
Cc: <linux-arm-kernel@...ts.infradead.org>
Cc: <nicolas.ferre@...el.com>
Cc: <alexandre.belloni@...e-electrons.com>
Cc: <boris.brezillon@...e-electrons.com>
Cc: <Wenyou.Yang@...el.com>
Cc: <jason@...edaemon.net>
Cc: <marc.zyngier@....com>
Cc: stable@...r.kernel.org #3.18
Link: http://lkml.kernel.org/r/1442843173-2390-1-git-send-email-ludovic.desroches@atmel.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
 drivers/irqchip/irq-atmel-aic5.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c
index 9da9942..f6d6804 100644
--- a/drivers/irqchip/irq-atmel-aic5.c
+++ b/drivers/irqchip/irq-atmel-aic5.c
@@ -88,28 +88,36 @@ static void aic5_mask(struct irq_data *d)
 {
 	struct irq_domain *domain = d->domain;
 	struct irq_domain_chip_generic *dgc = domain->gc;
-	struct irq_chip_generic *gc = dgc->gc[0];
+	struct irq_chip_generic *bgc = dgc->gc[0];
+	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
 
-	/* Disable interrupt on AIC5 */
-	irq_gc_lock(gc);
+	/*
+	 * Disable interrupt on AIC5. We always take the lock of the
+	 * first irq chip as all chips share the same registers.
+	 */
+	irq_gc_lock(bgc);
 	irq_reg_writel(gc, d->hwirq, AT91_AIC5_SSR);
 	irq_reg_writel(gc, 1, AT91_AIC5_IDCR);
 	gc->mask_cache &= ~d->mask;
-	irq_gc_unlock(gc);
+	irq_gc_unlock(bgc);
 }
 
 static void aic5_unmask(struct irq_data *d)
 {
 	struct irq_domain *domain = d->domain;
 	struct irq_domain_chip_generic *dgc = domain->gc;
-	struct irq_chip_generic *gc = dgc->gc[0];
+	struct irq_chip_generic *bgc = dgc->gc[0];
+	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
 
-	/* Enable interrupt on AIC5 */
-	irq_gc_lock(gc);
+	/*
+	 * Enable interrupt on AIC5. We always take the lock of the
+	 * first irq chip as all chips share the same registers.
+	 */
+	irq_gc_lock(bgc);
 	irq_reg_writel(gc, d->hwirq, AT91_AIC5_SSR);
 	irq_reg_writel(gc, 1, AT91_AIC5_IECR);
 	gc->mask_cache |= d->mask;
-	irq_gc_unlock(gc);
+	irq_gc_unlock(bgc);
 }
 
 static int aic5_retrigger(struct irq_data *d)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/