On Thu, Aug 21, 2025 at 08:37:57PM +0000, RD Babiera wrote:
> tcpm_handle_vdm_request delivers messages to the partner altmode or the
> cable altmode depending on the SVDM response type, which is incorrect.
> The partner or cable should be chosen based on the received message type
> instead.
>
> Also add this filter to ADEV_NOTIFY_USB_AND_QUEUE_VDM, which is used when
> the Enter Mode command is responded to by a NAK on SOP or SOP' and when
> the Exit Mode command is responded to by an ACK on SOP.
>
> Fixes: 7e7877c55eb1 ("usb: typec: tcpm: add alt mode enter/exit/vdm support for sop'")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: RD Babiera <rdbabiera@xxxxxxxxxx>
> Reviewed-by: Badhri Jagan Sridharan <badhri@xxxxxxxxxx>
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/typec/tcpm/tcpm.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
> index 1f6fdfaa34bf..b2a568a5bc9b 100644
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@ -2426,17 +2426,21 @@ static void tcpm_handle_vdm_request(struct tcpm_port *port,
> case ADEV_NONE:
> break;
> case ADEV_NOTIFY_USB_AND_QUEUE_VDM:
> - WARN_ON(typec_altmode_notify(adev, TYPEC_STATE_USB, NULL));
> - typec_altmode_vdm(adev, p[0], &p[1], cnt);
> + if (rx_sop_type == TCPC_TX_SOP_PRIME) {
> + typec_cable_altmode_vdm(adev, TYPEC_PLUG_SOP_P, p[0], &p[1], cnt);
> + } else {
> + WARN_ON(typec_altmode_notify(adev, TYPEC_STATE_USB, NULL));
> + typec_altmode_vdm(adev, p[0], &p[1], cnt);
> + }
> break;
> case ADEV_QUEUE_VDM:
> - if (response_tx_sop_type == TCPC_TX_SOP_PRIME)
> + if (rx_sop_type == TCPC_TX_SOP_PRIME)
> typec_cable_altmode_vdm(adev, TYPEC_PLUG_SOP_P, p[0], &p[1], cnt);
> else
> typec_altmode_vdm(adev, p[0], &p[1], cnt);
> break;
> case ADEV_QUEUE_VDM_SEND_EXIT_MODE_ON_FAIL:
> - if (response_tx_sop_type == TCPC_TX_SOP_PRIME) {
> + if (rx_sop_type == TCPC_TX_SOP_PRIME) {
> if (typec_cable_altmode_vdm(adev, TYPEC_PLUG_SOP_P,
> p[0], &p[1], cnt)) {
> int svdm_version = typec_get_cable_svdm_version(
>
> base-commit: 956606bafb5fc6e5968aadcda86fc0037e1d7548
> --
> 2.51.0.261.g7ce5a0a67e-goog
--
heikki
