From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 6 May 2023 06:51:48 +0000 (+0900)
Subject: 4.14-stable patches
X-Git-Tag: v5.15.111~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8eb5a45c620568cfd29fb1a48ae91198be889f72;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	i2c-omap-fix-standard-mode-false-ack-readings.patch
---

diff --git a/queue-4.14/i2c-omap-fix-standard-mode-false-ack-readings.patch b/queue-4.14/i2c-omap-fix-standard-mode-false-ack-readings.patch
new file mode 100644
index 00000000000..a8c40451e47
--- /dev/null
+++ b/queue-4.14/i2c-omap-fix-standard-mode-false-ack-readings.patch
@@ -0,0 +1,37 @@
+From c770657bd2611b077ec1e7b1fe6aa92f249399bd Mon Sep 17 00:00:00 2001
+From: Reid Tonking <reidt@ti.com>
+Date: Wed, 26 Apr 2023 14:49:56 -0500
+Subject: i2c: omap: Fix standard mode false ACK readings
+
+From: Reid Tonking <reidt@ti.com>
+
+commit c770657bd2611b077ec1e7b1fe6aa92f249399bd upstream.
+
+Using standard mode, rare false ACK responses were appearing with
+i2cdetect tool. This was happening due to NACK interrupt triggering
+ISR thread before register access interrupt was ready. Removing the
+NACK interrupt's ability to trigger ISR thread lets register access
+ready interrupt do this instead.
+
+Cc: <stable@vger.kernel.org> # v3.7+
+Fixes: 3b2f8f82dad7 ("i2c: omap: switch to threaded IRQ support")
+Signed-off-by: Reid Tonking <reidt@ti.com>
+Acked-by: Vignesh Raghavendra <vigneshr@ti.com>
+Reviewed-by: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Wolfram Sang <wsa@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/i2c/busses/i2c-omap.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/i2c/busses/i2c-omap.c
++++ b/drivers/i2c/busses/i2c-omap.c
+@@ -1030,7 +1030,7 @@ omap_i2c_isr(int irq, void *dev_id)
+ 	u16 stat;
+ 
+ 	stat = omap_i2c_read_reg(omap, OMAP_I2C_STAT_REG);
+-	mask = omap_i2c_read_reg(omap, OMAP_I2C_IE_REG);
++	mask = omap_i2c_read_reg(omap, OMAP_I2C_IE_REG) & ~OMAP_I2C_STAT_NACK;
+ 
+ 	if (stat & mask)
+ 		ret = IRQ_WAKE_THREAD;
diff --git a/queue-4.14/series b/queue-4.14/series
index 0f2ea5537bd..f4bd698ee43 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -9,3 +9,4 @@ staging-iio-resolver-ads1210-fix-config-mode.patch
 mips-fw-allow-firmware-to-pass-a-empty-env.patch
 ring-buffer-sync-irq-works-before-buffer-destruction.patch
 reiserfs-add-security-prefix-to-xattr-name-in-reiserfs_security_write.patch
+i2c-omap-fix-standard-mode-false-ack-readings.patch