usb: dwc3: Prevent runtime_suspend after wakeup event
Currently the core is being suspended even after the
wakeup event because the autosuspend delay is elapsed
after the wakeup event is received but before the sm_work
is executed.
Prevent the runtime_suspend being called by marking last_busy
when the wakeup interrupt is received. Also bail out
from the dwc3_msm_suspend if a wakeup interrupt is
received.
Change-Id: I229338adbf3a6719e7e818d1da83eda9f03034b7
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c
index 5aaf856..fbb5694 100644
--- a/drivers/usb/dwc3/dwc3-msm.c
+++ b/drivers/usb/dwc3/dwc3-msm.c
@@ -2322,6 +2322,13 @@
return -EBUSY;
}
+ if (!mdwc->in_host_mode && (mdwc->vbus_active && !mdwc->suspend)) {
+ dev_dbg(mdwc->dev,
+ "Received wakeup event before the core suspend\n");
+ mutex_unlock(&mdwc->suspend_resume_mutex);
+ return -EBUSY;
+ }
+
ret = dwc3_msm_prepare_suspend(mdwc);
if (ret) {
mutex_unlock(&mdwc->suspend_resume_mutex);
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index e6c89a3..e9f4ade 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -3354,8 +3354,11 @@
/*
* In case of remote wake up dwc3_gadget_wakeup_work()
- * is doing pm_runtime_get_sync().
+ * is doing pm_runtime_get_sync(). But mark last wakeup
+ * event here to prevent runtime_suspend happening before this
+ * wakeup event is processed.
*/
+ pm_runtime_mark_last_busy(dwc->dev);
dev_dbg(dwc->dev, "Notify OTG from %s\n", __func__);
dwc->b_suspend = false;
dwc3_notify_event(dwc,