FAILED: patch "[PATCH] usb: typec: tcpm: Fix VDM type for Enter Mode commands" failed to apply to 6.6-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 9cff680e47632b7723cb19f9c5e63669063c3417
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071438-irk-imbecile-3d77@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 9cff680e47632b7723cb19f9c5e63669063c3417 Mon Sep 17 00:00:00 2001
From: Andy Yan <[email protected]>
Date: Thu, 4 Jun 2026 18:50:24 +0800
Subject: [PATCH] usb: typec: tcpm: Fix VDM type for Enter Mode commands
VDO() second parameter is VDM type (bit 15): 1 for SVDM, 0 for UVDM. Using 'vdo ? 2 : 1' corrupts SVID low bit when vdo is non-NULL (2 << 15 = BIT(16)). Enter Mode is always SVDM, hardcode to 1.
drivers/usb/typec/tcpm/tcpm.c +2 -2
@@ -3093,7 +3093,7 @@ static int tcpm_altmode_enter(struct typec_altmode *altmode, u32 *vdo)if (svdm_version <0 )return svdm_version; - header =VDO (altmode->svid, vdo ?2 :1 , svdm_version,CMD_ENTER_MODE ); + header =VDO (altmode->svid,1 , svdm_version,CMD_ENTER_MODE ); header |=VDO_OPOS (altmode->mode);return tcpm_queue_vdm_unlocked (port, header, vdo, vdo ?1 :0 ,TCPC_TX_SOP );
@@ -3141,7 +3141,7 @@ static int tcpm_cable_altmode_enter(struct typec_altmode *altmode, enum typec_plif (svdm_version <0 )return svdm_version; - header =VDO (altmode->svid, vdo ?2 :1 , svdm_version,CMD_ENTER_MODE ); + header =VDO (altmode->svid,1 , svdm_version,CMD_ENTER_MODE ); header |=VDO_OPOS (altmode->mode);return tcpm_queue_vdm_unlocked (port, header, vdo, vdo ?1 :0 ,TCPC_TX_SOP_PRIME );
Sasha Levin
maintainerPATCH 1/1 usb: typec: tcpm: Fix VDM type for Enter Mode commands
From: Andy Yan <[email protected]>
[ Upstream commit 9cff680e47632b7723cb19f9c5e63669063c3417 ]
VDO() second parameter is VDM type (bit 15): 1 for SVDM, 0 for UVDM. Using 'vdo ? 2 : 1' corrupts SVID low bit when vdo is non-NULL (2 << 15 = BIT(16)). Enter Mode is always SVDM, hardcode to 1.
--- drivers/usb/typec/tcpm/tcpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/typec/tcpm/tcpm.c +1 -1
@@ -2232,7 +2232,7 @@ static int tcpm_altmode_enter(struct typec_altmode *altmode, u32 *vdo)if (svdm_version <0 )return svdm_version; - header =VDO (altmode->svid, vdo ?2 :1 , svdm_version,CMD_ENTER_MODE ); + header =VDO (altmode->svid,1 , svdm_version,CMD_ENTER_MODE ); header |=VDO_OPOS (altmode->mode);tcpm_queue_vdm_unlocked (port, header, vdo, vdo ?1 :0 );
Signature · 1 line
2.53.0