summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian A. Ehrhardt <lk@c--e.de>2024-04-01 23:05:15 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-04 15:17:13 +0200
commitce4c8d21054ae9396cd759fe6e8157b525616dc4 (patch)
tree8b70ffa9aaeb01ce73f315b568cac78e392e9518
parentusb: phy: MAINTAINERS: mark Freescale USB PHY as orphaned (diff)
downloadlinux-ce4c8d21054ae9396cd759fe6e8157b525616dc4.tar.xz
linux-ce4c8d21054ae9396cd759fe6e8157b525616dc4.zip
usb: typec: ucsi: Fix connector check on init
Fix issues when initially checking for a connector change: - Use the correct connector number not the entire CCI. - Call ->read under the PPM lock. - Remove a bogus READ_ONCE. Fixes: 808a8b9e0b87 ("usb: typec: ucsi: Check for notifications after init") Cc: stable@kernel.org Signed-off-by: Christian A. Ehrhardt <lk@c--e.de> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20240401210515.1902048-1-lk@c--e.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/typec/ucsi/ucsi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index 31d8a46ae5e7..bd6ae92aa39e 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -1736,11 +1736,13 @@ static int ucsi_init(struct ucsi *ucsi)
ucsi->connector = connector;
ucsi->ntfy = ntfy;
+ mutex_lock(&ucsi->ppm_lock);
ret = ucsi->ops->read(ucsi, UCSI_CCI, &cci, sizeof(cci));
+ mutex_unlock(&ucsi->ppm_lock);
if (ret)
return ret;
- if (UCSI_CCI_CONNECTOR(READ_ONCE(cci)))
- ucsi_connector_change(ucsi, cci);
+ if (UCSI_CCI_CONNECTOR(cci))
+ ucsi_connector_change(ucsi, UCSI_CCI_CONNECTOR(cci));
return 0;