From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 17 Jul 2019 07:58:00 +0000 (+0900)
Subject: 4.19-stable patches
X-Git-Tag: v5.2.2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf4156a7dbe45c329e222465919bbccd58312411;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	regmap-irq-do-not-write-mask-register-if-mask_base-is-zero.patch
---

diff --git a/queue-4.19/regmap-irq-do-not-write-mask-register-if-mask_base-is-zero.patch b/queue-4.19/regmap-irq-do-not-write-mask-register-if-mask_base-is-zero.patch
new file mode 100644
index 00000000000..7c26ed77809
--- /dev/null
+++ b/queue-4.19/regmap-irq-do-not-write-mask-register-if-mask_base-is-zero.patch
@@ -0,0 +1,45 @@
+From 7151449fe7fa5962c6153355f9779d6be99e8e97 Mon Sep 17 00:00:00 2001
+From: Mark Zhang <markz@nvidia.com>
+Date: Mon, 14 Jan 2019 17:32:58 +0800
+Subject: regmap-irq: do not write mask register if mask_base is zero
+
+From: Mark Zhang <markz@nvidia.com>
+
+commit 7151449fe7fa5962c6153355f9779d6be99e8e97 upstream.
+
+If client have not provided the mask base register then do not
+write into the mask register.
+
+Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
+Signed-off-by: Jinyoung Park <jinyoungp@nvidia.com>
+Signed-off-by: Venkat Reddy Talla <vreddytalla@nvidia.com>
+Signed-off-by: Mark Zhang <markz@nvidia.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/base/regmap/regmap-irq.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/base/regmap/regmap-irq.c
++++ b/drivers/base/regmap/regmap-irq.c
+@@ -91,6 +91,9 @@ static void regmap_irq_sync_unlock(struc
+ 	 * suppress pointless writes.
+ 	 */
+ 	for (i = 0; i < d->chip->num_regs; i++) {
++		if (!d->chip->mask_base)
++			continue;
++
+ 		reg = d->chip->mask_base +
+ 			(i * map->reg_stride * d->irq_reg_stride);
+ 		if (d->chip->mask_invert) {
+@@ -526,6 +529,9 @@ int regmap_add_irq_chip(struct regmap *m
+ 	/* Mask all the interrupts by default */
+ 	for (i = 0; i < chip->num_regs; i++) {
+ 		d->mask_buf[i] = d->mask_buf_def[i];
++		if (!chip->mask_base)
++			continue;
++
+ 		reg = chip->mask_base +
+ 			(i * map->reg_stride * d->irq_reg_stride);
+ 		if (chip->mask_invert)
diff --git a/queue-4.19/series b/queue-4.19/series
index 40daaf8e1c9..a06f55399d9 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -40,3 +40,4 @@ s390-qdio-don-t-touch-the-dsci-in-tiqdio_add_input_queues.patch
 crypto-talitos-move-struct-talitos_edesc-into-talitos.h.patch
 crypto-talitos-fix-hash-on-sec1.patch
 crypto-nx-set-receive-window-credits-to-max-number-of-crbs-in-rxfifo.patch
+regmap-irq-do-not-write-mask-register-if-mask_base-is-zero.patch