]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: typec: tcpci: clear the fault status bit
authorMarco Felsch <m.felsch@pengutronix.de>
Wed, 16 Aug 2023 17:25:02 +0000 (14:25 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 Sep 2023 20:28:40 +0000 (21:28 +0100)
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: Fabio Estevam <festevam@denx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/tcpm/tcpci.c
include/linux/usb/tcpci.h

index 1a6aea9edc7856f4b0814954a4c567ca40d6ce2b..a7b0134d382b8fab7a04379c33dd5eba6a72cc19 100644 (file)
@@ -615,6 +615,10 @@ static int tcpci_init(struct tcpc_dev *tcpc)
        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);
index 20c0bedb8ec86ccd647aedffedef33ebe31b8eef..f7c01ce879a282cc0234fc0368c749f0c7535744 100644 (file)
 #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