* [PATCH v2] usb: typec: ucsi: Skip CAM query when partner has no alt modes
@ 2026-09-30 23:46 Gris Ge
2026-10-01 12:25 ` Andrei Kuchynski
0 siblings, 1 reply; 4+ messages in thread
From: Gris Ge @ 2026-09-30 23:46 UTC (permalink / raw)
To: Heikki Krogerus, Greg Kroah-Hartman
Cc: Gris Ge, stable, Benson Leung, Andrei Kuchynski, Abel Vesa,
Pooja Katiyar, Jameson Thies, Hsin-Te Yuan, Johan Hovold,
linux-usb, linux-kernel
Since Thunderbolt alternate mode support was added,
`ucsi_altmode_update_active()` is called on every Connector Partner
Changed event. This made the driver send `UCSI_GET_CURRENT_CAM` to
PPMs even when the partner had no alternate modes registered. Firmware
that does not support the optional alternate mode details answered Not
Supported, which produced a spurious error on every partner change:
```
ucsi_acpi USBC000:00: GET_CURRENT_CAM command failed
```
Fixed by skipping the command when there is nothing to update.
Fixes: da87d45b1951 ("usb: typec: ucsi: Add Thunderbolt alternate mode support")
Cc: stable@vger.kernel.org # v7.0+
Assisted-by: Codex:deepseek-v4.1-flash
Signed-off-by: Gris Ge <cnfourt@gmail.com>
---
v2:
- skip the invoke of `ucsi_altmode_update_active()` in
`ucsi_handle_connector_change()`
v1: https://lore.kernel.org/linux-usb/20260927021649.8967-1-cnfourt@gmail.com/
drivers/usb/typec/ucsi/ucsi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index bef3f9b71d71..c392afdc27ae 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -1519,7 +1519,8 @@ static void ucsi_handle_connector_change(struct work_struct *work)
if (con->partner && (change & UCSI_CONSTAT_PARTNER_CHANGE)) {
ucsi_partner_change(con);
- ucsi_altmode_update_active(con);
+ if (con->partner_altmode[0])
+ ucsi_altmode_update_active(con);
/* Complete pending data role swap */
if (!completion_done(&con->complete))
--
2.55.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] usb: typec: ucsi: Skip CAM query when partner has no alt modes
2026-09-30 23:46 [PATCH v2] usb: typec: ucsi: Skip CAM query when partner has no alt modes Gris Ge
@ 2026-10-01 12:25 ` Andrei Kuchynski
0 siblings, 0 replies; 4+ messages in thread
From: Andrei Kuchynski @ 2026-10-01 12:25 UTC (permalink / raw)
To: Gris Ge
Cc: Heikki Krogerus, Greg Kroah-Hartman, stable, Benson Leung,
Abel Vesa, Pooja Katiyar, Jameson Thies, Hsin-Te Yuan,
Johan Hovold, linux-usb, linux-kernel
On Wed, Sep 30, 2026 at 11:46 PM Gris Ge <cnfourt@gmail.com> wrote:
>
> Since Thunderbolt alternate mode support was added,
> `ucsi_altmode_update_active()` is called on every Connector Partner
> Changed event. This made the driver send `UCSI_GET_CURRENT_CAM` to
> PPMs even when the partner had no alternate modes registered. Firmware
> that does not support the optional alternate mode details answered Not
> Supported, which produced a spurious error on every partner change:
>
> ```
> ucsi_acpi USBC000:00: GET_CURRENT_CAM command failed
> ```
>
> Fixed by skipping the command when there is nothing to update.
>
> Fixes: da87d45b1951 ("usb: typec: ucsi: Add Thunderbolt alternate mode support")
> Cc: stable@vger.kernel.org # v7.0+
> Assisted-by: Codex:deepseek-v4.1-flash
> Signed-off-by: Gris Ge <cnfourt@gmail.com>
Reviewed-by: Andrei Kuchynski <akuchynski@chromium.org>
> ---
> v2:
> - skip the invoke of `ucsi_altmode_update_active()` in
> `ucsi_handle_connector_change()`
> v1: https://lore.kernel.org/linux-usb/20260927021649.8967-1-cnfourt@gmail.com/
>
> drivers/usb/typec/ucsi/ucsi.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
> index bef3f9b71d71..c392afdc27ae 100644
> --- a/drivers/usb/typec/ucsi/ucsi.c
> +++ b/drivers/usb/typec/ucsi/ucsi.c
> @@ -1519,7 +1519,8 @@ static void ucsi_handle_connector_change(struct work_struct *work)
>
> if (con->partner && (change & UCSI_CONSTAT_PARTNER_CHANGE)) {
> ucsi_partner_change(con);
> - ucsi_altmode_update_active(con);
> + if (con->partner_altmode[0])
> + ucsi_altmode_update_active(con);
>
> /* Complete pending data role swap */
> if (!completion_done(&con->complete))
> --
> 2.55.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] usb: typec: ucsi: Skip CAM query when partner has no alt modes
2026-09-29 1:09 ` [PATCH v2] " Gris Ge
@ 2026-09-29 12:37 ` Andrei Kuchynski
0 siblings, 0 replies; 4+ messages in thread
From: Andrei Kuchynski @ 2026-09-29 12:37 UTC (permalink / raw)
To: Gris Ge
Cc: Heikki Krogerus, Greg Kroah-Hartman, stable, linux-usb,
linux-kernel, Benson Leung, Jameson Thies, Pooja Katiyar,
Hsin-Te Yuan, Johan Hovold
On Tue, Sep 29, 2026 at 1:09 AM Gris Ge <cnfourt@gmail.com> wrote:
>
> Since Thunderbolt alternate mode support was added,
> `ucsi_altmode_update_active()` is called on every Connector Partner
> Changed event. This made the driver send `UCSI_GET_CURRENT_CAM` to
> PPMs even when the partner had no alternate modes registered. Firmware
> that does not support the optional alternate mode details answered Not
> Supported, which produced a spurious error on every partner change:
>
> ```
> ucsi_acpi USBC000:00: GET_CURRENT_CAM command failed
> ```
>
> Fixed by skipping the command when there is nothing to update.
>
> Fixes: da87d45b1951 ("usb: typec: ucsi: Add Thunderbolt alternate mode support")
> Cc: stable@vger.kernel.org # v7.0+
> Assisted-by: Codex:deepseek-v4.1-flash
> Signed-off-by: Gris Ge <cnfourt@gmail.com>
> ---
> v2:
> - skip the invoke of `ucsi_altmode_update_active()` in
> `ucsi_handle_connector_change()`
> v1: https://lore.kernel.org/linux-usb/20260927021649.8967-1-cnfourt@gmail.com/
>
> drivers/usb/typec/ucsi/ucsi.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
> index bef3f9b71d71..c392afdc27ae 100644
> --- a/drivers/usb/typec/ucsi/ucsi.c
> +++ b/drivers/usb/typec/ucsi/ucsi.c
> @@ -1519,7 +1519,8 @@ static void ucsi_handle_connector_change(struct work_struct *work)
>
> if (con->partner && (change & UCSI_CONSTAT_PARTNER_CHANGE)) {
> ucsi_partner_change(con);
> - ucsi_altmode_update_active(con);
> + if (con->partner_altmode[0])
> + ucsi_altmode_update_active(con);
Thanks for the patch.
Could you please send v2 as a new email thread?
Thanks,
Andrei
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] usb: typec: ucsi: Skip CAM query when partner has no alt modes
2026-09-27 2:16 [PATCH] " Gris Ge
@ 2026-09-29 1:09 ` Gris Ge
2026-09-29 12:37 ` Andrei Kuchynski
0 siblings, 1 reply; 4+ messages in thread
From: Gris Ge @ 2026-09-29 1:09 UTC (permalink / raw)
To: Heikki Krogerus, Greg Kroah-Hartman
Cc: stable, linux-usb, linux-kernel, Benson Leung, Andrei Kuchynski,
Jameson Thies, Pooja Katiyar, Hsin-Te Yuan, Johan Hovold,
Gris Ge
Since Thunderbolt alternate mode support was added,
`ucsi_altmode_update_active()` is called on every Connector Partner
Changed event. This made the driver send `UCSI_GET_CURRENT_CAM` to
PPMs even when the partner had no alternate modes registered. Firmware
that does not support the optional alternate mode details answered Not
Supported, which produced a spurious error on every partner change:
```
ucsi_acpi USBC000:00: GET_CURRENT_CAM command failed
```
Fixed by skipping the command when there is nothing to update.
Fixes: da87d45b1951 ("usb: typec: ucsi: Add Thunderbolt alternate mode support")
Cc: stable@vger.kernel.org # v7.0+
Assisted-by: Codex:deepseek-v4.1-flash
Signed-off-by: Gris Ge <cnfourt@gmail.com>
---
v2:
- skip the invoke of `ucsi_altmode_update_active()` in
`ucsi_handle_connector_change()`
v1: https://lore.kernel.org/linux-usb/20260927021649.8967-1-cnfourt@gmail.com/
drivers/usb/typec/ucsi/ucsi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index bef3f9b71d71..c392afdc27ae 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -1519,7 +1519,8 @@ static void ucsi_handle_connector_change(struct work_struct *work)
if (con->partner && (change & UCSI_CONSTAT_PARTNER_CHANGE)) {
ucsi_partner_change(con);
- ucsi_altmode_update_active(con);
+ if (con->partner_altmode[0])
+ ucsi_altmode_update_active(con);
/* Complete pending data role swap */
if (!completion_done(&con->complete))
--
2.55.0
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-10-01 12:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-30 23:46 [PATCH v2] usb: typec: ucsi: Skip CAM query when partner has no alt modes Gris Ge
2026-10-01 12:25 ` Andrei Kuchynski
-- strict thread matches above, loose matches on Subject: below --
2026-09-27 2:16 [PATCH] " Gris Ge
2026-09-29 1:09 ` [PATCH v2] " Gris Ge
2026-09-29 12:37 ` Andrei Kuchynski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®