From: Kevin Hao <[email protected]> When merging the stable commit c1fad1695bef ("usb: dwc3: don't reset device side if dwc3 was configured as host-only"), part changes of the SDK commit c2b324f9c878 ("usb: dwc3: don't setup event buffers when operating in host mode") has been accidentally deleted. Restore them.
Signed-off-by: Kevin Hao <[email protected]> --- Hi Bruce, Please help me merge this into the following four branches: v5.15/standard/sdkv5.15/xlnx-soc v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc v6.1/standard/sdkv6.1/xlnx-soc v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc drivers/usb/dwc3/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 7dc88ac9d686..0d5a54f3b148 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -266,8 +266,10 @@ 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 or current role is host, then we can return early. + * When hibernated don't perform core soft reset. */ - if (dwc->dr_mode == USB_DR_MODE_HOST || dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) + if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST || + dwc->is_hibernated == true || dwc->dr_mode == USB_DR_MODE_HOST) return 0; reg = dwc3_readl(dwc->regs, DWC3_DCTL); -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12922): https://lists.yoctoproject.org/g/linux-yocto/message/12922 Mute This Topic: https://lists.yoctoproject.org/mt/100537957/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
