6.4-stable patches

added patches:
	usb-typec-tcpci-clear-the-fault-status-bit.patch

diff --git a/queue-6.4/series b/queue-6.4/series
index 430417ef78c652180472792a9c9c2c642c2b2158..2a3590971894ed4337fc3667ea40241b016e623a 100644 (file)
--- a/queue-6.4/series
+++ b/queue-6.4/series
@@ -28,3 +28,4 @@ fsi-master-ast-cf-add-module_firmware-macro.patch
 tcpm-avoid-soft-reset-when-partner-does-not-support-get_status.patch
 dt-bindings-sc16is7xx-add-property-to-change-gpio-function.patch
 nilfs2-fix-warning-in-mark_buffer_dirty-due-to-discarded-buffer-reuse.patch
+usb-typec-tcpci-clear-the-fault-status-bit.patch

diff --git a/queue-6.4/usb-typec-tcpci-clear-the-fault-status-bit.patch b/queue-6.4/usb-typec-tcpci-clear-the-fault-status-bit.patch
new file mode 100644 (file)
index 0000000..6c46fc3
--- /dev/null
+++ b/queue-6.4/usb-typec-tcpci-clear-the-fault-status-bit.patch
@@ -0,0 +1,57 @@
+From 23e60c8daf5ec2ab1b731310761b668745fcf6ed Mon Sep 17 00:00:00 2001
+From: Marco Felsch <m.felsch@pengutronix.de>
+Date: Wed, 16 Aug 2023 14:25:02 -0300
+Subject: usb: typec: tcpci: clear the fault status bit
+
+From: Marco Felsch <m.felsch@pengutronix.de>
+
+commit 23e60c8daf5ec2ab1b731310761b668745fcf6ed upstream.
+
+According the "USB Type-C Port Controller Interface Specification v2.0"
+the TCPC sets the fault status register bit-7
+(AllRegistersResetToDefault) once the registers have been reset to
+their default values.
+
+This triggers an alert(-irq) on PTN5110 devices albeit we do mask the
+fault-irq, which may cause a kernel hang. Fix this generically by writing
+a one to the corresponding bit-7.
+
+Cc: stable@vger.kernel.org
+Fixes: 74e656d6b055 ("staging: typec: Type-C Port Controller Interface driver (tcpci)")
+Reported-by: "Angus Ainslie (Purism)" <angus@akkea.ca>
+Closes: https://lore.kernel.org/all/20190508002749.14816-2-angus@akkea.ca/
+Reported-by: Christian Bach <christian.bach@scs.ch>
+Closes: https://lore.kernel.org/regressions/ZR0P278MB07737E5F1D48632897D51AC3EB329@ZR0P278MB0773.CHEP278.PROD.OUTLOOK.COM/t/
+Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
+Signed-off-by: Fabio Estevam <festevam@denx.de>
+Reviewed-by: Guenter Roeck <linux@roeck-us.net>
+Link: https://lore.kernel.org/r/20230816172502.1155079-1-festevam@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/typec/tcpm/tcpci.c |    4 ++++
+ include/linux/usb/tcpci.h      |    1 +
+ 2 files changed, 5 insertions(+)
+
+--- a/drivers/usb/typec/tcpm/tcpci.c
++++ b/drivers/usb/typec/tcpm/tcpci.c
+@@ -602,6 +602,10 @@ static int tcpci_init(struct tcpc_dev *t
+       if (time_after(jiffies, timeout))
+               return -ETIMEDOUT;
+ 
++      ret = tcpci_write16(tcpci, TCPC_FAULT_STATUS, TCPC_FAULT_STATUS_ALL_REG_RST_TO_DEFAULT);
++      if (ret < 0)
++              return ret;
++
+       /* Handle vendor init */
+       if (tcpci->data->init) {
+               ret = tcpci->data->init(tcpci, tcpci->data);
+--- a/include/linux/usb/tcpci.h
++++ b/include/linux/usb/tcpci.h
+@@ -103,6 +103,7 @@
+ #define TCPC_POWER_STATUS_SINKING_VBUS        BIT(0)
+ 
+ #define TCPC_FAULT_STATUS             0x1f
++#define TCPC_FAULT_STATUS_ALL_REG_RST_TO_DEFAULT BIT(7)
+ 
+ #define TCPC_ALERT_EXTENDED           0x21
+