Commit bcbaf126 authored Apr 11, 2022 by Sven Peter Committed by Lee Jones Nov 22, 2022

UPSTREAM: usb: dwc3: Try usb-role-switch first in dwc3_drd_init



If the PHY controller node has a "port" dwc3 tries to find an
extcon device even when "usb-role-switch" is present. This happens
because dwc3_get_extcon() sees that "port" node and then calls
extcon_find_edev_by_node() which will always return EPROBE_DEFER
in that case.

On the other hand, even if an extcon was present and dwc3_get_extcon()
was successful it would still be ignored in favor of "usb-role-switch".

Let's just first check if "usb-role-switch" is configured in the device
tree and directly use it instead and only try to look for an extcon
device otherwise.

Bug: 254441685
Fixes: 8a0a13799744 ("usb: dwc3: Registering a role switch in the DRD code.")
Cc: stable <stable@kernel.org>
Signed-off-by: Sven Peter <sven@svenpeter.dev>
Link: https://lore.kernel.org/r/20220411155300.9766-1-sven@svenpeter.dev


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit ab7aa2866d295438dc60522f85c5421c6b4f1507)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I394fbcaf90a5a37b3a22c309dd46fd46d7510442

parent 2117e7c7

drivers/usb/dwc3/drd.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -566,16 +566,15 @@ int dwc3_drd_init(struct dwc3 *dwc)
		{
		int ret, irq;

		if (ROLE_SWITCH &&
		device_property_read_bool(dwc->dev, "usb-role-switch"))
		return dwc3_setup_role_switch(dwc);

		dwc->edev = dwc3_get_extcon(dwc);
		if (IS_ERR(dwc->edev))
		return PTR_ERR(dwc->edev);

		if (ROLE_SWITCH &&
		device_property_read_bool(dwc->dev, "usb-role-switch")) {
		ret = dwc3_setup_role_switch(dwc);
		if (ret < 0)
		return ret;
		} else if (dwc->edev) {
		if (dwc->edev) {
		dwc->edev_nb.notifier_call = dwc3_drd_notifier;
		ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST,
		&dwc->edev_nb);