Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 206d2b7b authored by Marco Felsch's avatar Marco Felsch Committed by Greg Kroah-Hartman
Browse files

usb: typec: tcpci: clear the fault status bit 



[ Upstream commit 23e60c8daf5ec2ab1b731310761b668745fcf6ed ]

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: 74e656d6 ("staging: typec: Type-C Port Controller Interface driver (tcpci)")
Reported-by: default avatar"Angus Ainslie (Purism)" <angus@akkea.ca>
Closes: https://lore.kernel.org/all/20190508002749.14816-2-angus@akkea.ca/


Reported-by: default avatarChristian Bach <christian.bach@scs.ch>
Closes: https://lore.kernel.org/regressions/ZR0P278MB07737E5F1D48632897D51AC3EB329@ZR0P278MB0773.CHEP278.PROD.OUTLOOK.COM/t/


Signed-off-by: default avatarMarco Felsch <m.felsch@pengutronix.de>
Signed-off-by: default avatarFabio Estevam <festevam@denx.de>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20230816172502.1155079-1-festevam@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 82442186

drivers/usb/typec/tcpm/tcpci.c

+4 −0
Original line number Diff line number Diff line
@@ -379,6 +379,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);

drivers/usb/typec/tcpm/tcpci.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
#define TCPC_POWER_STATUS_VBUS_PRES	BIT(2)



#define TCPC_FAULT_STATUS		0x1f

#define TCPC_FAULT_STATUS_ALL_REG_RST_TO_DEFAULT BIT(7)



#define TCPC_COMMAND			0x23

#define TCPC_CMD_WAKE_I2C		0x11