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 C6D5B47AF6E; Tue, 16 Jun 2026 17:33:23 +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=1781631205; cv=none; b=jjNmT/ttzglrSxh3ZDwmekgPF/SJuguAeDq2uO6vuSe5KlRtgEIO6Db6ANioYB2XenT8jH67Tj22vFcXUgkGaQhx7YzebUMzVM3evvQldK3Y1BSYGGUUrASWC/mB81vm5h1FD2exnOt5DshRtB53giiZzuo+HXtZq44BO5x5L6M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781631205; c=relaxed/simple; bh=17LP+rEnGRUeQS4UnKYBrhQ3UM/4URxDNQ3hKuBZhEw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p0qOUQ1eV8qlufROFW5bMS1D9uEaXQlZexurPTA86hyQdGJJeUG5WxKzBELdyKJt3u3GcJBg2dXor8xlVyP0dkOQfEf9IXAVuRGyiseTlj12WEDvllTWrv6s1KWiVpdLaZFMATHVQYlyp7dcprR+voeOeS4FanUV1qQ3XaAnx7E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=axbTQcIi; 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="axbTQcIi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9DDB1F000E9; Tue, 16 Jun 2026 17:33:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781631203; bh=6uvY5Cp17q7eMXUnQg7fqtbxbH99PxhNX4uTJJNFYaU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=axbTQcIijj7a8e1ou04v3druJVxy31dxdXA5m5dTIBYuRohhMsUuDQRIGQRU+jqEo /ARgs3cZYGAkXZZD+12JyAXQge/FOwwukflKd14LxqJWHIl5GTU+qIR9qNM4Hj1rCO 4hfAdJ1xmeEeFzpv7eFd2n1uAsu7NQj0L+jR0sZs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Peter Chen , Frank Li , Xu Yang Subject: [PATCH 6.1 143/522] usb: chipidea: core: convert ci_role_switch to local variable Date: Tue, 16 Jun 2026 20:24:50 +0530 Message-ID: <20260616145132.782605175@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xu Yang commit 8f6aa392653e52a45858cff5c063df550028836b upstream. When a system contains multiple USB controllers, the global ci_role_switch variable may be overwritten by subsequent driver initialization code. This can cause issues in the following cases: - The 2nd ci_hdrc_probe() sees ci_role_switch.fwnode as non-NULL even though the "usb-role-switch" property is not present for the controller. - When the ci_hdrc device is unbound and bound again, ci_role_switch fwnode will not be reassigned, and the old value will be used instead. Convert ci_role_switch to a local variable to fix these issues. Fixes: 05559f10ed79 ("usb: chipidea: add role switch class support") Cc: stable Acked-by: Peter Chen Reviewed-by: Frank Li Signed-off-by: Xu Yang Link: https://patch.msgid.link/20260427075755.3611217-1-xu.yang_2@nxp.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/chipidea/core.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -661,12 +661,6 @@ static int ci_usb_role_switch_set(struct return 0; } -static struct usb_role_switch_desc ci_role_switch = { - .set = ci_usb_role_switch_set, - .get = ci_usb_role_switch_get, - .allow_userspace_control = true, -}; - static int ci_get_platdata(struct device *dev, struct ci_hdrc_platform_data *platdata) { @@ -793,9 +787,6 @@ static int ci_get_platdata(struct device cable->connected = false; } - if (device_property_read_bool(dev, "usb-role-switch")) - ci_role_switch.fwnode = dev->fwnode; - platdata->pctl = devm_pinctrl_get(dev); if (!IS_ERR(platdata->pctl)) { struct pinctrl_state *p; @@ -1016,6 +1007,7 @@ ATTRIBUTE_GROUPS(ci); static int ci_hdrc_probe(struct platform_device *pdev) { + struct usb_role_switch_desc ci_role_switch = {}; struct device *dev = &pdev->dev; struct ci_hdrc *ci; struct resource *res; @@ -1159,7 +1151,11 @@ static int ci_hdrc_probe(struct platform } } - if (ci_role_switch.fwnode) { + if (device_property_read_bool(dev, "usb-role-switch")) { + ci_role_switch.set = ci_usb_role_switch_set; + ci_role_switch.get = ci_usb_role_switch_get; + ci_role_switch.allow_userspace_control = true; + ci_role_switch.fwnode = dev_fwnode(dev); ci_role_switch.driver_data = ci; ci->role_switch = usb_role_switch_register(dev, &ci_role_switch);