From nobody Thu Apr 9 12:08:07 2026 Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazon11013016.outbound.protection.outlook.com [52.101.83.16]) (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 1663D36894F; Mon, 9 Mar 2026 07:41:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.83.16 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773042089; cv=fail; b=OlCfnEYgfXEMBEstxx6lP8Bx2jIqvLTuQBFCB5LOJLQOfB6qxYCFxmTkfRXWquPvSZ6bw5aI08XWNuhJjTvsQYwvzEuDMsFNCTprrCN75volN31CJXT6i/FBUmBWox2xYcpPEIOmWVwHNyjDsp9cVvDr9mwJQ9axH5aK0LBmb4I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773042089; c=relaxed/simple; bh=Czd4/fqRYky2GJCrLdCGU1n5GyDuET6L5swwtc8PN/M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=mLKO+xcLrYQHnAdMLSnvLF5Vdz/RLsQ43krfDPfoBml5H8INyg2QLhf2DIA4JWhewkMtCAlGZ6ka/7cQJvlVIyDxJhw6WdS3sZZatZtJ5y8PVeQATPzeLo8O6m7fs7gMgrO0qwi3soCNcDZ1yJ8TDNJfIoSRiUInhtdXJY2NUNk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=Rv5VovDj; arc=fail smtp.client-ip=52.101.83.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="Rv5VovDj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yJlHiRamstupD0gACJfHSigOi71x/V2St3Gro7AzqVuSK8opwoU/QDH+p2dCt2M8RnvrUHZuX9sqj/1dvrSZRJs+5izgvSie6Dn3oHbD6OFhmyVvLSdZMK31VA4CEiBkP3cTC5inqVPP3puUlaqu1GZbpBM99fU2J8f9VKeFSgvsTQuTUyMZLn1znrWO7sc9bQVlspcLC50U78KDCmRBXHoxz2oG6iwR9deFVpiplo9+cvJzDdfZ5C11BeCLLwwKOizD3gyE+Qb/577ULJQM6zi1Xc2i7zB/WYFqUAlOQrzisvcvYGAP+ISQyB8TnSFozbsP4UnhROYyyILm3qFq/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=W9lHBjn1s5iUv69Tys7sk6QMc8Rf0fegjKO+gwnnpJQ=; b=Wkd3j9VZS6V3EHjOkHK+0by8P/nl+aDNzjB5/ymb0qS3edPe3nMbql5izu+/8WzgxaJXftJ6eGAlAWFeMgj/yz/ECtCoceHPEk34WIz3KUkvAfPQDhdNK2AGoi9vx51hBH9mlkD6IUJcOTegbuJSy34KJVF7sxRjrzT+AF90JjxTmletJExMENUst9yUnRjH+0FEpI02Y/4yV4Q/i4hW9qUqajISqVzuf1JUjz4kWMYl7W4TU0lcefWeDtZZbJsUETyIvgu1VXBTH2uNy3zFOE5JzCbNW4q732SHhMzFH1umBHAe54zjIJqmBfRSk2dkScIU+Nc8v9xtfEiNAtXM/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W9lHBjn1s5iUv69Tys7sk6QMc8Rf0fegjKO+gwnnpJQ=; b=Rv5VovDjMtJid76DdydsoEZv8PVQaH6GJSqmFdIUz6Hl42NfLmv5ulXD0q+wuO4NQ8Rjgx4Dw4J/VWVHzgAGdI4tEcEO4tei8Ethw4Z11Ytd6cJYINEB290A3PwCcEQQSz9JT0R1q1+1zj1Y2QpiqS7uYIDJQn+fvIkXd7vm6aXQ/DltgTasnz4H26NL+vTKzRZJ4TOoj0VRuHjEKa9AHkeP8/NrbgB/+3XJOX38ocdnn+131dd2vr40OVAkbssOASt42dsLh1FF5I4/s4kehn8rarxA5mMMgJ1TljyLAueh8vCha/934Vvc53U66aRR0+bQ2QCQmXMW7jv/DtwMmQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) by GV2PR04MB12470.eurprd04.prod.outlook.com (2603:10a6:150:341::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9678.25; Mon, 9 Mar 2026 07:41:25 +0000 Received: from DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::c67b:71cd:6338:9dce]) by DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::c67b:71cd:6338:9dce%5]) with mapi id 15.20.9678.023; Mon, 9 Mar 2026 07:41:25 +0000 From: Xu Yang To: badhri@google.com, heikki.krogerus@linux.intel.com, gregkh@linuxfoundation.org, arnaud.ferraris@collabora.com, dsimic@manjaro.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, jun.li@nxp.com Subject: [PATCH v2 1/2] Revert "tcpm: allow looking for role_sw device in the main node" Date: Mon, 9 Mar 2026 15:43:12 +0800 Message-Id: <20260309074313.2809867-2-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260309074313.2809867-1-xu.yang_2@nxp.com> References: <20260309074313.2809867-1-xu.yang_2@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA5P287CA0174.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1af::8) To DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8822:EE_|GV2PR04MB12470:EE_ X-MS-Office365-Filtering-Correlation-Id: c611a85d-bbfd-402f-bfb6-08de7daf4422 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|19092799006|1800799024|366016|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: VR7WAaFQjozq0nLu2jWvRn6UCl/mTGidPFzDI301SjGHlBrM4aYDHEyH27O0U0PWtO4WaZERL/VJsb6edLrDQgoRAyB/JmgBsKr3rzQPexUFu2wlKzuuGTQkqFYPHnmlRXJEaE67crfjeNtAu9w55BwkdVYsG4WE8UB3F1efaWM72Va/Y1Yen32Wa8ZCDbYunTzAtonu0MvyTxCrI8GtlAVIOo32h8nS/x7MZMlPDAc0WsJEioEj05Cy9oofZVbv9bCGoBPQMtBquLkiwAfSI7zFsoW2zf0SnRJnGGFy/tKd/p/MRnFidZUjiA5tNdmxc+daFX7fSC0Nz+AyFehKBxUcJqzHmr1HenCXHYIrO268VyiX7pLrMP+A5aI1qGTYw4eYhLuJUFH4pU8+/taBX9WZlqH1Eg6nMn0GUOZcYrvL/GOWZjb7rkamgzVlj0MqZLLQ2VErXSNLI3GfNkH02Rizwt6q2+t3755NwxqOeiBZD56nyc7oxTyMlnjo3D0RIEAHqeq1zUe6vUA9CsMF3iFy54uZVGyaAx3MYtOOXbiqETKOiJ92eROkClJUNHowT5KNgSCsj/f1ZsYRVTub9pEc2oHbYhkQ+Yz9Y3EuIrlaJXnrJtZxpbZ7TNcCCDqTFP7cWoUJV8qyL9Up+I1qb/MkOwzFXtAy1O/aGIV6sCs6MFX07upuxyv+EUrF5PT9u5xIANuLSYlAQIshv5C9FFOa/Viy/j6GoEnQgZeyDcAZaiZIUvou1Vobt0B2mjndmzlDa/XCOLsr8E4ABIJdvXj/P5lFAOARXdvMik4UUdQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8822.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(19092799006)(1800799024)(366016)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nDnanbcwc3u5RMzeFsyq2FZzJ+jAEBBq1dtJkCl1zLBjjeiPKmaTZeQk7Ppp?= =?us-ascii?Q?F5gsqk7eNSgedCsYEqvrMUykx9/Agp9ARXSQqdeKPcB7P5XvOM5OF/PaGTNt?= =?us-ascii?Q?wZomwXo5vtx7B3dVPEhuJi5eaRmlhmTnraQpWACl9OKrbWF2sylgr4VuwNwk?= =?us-ascii?Q?NV3Xt8Mj+vN70BByooF+ZZINwQVq4WmtZZ2bIItPfLmAew4y/AuGOUz4Yr7v?= =?us-ascii?Q?BtJf70vHQm5/WMCxLKYd1nJN5+cFBwHTCBmisFeNgYwA4QccZlnQX+4GliMJ?= =?us-ascii?Q?/DZ/jt0LAJRFw4M3H/7osoIn/nc45yWIEUfkVY02yT4N2/33FdsKbH420yha?= =?us-ascii?Q?B7482siSIvTkSxiZ6xzKJmbiuKpWSFoWFgvPSIx+aZap5upqv86Ur3Omdqmr?= =?us-ascii?Q?M3Je6QPyu5Hxx6vslFO2rshZtda7d83J8jwanequbfPc2ggwEtrKsqHZuT27?= =?us-ascii?Q?naPp5b27oeuEApLSlvPLo+nd0hxVWinHm/0hQbQrjwOhQtzppetPMiIC0/V5?= =?us-ascii?Q?jzk9F4cKSM+Jku0BwDvnSkdmB1zaoXEVaK51g+qMuLn47SbFoW7tJRxeAbkP?= =?us-ascii?Q?4gu7QOTD4jsqu95J77V2Qspcr3VrdAK1gr/bfqOGfNIt6qldQtiHXQ11foPC?= =?us-ascii?Q?A0kLGIHRacdxQrouSXBB3zm90zgcQrRjtK3d6u3IemUQeroyQuelLA3JqxqG?= =?us-ascii?Q?Tf5pZsM2AxLRYjNDfyoiD5fmB0HObu6ZaT38YSFdXakHKHCuIVWtkYFaKtZf?= =?us-ascii?Q?KdvlrMZD4YjJ3vXf4yO5a6Ai4Lhd/e30pQiXaYGPom3bwLXcmkBEk37UQIMv?= =?us-ascii?Q?BThINnut9EElbbFvojlDpMe3itfitbS+hgWRTN0CUMLWgUlRG5dWSDXlfusP?= =?us-ascii?Q?Nj0FoPIn9sPSwR1MosKlnF5vkEcPBRgy9AOYQGYgEvGEAzG1Kgm8BX63yXWW?= =?us-ascii?Q?0rVlM2loae09tuwu0mUfAJB8WpK2DYlJCGcMfIwmvJgfUfHb222Ny5yLu9fw?= =?us-ascii?Q?5Cm2jAH7qXcSrYwwwhJaewTi1z74/K4s1fammB1wtKiOgy5ff8CmRM4iFj/G?= =?us-ascii?Q?tINXlCTeqk3F1vzda5XYyWEyjO7bDNsBd7fGQbBGhuY+M+zgXo7x0118vtBZ?= =?us-ascii?Q?WpD87vgvijWOD7Wyq1JzeiGoGL1B6xnR421xiMA0fTRa/GsesIue24TkTUEN?= =?us-ascii?Q?MwqBUILbwE2ElACPLdMMRpbPNO0QCo07e3nDXGME1mAmiwEb5/aF7nMmKYjX?= =?us-ascii?Q?v/onMmJo4LIdNiKyT3ZSzcnlMfz2mTKe4YiIglEg4VFcjXWRAQWxiMgi+T3/?= =?us-ascii?Q?wX8BjMX755UBx88yGQ89sTQUWgnVksdT1p49w1qO771k/P974P5cC53319+X?= =?us-ascii?Q?lIWM/wub4TsM8vfZ48Mc1aPG+q58V+6vdtqcR3hpiMzElTNwBAyjp0Zqtltr?= =?us-ascii?Q?aOUe2H8/XeTP3xTvnCtXdBPO1LKQrpwxp11tkkxuwHaTg3g8o80D0Z3NAYOz?= =?us-ascii?Q?yGFvF+Jwh0Z3spdMvsM9KTSnUUxSd4JhG5+DUxkW27t7Cqny+kVeYmWyce0d?= =?us-ascii?Q?PSB3X+zowxuIICu3HxXiFUNaie2Q0QXMZ3p0ETGBDi2nEtW7xsn5hiKZypIr?= =?us-ascii?Q?FrQGqjS3l0+o6RuH+KEWoNDlhLcJY6kzjjSjfqQTLI6L3ptWvFGolxVGgaYu?= =?us-ascii?Q?Cur/s263IMMytYdyQXRAH/BLESBUxsVYMezX+dJvH+oEIoMho/lvNqauAmJp?= =?us-ascii?Q?kkheEeWFxg=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c611a85d-bbfd-402f-bfb6-08de7daf4422 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2026 07:41:25.1642 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: W1a48rhYv38TUPjCQPPh7Z+SQ3I9tfLaMg9Xd/S0+iQ8V5+N/OAXdKgV5NQyNXGRkbB3D+9mhJH0quK4iSdmNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB12470 Content-Type: text/plain; charset="utf-8" This reverts commit 1366cd228b0c67b60a2c0c26ef37fe9f7cfedb7f. The fwnode_usb_role_switch_get() returns NULL only if no connection is found, returns ERR_PTR(-EPROBE_DEFER) if connection is found but deferred probe is needed, or a valid pointer of usb_role_switch. When switching from a NULL check to IS_ERR_OR_NULL(), usb_role_switch_get() returns NULL and overwrites the ERR_PTR(-EPROBE_DEFER) returned by fwnode_usb_role_switch_get(). This causes the deferred probe indication to be lost, preventing the USB role switch from ever being retrieved. Fixes: 1366cd228b0c ("tcpm: allow looking for role_sw device in the main no= de") Cc: stable@vger.kernel.org Signed-off-by: Xu Yang Reviewed-by: Heikki Krogerus Tested-by: Arnaud Ferraris --- Changes in v2: - no changes --- drivers/usb/typec/tcpm/tcpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 1d2f3af034c5..8e0e14a2704e 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -7890,7 +7890,7 @@ struct tcpm_port *tcpm_register_port(struct device *d= ev, struct tcpc_dev *tcpc) port->partner_desc.identity =3D &port->partner_ident; =20 port->role_sw =3D fwnode_usb_role_switch_get(tcpc->fwnode); - if (IS_ERR_OR_NULL(port->role_sw)) + if (!port->role_sw) port->role_sw =3D usb_role_switch_get(port->dev); if (IS_ERR(port->role_sw)) { err =3D PTR_ERR(port->role_sw); --=20 2.34.1 From nobody Thu Apr 9 12:08:07 2026 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11011048.outbound.protection.outlook.com [52.101.65.48]) (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 43F30367F54; Mon, 9 Mar 2026 07:41:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773042094; cv=fail; b=MioA8ZYEfYUR2PFuz8276VJIcS3dVIbArFykgkFTeSS0XCA71r+menlDwfjR41/8d9dOfjDfX1PZK/w8+OqvAE5j3WhrtKWtytyaYffEPOnGjcfvqDxAfuY+ATEg1ILjxj1udjAgi2ywlI8pccVjWpI4U534dcUy26q+qc6QR/8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773042094; c=relaxed/simple; bh=iXGwCfO1ptD0huQ8UEu9OQwe6VEgKSljRUvU/wRu0Jc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=PvrDXvCl9Xqx+y8fXRX8+4IeQai2wzQDIL5FKIyGcx/uPk2qYVpHeF1UAYLJxF1D/6gpiYUluoU3OXgis+eVvu+yYxekUWibke38tjxF7yA3CmNzwZiZZ2jcL0rfz8gQeEuOtej4mxuX2tw/emRZ3eCSjEhtXTIQRzJyD2m1Vy0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=lBNZV1+h; arc=fail smtp.client-ip=52.101.65.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="lBNZV1+h" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hbjmFcs/lCcbw8WbvhqUGnwsHTmLFN3VVtr9ZMwSkzYWXWFaEeqzotz3xWeU/iCB6/fzNKWevZ9sLYfLomfJbDOKPSuJi/G7VIAiq6ETSfoX1NssQO+rFz++/QFIhDFJeBG98Ut0ieE7qfOfm0Leib/NWAxXMT5tW31/MtzmLU6OK+9v9mFr2dCucmAO7FTC7DV6GNPbtZOsni8Z6n5TnWftQsy39qvHb82ra27vsjE0K+WwfcAnHQa+5eAX2+lYLW9O50nx4pxlimoyw+ilmYiMT+KFcQqFhVZikH9b8O8CyYCFFsym0snaCBrkJVBZMKylPSAbNa0triiL4vLDNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NA5t8sKP59gxuMrP10AYsT1NuV9lR5uX20TGmdnU7CY=; b=Ekk08jiEW2yQ+UgC8FV4MEXiOmWc5nmIyT092UGjF/fmDYQwOPrcakqgEkUizF4BBmzJooH6fEj5GhkEqri9YrIbFdVbl/JS4lAgUakhzhON/mjrq0jbFKJupYItcLNUoxyRcklPTLi9lGiwwg21Wz4m3wGsS62rJiIevKQFXXb796eXIEleZ0jmqnffQJGqXOXL8KOeZFhefi93ITnVFUqVaanhXlKTqZx2e3u+YWMUBOanP97We9cO/upcsy1n1/+prvLegLOIC3hi0/vWDoyOP4lNj0RezLVrmyYbPY8LuR7uznjae2fx+HjjYWhC7DH+9UUxF1WgV+x9oab6xA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NA5t8sKP59gxuMrP10AYsT1NuV9lR5uX20TGmdnU7CY=; b=lBNZV1+hcjLSz/yLGCZG/V/hLCFVrjW25IGR7qJl4bnUYzHbvVR2/B56blq5FvbTQLOPT/ZmGFfqKNVD/0hlz0uqim3Pyixa88FJSNP6X8RE3YV81bIS5H4GkqmMm4laXkiD9oIcWbAG4dFICvIjTTxDgMGOBAkejfpY0cWqOZWpZFPFPMgarLliuzYfvbXWHTKYCANdESw+rjUu0MMB/I3LR0GCZ0n0jppyNY13vXiIuYdkpdZJfhf1eg1Blhax3UiZjLvOvsphTzvyky0L3fCxu/ShaDnVzI6TzCCldtt0QADLPOfbsbxV3b1Jjd62V8o/RYKpqFuV1gqSRJWokw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) by GV2PR04MB12470.eurprd04.prod.outlook.com (2603:10a6:150:341::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9678.25; Mon, 9 Mar 2026 07:41:30 +0000 Received: from DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::c67b:71cd:6338:9dce]) by DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::c67b:71cd:6338:9dce%5]) with mapi id 15.20.9678.023; Mon, 9 Mar 2026 07:41:30 +0000 From: Xu Yang To: badhri@google.com, heikki.krogerus@linux.intel.com, gregkh@linuxfoundation.org, arnaud.ferraris@collabora.com, dsimic@manjaro.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, jun.li@nxp.com Subject: [PATCH v2 2/2] usb: roles: get usb role switch from parent only for usb-b-connector Date: Mon, 9 Mar 2026 15:43:13 +0800 Message-Id: <20260309074313.2809867-3-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260309074313.2809867-1-xu.yang_2@nxp.com> References: <20260309074313.2809867-1-xu.yang_2@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA5P287CA0174.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:1af::8) To DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8822:EE_|GV2PR04MB12470:EE_ X-MS-Office365-Filtering-Correlation-Id: 1152474f-9e32-450c-2cd7-08de7daf46b1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|19092799006|1800799024|366016|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: FfGLYbiN/D5ejs1kcBbxLAu8p4j926hxBI6xGBpxASS37568zf6Wqd2ClbhM2x+z/U+4PgIfcnlkAS5Xuwzsj9Tdkqht+Q6UBeImK/4ujE5pbuc3O9ignsVwSiH1AfKpTPeCkjhBNtl3uyELD8z+IWo/ouwQw/eBocddst/cBnUYPKYauckfVJFh8QLIfuESRjpcnqbeuLttBAdQNW8PalWhcozt01m2Z9TTiSP1zVDXISV8+y0rKoUEudxtloC4ommx1PAX5AIiTvF5xIS6osPWb9IxihfPogLQEicpec0sKVp4RtV2tlV2p8KEwm4fxdez4FcptgSVkgw7L5gZbbJQarij+CVY9q5oIc8CoPxAaXFD3gIxuKCmv9SEKbtwByCKZsomXAObS0V4xltbySRTPm4QDWzAKpqcryyLdtNVlrWAammFBQZzcEkEo7PykVlmNFIdQZTK7Bn4PIkP0wRk8KuzTQraIdn1S4shOwN20Ks9fEOrxvU8uPSdDsMBPN1B7bOLM8Syes7pR20/mV+iJTfLrGOeGuwVOugP5LdY0o//G77MEk/qsKRrNIt6sgXGWTARcYHAg8oqV5qwQ07LdgsUBQDG9QN1WriTBm9GAqfMcQjNXHUd6OWepmvRoz3uz5tbvRGjLKg6Y3LJxki30h1MCUOD7kLsKzLutgLdfkbvQ2ibB6VVlzc71KoXnH8kwyvQo+S+ugL+eH4pbCUDs8QXT17BUv7VdBY8rsxtAD3Q7xE9rG71mT96xtf9ZFD3PcJmS+b/cmqyDQnoCoAgJKiuI8TwpsxyFF4zg9k= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8822.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(19092799006)(1800799024)(366016)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SVUDETZyUEXmDsqUe55mQjKnFYT42QRlE4oUl71TdGfTXzYBN+/zL70zVKe7?= =?us-ascii?Q?JOt2d9r3MS9WsCN6ZebN4fJ3aJRgC75EpJ+BQEvAPPGzye/sRywk2bNTXTwq?= =?us-ascii?Q?KvAminKnX9zbdboZeo824pE2Y4u/7YDHKFimFFxuoy9R0Xu//fPKpN4ANy/X?= =?us-ascii?Q?hD+8qxt/jTowz5n5TGxUV556a4AzDCzgArWqkPo1IP/DgQGu/sND1wP+50Gn?= =?us-ascii?Q?4onB5xhKtqyXcJgZ5psqCIszKXoU0kwsnrPxn5bhqRn85o9S4Vq/s0vlS1QD?= =?us-ascii?Q?8ckTEPw8gaLRAXz68lWQfbEXPlijcVnEDMA5aTdh+Kc07rhkS2pJm2y5/d0N?= =?us-ascii?Q?mr1j3EsoD59mJiRkV1Q50Rhpp1Xc+pTgg3kUnSQ8+sEgVhNgtrA9RJGmO7lp?= =?us-ascii?Q?tGyD6hnghXhzfEuwsuIY/hTX6nd3ZVkCIsdL1ICdFjmmREXJA20Jjcy8e1zF?= =?us-ascii?Q?jCX9r9O86itn6OLyriNE3Ibttz/D/tI86CXgDjeNiFlVMOuph+qkXpAbOsdO?= =?us-ascii?Q?P0meAakBz22njBg2PsTTrPowe2tOoVsc49GP990D/1jk6aOtJ4CknkKBqNvn?= =?us-ascii?Q?ZaYt6aKEMF3GnPcUYVN0EpI98g6Q2XxzWDeFsk8tkvVBQYNO3nZmGOYqlFS2?= =?us-ascii?Q?D2BHZiOzi/AovxKG97W745hZX0VAeFr0fBQLaNg9Fox/qG581eo3IhjVi8yz?= =?us-ascii?Q?kiDFk6tEBeNhTmeY1yi7EY5qoSRKQfYLgA6WnIk0/mYTzN+MHkDWHd/7Arp9?= =?us-ascii?Q?57pAwP/kF+W2BSHhkK9LW6DLNpV+hbd7xVrsLAdD2Qbj8azrukiMZxYkdsuF?= =?us-ascii?Q?7K9Sx2cgynvbK7WmaE9rhp661PDUW9rldM/6OUM+2bnho+2ui/ZBWHUa8Lqu?= =?us-ascii?Q?8m1CwKkI1ahB87BJjKjO8tP4yFcfcyTyhZE+fcKpKo2O9wnLePLm0p9ufaXb?= =?us-ascii?Q?mRhJNB2vaF8ePDwqEX/vlFPygeVweLiwwMJdHV2byXqYccreON4Vdsj1uLjQ?= =?us-ascii?Q?fn8WQZ7c2XilV81WPp3+2v7GuHdxAIH8857miZOlJPdeUkExhEyGo1+zhWH6?= =?us-ascii?Q?VDstoSopTsT4xQgyvco1/QDRhtGHr5w4FPs2I7IFsCIE2rDp+Ph24AJTTmw0?= =?us-ascii?Q?o8R2E7kZ4Sz5QAHhm2GxZNNDQ5RBd0Wsswz3GcCOK1ndnxbFJsxhqFtrVo0X?= =?us-ascii?Q?E1yZuIPMvsqepMqNL7S3etvtfBZiEh9wqdX3WTV23+F/dZisrQorM+tNBZmf?= =?us-ascii?Q?MT2NZFeFHAB3KkOHB1lErT2Ot7VcZuP9OpZ1SvnKVURtIOCpJF5IAeVTHVLG?= =?us-ascii?Q?TDxNT9+uqdOwi9HEEoLc1Rha0jTU0/X1qP1uRbiWtJxyrmkWpGz7/QTLRgpw?= =?us-ascii?Q?TNtKZSrY+fqk1c91s687gQhUh5ROq7WGLvfWbNEQdkhV8fOKhG8o7I9FN+SX?= =?us-ascii?Q?ZlNk87WAM8aVQ5PA4kdL9mk7Qm9btEOOlOqp0tLEjUYeLAKKXLrAKt5+hF/1?= =?us-ascii?Q?9IRgazUzdPFvRuc/QHDlzwLdYDdkv1esv3DP8gnG+n8C0SUJRVdzzaq2ehU1?= =?us-ascii?Q?GNI1JLj4pnSjOA3jJm7Yt5KP/EgjOMKKkWJHkMtoXPYYz8dzI4wuswlRa3Cr?= =?us-ascii?Q?0wF8ERledX4n6PC0gpQhTE9BCJrzBENePHx/BDfsa1KphFeFHeB2PCUTOI3l?= =?us-ascii?Q?e0qPTwuU7Jk2BIicy5ZEcMGoQgmBYN0A8j+GWUMKvCWEfUi2XZmlSjMHe6sM?= =?us-ascii?Q?9yEUO+GNOA=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1152474f-9e32-450c-2cd7-08de7daf46b1 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2026 07:41:30.0332 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ua21OgK5ntf0AIkZKO9SLu/6LMyTcy7P1QHCNWY8u4GouXZVZcbGPMtx/wi92GVIGshrTWFeXV9J5MvW4yLx1A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB12470 Content-Type: text/plain; charset="utf-8" usb_role_switch_is_parent() was walking up to the parent node and checking for the "usb-role-switch" property regardless of the type of the passed fwnode. This could cause unrelated device nodes to be probed as potential role switch parent, leading to spurious matches and "-EPROBE_DEFER" being returned infinitely. Till now only Type-B connector node will have a parent node which may present "usb-role-switch" property and register the role switch device. For Type-C connector node, its parent node will always be a Type-C chip device which will never register the role switch device. However, it may still present a non-boolean "usb-role-switch =3D <&usb_controller>" property for historical compatibility. So restrict the helper to only operate on Type-B connector when attempting to get the role switch from parent node. Fixes: 6fadd72943b8 ("usb: roles: get usb-role-switch from parent") Cc: stable@vger.kernel.org Signed-off-by: Xu Yang Reviewed-by: Heikki Krogerus Tested-by: Arnaud Ferraris --- Changes in v2: - new patch --- drivers/usb/roles/class.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c index b8e28ceca51e..edec139b68b5 100644 --- a/drivers/usb/roles/class.c +++ b/drivers/usb/roles/class.c @@ -139,9 +139,14 @@ static void *usb_role_switch_match(const struct fwnode= _handle *fwnode, const cha static struct usb_role_switch * usb_role_switch_is_parent(struct fwnode_handle *fwnode) { - struct fwnode_handle *parent =3D fwnode_get_parent(fwnode); + struct fwnode_handle *parent; struct device *dev; =20 + if (!fwnode_device_is_compatible(fwnode, "usb-b-connector")) + return NULL; + + parent =3D fwnode_get_parent(fwnode); + if (!fwnode_property_present(parent, "usb-role-switch")) { fwnode_handle_put(parent); return NULL; --=20 2.34.1