From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BCEE3A4F36 for ; Tue, 14 Jul 2026 16:48:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784047736; cv=none; b=YlmUwsUok+ZasmxBSX2m0Cp34aVAnQRpjTulm63RlOaNHooqzjOCeAxhN00K+qwc8oIYik2d/EtK6qlS5VPe57gMYcvemHb01SE/1C/cORjUhZb5JFDcCASxKJ2RSxIf7TUt2NLShqBbbgjsBDNm/Z+6WsyU5bcBGGfa2UtR6UI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784047736; c=relaxed/simple; bh=1hXlKx7uW6mcqQcWOmAAYHeUJ8+hwTR//+xYs7PaB00=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=VmcTQ+Rd3AqBMdh3M2IhtG13T02YtUCPVpL+XCvjJ3YdC4t6PzBlxUdPfzPmQSh6jn4Ov8ClpxdvzSjg8u/sEi4dbstzjBc1upmO13vead2eAqGvlW5dnybSOwxlrovYyC9+SSVSxqfD8A0iD5Zmh6dO4CP50evktkeVKuKyu+k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PFAeLfUJ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PFAeLfUJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9EC971F000E9; Tue, 14 Jul 2026 16:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784047735; bh=dq8DT8nMG0W6R+vY87qHAt+hKJ9OwVzzvai/j00aexg=; h=Subject:To:Cc:From:Date; b=PFAeLfUJfvLjeKVGa78o7UBC5z+VYF8cB0qTFaIzb3l6gZ6ScTcumIWLMN8RACrRX oQ+f93J+/gVN6oaSvACqFtVH9mDSoSKNchdqGol4tAWe7O90ODYjDUZi7ZIVR7sW4d zzht2XcsYV276VB/WmtWeAtFk43qOGTvQwSbP8l4= Subject: FAILED: patch "[PATCH] usb: typec: tcpm: Fix VDM type for Enter Mode commands" failed to apply to 5.15-stable tree To: andyshrk@163.com,gregkh@linuxfoundation.org,heikki.krogerus@linux.intel.com,stable@kernel.org Cc: From: Date: Tue, 14 Jul 2026 18:48:38 +0200 Message-ID: <2026071438-guileless-shrine-ee19@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-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 . 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-5.15.y git checkout FETCH_HEAD git cherry-pick -x 9cff680e47632b7723cb19f9c5e63669063c3417 # git commit -s git send-email --to '' --in-reply-to '2026071438-guileless-shrine-ee19@gregkh' --subject-prefix 'PATCH 5.15.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 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. Fixes: 8face9aa57c8 ("usb: typec: Add parameter for the VDO to typec_altmode_enter()") Cc: stable Signed-off-by: Andy Yan Reviewed-by: Heikki Krogerus Link: https://patch.msgid.link/20260604105059.18750-1-andyshrk@163.com Signed-off-by: Greg Kroah-Hartman diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index bc531923b1ca..89eec20a2064 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -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_pl 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_PRIME);