From: Jisheng Zhang Date: Tue, 27 Jun 2023 16:20:18 +0000 (+0800) Subject: usb: dwc3: don't reset device side if dwc3 was configured as host-only X-Git-Tag: Ubuntu-6.2.0-36.36~88 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=88d92838526273c21d1ec9ab73e1f87a5664c7df;p=mirror_ubuntu-kernels.git usb: dwc3: don't reset device side if dwc3 was configured as host-only BugLink: https://bugs.launchpad.net/bugs/2037005 commit e835c0a4e23c38531dcee5ef77e8d1cf462658c7 upstream. Commit c4a5153e87fd ("usb: dwc3: core: Power-off core/PHYs on system_suspend in host mode") replaces check for HOST only dr_mode with current_dr_role. But during booting, the current_dr_role isn't initialized, thus the device side reset is always issued even if dwc3 was configured as host-only. What's more, on some platforms with host only dwc3, aways issuing device side reset by accessing device register block can cause kernel panic. Fixes: c4a5153e87fd ("usb: dwc3: core: Power-off core/PHYs on system_suspend in host mode") Cc: stable Signed-off-by: Jisheng Zhang Acked-by: Thinh Nguyen Link: https://lore.kernel.org/r/20230627162018.739-1-jszhang@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Kamal Mostafa Signed-off-by: Roxana Nicolescu --- diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index e3e75406ec1d..3ee70ffaf003 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -277,9 +277,9 @@ int dwc3_core_soft_reset(struct dwc3 *dwc) /* * We're resetting only the device side because, if we're in host mode, * XHCI driver will reset the host block. If dwc3 was configured for - * host-only mode, then we can return early. + * host-only mode or current role is host, then we can return early. */ - if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) + if (dwc->dr_mode == USB_DR_MODE_HOST || dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) return 0; reg = dwc3_readl(dwc->regs, DWC3_DCTL);