[PATCH v2] usb: typec: ucsi: Retry if notification enable timesout
From: Mark Pearson
Date: Wed Nov 04 2026 - 19:53:48 EST
Found on Thinkpad E14 G8.
When UCSI notifications are enabled the FW does not ack the enablement
itself. Future commands will be acked correctly.
If this happens try enablement again and confirm acks are working
correctly.
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Pearson <mpearson-lenovo@xxxxxxxxx>
---
Changes in v2:
- No functional change. Rebased as requested
= Added Heikki's review tag
drivers/usb/typec/ucsi/ucsi.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index 5aab8ab9f013..6633ad6658f2 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -2095,6 +2095,12 @@ static int ucsi_init(struct ucsi *ucsi)
ntfy = UCSI_ENABLE_NTFY_CMD_COMPLETE | UCSI_ENABLE_NTFY_ERROR;
command = UCSI_SET_NOTIFICATION_ENABLE | ntfy;
ret = ucsi_send_command(ucsi, command, NULL, 0);
+ /*
+ * Some FW may not ack the notification enable the first time.
+ * If this happens, repeat to confirm it is actually working
+ */
+ if (ret == -ETIMEDOUT)
+ ret = ucsi_send_command(ucsi, command, NULL, 0);
if (ret < 0)
goto err_reset;
--
2.43.0