From: Ziyang Huang <hzyitc@outlook.com>

Date: Tue, 21 Feb 2023 18:30:04 +0800

Subject: [PATCH] usb: dwc2: drd: fix inconsistent mode if

 role-switch-default-mode="host"

References: bsc#1012628

Patch-mainline: 6.2.9

Git-commit: 82f5332d3b9872ab5b287e85c57b76d8bb640cd1

commit 82f5332d3b9872ab5b287e85c57b76d8bb640cd1 upstream.

Some boards might use USB-A female connector for USB ports, however,

the port could be connected to a dual-mode USB controller, making it

also behaves as a peripheral device if male-to-male cable is connected.

In this case, the dts looks like this:

	&usb0 {

		status = "okay";

		dr_mode = "otg";

		usb-role-switch;

		role-switch-default-mode = "host";

	};

After boot, dwc2_ovr_init() sets GOTGCTL to GOTGCTL_AVALOVAL and call

dwc2_force_mode() with parameter host=false, which causes inconsistent

mode - The hardware is in peripheral mode while the kernel status is

in host mode.

What we can do now is to call dwc2_drd_role_sw_set() to switch to

device mode, and everything should work just fine now, even switching

back to none(default) mode afterwards.

Fixes: e14acb876985 ("usb: dwc2: drd: add role-switch-default-node support")

Cc: stable <stable@kernel.org>

Signed-off-by: Ziyang Huang <hzyitc@outlook.com>

Tested-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com>

Acked-by: Minas Harutyunyan <hminas@synopsys.com>

Reviewed-by: Amelie Delaunay <amelie.delaunay@foss.st.com>

Link: https://lore.kernel.org/r/SG2PR01MB204837BF68EDB0E343D2A375C9A59@SG2PR01MB2048.apcprd01.prod.exchangelabs.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/usb/dwc2/drd.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/dwc2/drd.c b/drivers/usb/dwc2/drd.c

index d8d6493b..a8605b02 100644

--- a/drivers/usb/dwc2/drd.c

+++ b/drivers/usb/dwc2/drd.c

@@ -35,7 +35,8 @@ static void dwc2_ovr_init(struct dwc2_hsotg *hsotg)

 	spin_unlock_irqrestore(&hsotg->lock, flags);

-	dwc2_force_mode(hsotg, (hsotg->dr_mode == USB_DR_MODE_HOST));

+	dwc2_force_mode(hsotg, (hsotg->dr_mode == USB_DR_MODE_HOST) ||

+				(hsotg->role_sw_default_mode == USB_DR_MODE_HOST));

 }

 static int dwc2_ovr_avalid(struct dwc2_hsotg *hsotg, bool valid)

-- 

2.35.3