[2/2] usb: dwc3: core: fix ordering for PHY suspend

Message ID 1409780463-29635-2-git-send-email-balbi@ti.com
State Accepted
Commit dc99f16f076559235c92d3eb66d03d1310faea08
Headers show

Commit Message

Felipe Balbi Sept. 3, 2014, 9:41 p.m.
We can't suspend the PHYs before dwc3_core_exit_mode()
has been called, that's because the host and/or device
sides might still need to communicate with the far end
link partner.

Fixes: 8ba007a (usb: dwc3: core: enable the USB2 and USB3 phy in probe)
Cc: <stable@vger.kernel.org> # v3.9+
Suggested-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 drivers/usb/dwc3/core.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Felipe Balbi Sept. 3, 2014, 9:49 p.m. | #1
On Wed, Sep 03, 2014 at 04:41:03PM -0500, Felipe Balbi wrote:
> We can't suspend the PHYs before dwc3_core_exit_mode()
> has been called, that's because the host and/or device
> sides might still need to communicate with the far end
> link partner.
> 
> Fixes: 8ba007a (usb: dwc3: core: enable the USB2 and USB3 phy in probe)
> Cc: <stable@vger.kernel.org> # v3.9+
> Suggested-by: Alan Stern <stern@rowland.harvard.edu>

Alan, let me know if you prefer that I remove this line.

cheers

Patch

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index a664d5b..9069984 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -799,15 +799,16 @@  static int dwc3_remove(struct platform_device *pdev)
 {
 	struct dwc3	*dwc = platform_get_drvdata(pdev);
 
+	dwc3_debugfs_exit(dwc);
+	dwc3_core_exit_mode(dwc);
+	dwc3_event_buffers_cleanup(dwc);
+	dwc3_free_event_buffers(dwc);
+
 	usb_phy_set_suspend(dwc->usb2_phy, 1);
 	usb_phy_set_suspend(dwc->usb3_phy, 1);
 	phy_power_off(dwc->usb2_generic_phy);
 	phy_power_off(dwc->usb3_generic_phy);
 
-	dwc3_debugfs_exit(dwc);
-	dwc3_core_exit_mode(dwc);
-	dwc3_event_buffers_cleanup(dwc);
-	dwc3_free_event_buffers(dwc);
 	dwc3_core_exit(dwc);
 
 	pm_runtime_put_sync(&pdev->dev);