* [PATCH v1] usb: typec: ucsi: allow retries of ucsi_resume_work
@ 2026-08-18 20:57 Jameson Thies
2026-08-18 21:16 ` Benson Leung
0 siblings, 1 reply; 2+ messages in thread
From: Jameson Thies @ 2026-08-18 20:57 UTC (permalink / raw)
To: heikki.krogerus, linux-usb, linux-kernel
Cc: dmitry.baryshkov, bleung, gregkh, akuchynski, abhishekpandit,
Jameson Thies
On resume, the UCSI driver will re-enable notifications by sending
SET_NOTIFICATION_ENABLE. The LPM/PPM may be busy during system
resume causing SET_NOTIFICATION_ENABLE to fail and preventing the UCSI
driver from receiving connection status changes.
Change resume work to a delayed workqueue to allow retries on failed
SET_NOTIFICATION_ENABLED commands. Additionally, cancel resume work
on suspend to prevent pending resume commands from impacting suspend.
Signed-off-by: Jameson Thies <jthies@google.com>
---
drivers/usb/typec/ucsi/ucsi.c | 18 +++++++++++++-----
drivers/usb/typec/ucsi/ucsi.h | 3 ++-
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index bef3f9b71d71..5c67f0990dd3 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -2158,7 +2158,7 @@ static int ucsi_init(struct ucsi *ucsi)
static void ucsi_resume_work(struct work_struct *work)
{
- struct ucsi *ucsi = container_of(work, struct ucsi, resume_work);
+ struct ucsi *ucsi = container_of(to_delayed_work(work), struct ucsi, resume_work);
struct ucsi_connector *con;
u64 command;
int ret;
@@ -2167,6 +2167,11 @@ static void ucsi_resume_work(struct work_struct *work)
command = UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy;
ret = ucsi_send_command(ucsi, command, NULL, 0);
if (ret < 0) {
+ if (++ucsi->resume_retries < 5) {
+ queue_delayed_work(system_long_wq, &ucsi->resume_work,
+ msecs_to_jiffies(500));
+ return;
+ }
dev_err(ucsi->dev, "failed to re-enable notifications (%d)\n", ret);
return;
}
@@ -2187,6 +2192,7 @@ int ucsi_suspend(struct ucsi *ucsi)
* EC is stopped for suspend; state is re-read on resume.
*/
cancel_delayed_work_sync(&ucsi->work);
+ cancel_delayed_work_sync(&ucsi->resume_work);
if (!ucsi->connector)
return 0;
@@ -2200,8 +2206,10 @@ EXPORT_SYMBOL_GPL(ucsi_suspend);
int ucsi_resume(struct ucsi *ucsi)
{
- if (ucsi->connector)
- queue_work(system_long_wq, &ucsi->resume_work);
+ if (ucsi->connector) {
+ ucsi->resume_retries = 0;
+ queue_delayed_work(system_long_wq, &ucsi->resume_work, 0);
+ }
return 0;
}
EXPORT_SYMBOL_GPL(ucsi_resume);
@@ -2299,7 +2307,7 @@ struct ucsi *ucsi_create(struct device *dev, const struct ucsi_operations *ops)
if (!ucsi)
return ERR_PTR(-ENOMEM);
- INIT_WORK(&ucsi->resume_work, ucsi_resume_work);
+ INIT_DELAYED_WORK(&ucsi->resume_work, ucsi_resume_work);
INIT_DELAYED_WORK(&ucsi->work, ucsi_init_work);
mutex_init(&ucsi->ppm_lock);
init_completion(&ucsi->complete);
@@ -2365,7 +2373,7 @@ void ucsi_unregister(struct ucsi *ucsi)
/* Make sure that we are not in the middle of driver initialization */
cancel_delayed_work_sync(&ucsi->work);
- cancel_work_sync(&ucsi->resume_work);
+ cancel_delayed_work_sync(&ucsi->resume_work);
ucsi_debugfs_unregister(ucsi);
diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
index dc594388dcd0..1996f04ed5e6 100644
--- a/drivers/usb/typec/ucsi/ucsi.h
+++ b/drivers/usb/typec/ucsi/ucsi.h
@@ -484,7 +484,8 @@ struct ucsi {
struct ucsi_connector *connector;
struct ucsi_debugfs_entry *debugfs;
- struct work_struct resume_work;
+ struct delayed_work resume_work;
+ int resume_retries;
struct delayed_work work;
int work_count;
#define UCSI_ROLE_SWITCH_RETRY_PER_HZ 10
base-commit: bdab5605259ba5d6ff927c1a85cc83eb3ecfdacc
--
2.55.0.737.g08866a6d13-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v1] usb: typec: ucsi: allow retries of ucsi_resume_work
2026-08-18 20:57 [PATCH v1] usb: typec: ucsi: allow retries of ucsi_resume_work Jameson Thies
@ 2026-08-18 21:16 ` Benson Leung
0 siblings, 0 replies; 2+ messages in thread
From: Benson Leung @ 2026-08-18 21:16 UTC (permalink / raw)
To: Jameson Thies
Cc: heikki.krogerus, linux-usb, linux-kernel, dmitry.baryshkov,
bleung, gregkh, akuchynski, abhishekpandit
[-- Attachment #1: Type: text/plain, Size: 3855 bytes --]
On Tue, Aug 18, 2026 at 08:57:17PM +0000, Jameson Thies wrote:
> On resume, the UCSI driver will re-enable notifications by sending
> SET_NOTIFICATION_ENABLE. The LPM/PPM may be busy during system
> resume causing SET_NOTIFICATION_ENABLE to fail and preventing the UCSI
> driver from receiving connection status changes.
>
> Change resume work to a delayed workqueue to allow retries on failed
> SET_NOTIFICATION_ENABLED commands. Additionally, cancel resume work
> on suspend to prevent pending resume commands from impacting suspend.
>
> Signed-off-by: Jameson Thies <jthies@google.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
> ---
> drivers/usb/typec/ucsi/ucsi.c | 18 +++++++++++++-----
> drivers/usb/typec/ucsi/ucsi.h | 3 ++-
> 2 files changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
> index bef3f9b71d71..5c67f0990dd3 100644
> --- a/drivers/usb/typec/ucsi/ucsi.c
> +++ b/drivers/usb/typec/ucsi/ucsi.c
> @@ -2158,7 +2158,7 @@ static int ucsi_init(struct ucsi *ucsi)
>
> static void ucsi_resume_work(struct work_struct *work)
> {
> - struct ucsi *ucsi = container_of(work, struct ucsi, resume_work);
> + struct ucsi *ucsi = container_of(to_delayed_work(work), struct ucsi, resume_work);
> struct ucsi_connector *con;
> u64 command;
> int ret;
> @@ -2167,6 +2167,11 @@ static void ucsi_resume_work(struct work_struct *work)
> command = UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy;
> ret = ucsi_send_command(ucsi, command, NULL, 0);
> if (ret < 0) {
> + if (++ucsi->resume_retries < 5) {
> + queue_delayed_work(system_long_wq, &ucsi->resume_work,
> + msecs_to_jiffies(500));
> + return;
> + }
> dev_err(ucsi->dev, "failed to re-enable notifications (%d)\n", ret);
> return;
> }
> @@ -2187,6 +2192,7 @@ int ucsi_suspend(struct ucsi *ucsi)
> * EC is stopped for suspend; state is re-read on resume.
> */
> cancel_delayed_work_sync(&ucsi->work);
> + cancel_delayed_work_sync(&ucsi->resume_work);
>
> if (!ucsi->connector)
> return 0;
> @@ -2200,8 +2206,10 @@ EXPORT_SYMBOL_GPL(ucsi_suspend);
>
> int ucsi_resume(struct ucsi *ucsi)
> {
> - if (ucsi->connector)
> - queue_work(system_long_wq, &ucsi->resume_work);
> + if (ucsi->connector) {
> + ucsi->resume_retries = 0;
> + queue_delayed_work(system_long_wq, &ucsi->resume_work, 0);
> + }
> return 0;
> }
> EXPORT_SYMBOL_GPL(ucsi_resume);
> @@ -2299,7 +2307,7 @@ struct ucsi *ucsi_create(struct device *dev, const struct ucsi_operations *ops)
> if (!ucsi)
> return ERR_PTR(-ENOMEM);
>
> - INIT_WORK(&ucsi->resume_work, ucsi_resume_work);
> + INIT_DELAYED_WORK(&ucsi->resume_work, ucsi_resume_work);
> INIT_DELAYED_WORK(&ucsi->work, ucsi_init_work);
> mutex_init(&ucsi->ppm_lock);
> init_completion(&ucsi->complete);
> @@ -2365,7 +2373,7 @@ void ucsi_unregister(struct ucsi *ucsi)
>
> /* Make sure that we are not in the middle of driver initialization */
> cancel_delayed_work_sync(&ucsi->work);
> - cancel_work_sync(&ucsi->resume_work);
> + cancel_delayed_work_sync(&ucsi->resume_work);
>
> ucsi_debugfs_unregister(ucsi);
>
> diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
> index dc594388dcd0..1996f04ed5e6 100644
> --- a/drivers/usb/typec/ucsi/ucsi.h
> +++ b/drivers/usb/typec/ucsi/ucsi.h
> @@ -484,7 +484,8 @@ struct ucsi {
> struct ucsi_connector *connector;
> struct ucsi_debugfs_entry *debugfs;
>
> - struct work_struct resume_work;
> + struct delayed_work resume_work;
> + int resume_retries;
> struct delayed_work work;
> int work_count;
> #define UCSI_ROLE_SWITCH_RETRY_PER_HZ 10
>
> base-commit: bdab5605259ba5d6ff927c1a85cc83eb3ecfdacc
> --
> 2.55.0.737.g08866a6d13-goog
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-08-18 21:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-08-18 20:57 [PATCH v1] usb: typec: ucsi: allow retries of ucsi_resume_work Jameson Thies
2026-08-18 21:16 ` Benson Leung
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox