@@ -175,6 +175,7 @@ struct ci_hdrc {
bool b_sess_valid_event;
bool supports_runtime_pm;
atomic_t in_lpm;
+ bool wakeup_int;
};
static inline struct ci_role_driver *ci_role(struct ci_hdrc *ci)
@@ -190,6 +190,13 @@ static void ci_hdrc_enter_lpm(struct ci_hdrc *ci, bool enable)
* than 1ms) to leave low power mode.
*/
usleep_range(1500, 2000);
+ } else if (!enable) {
+ /*
+ * At wakeup interrupt, the phcd will be cleared by hardware
+ * automatically, but the controller needs at least 1ms
+ * to reflect PHY's status.
+ */
+ usleep_range(1200, 1800);
}
}
@@ -355,6 +362,13 @@ static irqreturn_t ci_irq(int irq, void *data)
irqreturn_t ret = IRQ_NONE;
u32 otgsc = 0;
+ if (atomic_read(&ci->in_lpm)) {
+ disable_irq_nosync(irq);
+ ci->wakeup_int = true;
+ pm_runtime_get(ci->dev);
+ return IRQ_HANDLED;
+ }
+
if (ci->is_otg)
otgsc = hw_read(ci, OP_OTGSC, ~0);
@@ -737,7 +751,13 @@ static int ci_controller_resume(struct device *dev)
usb_phy_set_wakeup(ci->transceiver, false);
}
- atomic_set(&ci->in_lpm, 0);
+ if (ci->wakeup_int) {
+ ci->wakeup_int = false;
+ atomic_set(&ci->in_lpm, 0);
+ enable_irq(ci->irq);
+ pm_runtime_put(ci->dev);
+ } else
+ atomic_set(&ci->in_lpm, 0);
return 0;
}
@@ -78,10 +78,15 @@ static void ci_otg_work(struct work_struct *work)
if (ci->id_event) {
ci->id_event = false;
+ /* Keep controller active during id switch */
+ pm_runtime_get_sync(ci->dev);
ci_handle_id_switch(ci);
+ pm_runtime_put_sync(ci->dev);
} else if (ci->b_sess_valid_event) {
ci->b_sess_valid_event = false;
+ pm_runtime_get_sync(ci->dev);
ci_handle_vbus_change(ci);
+ pm_runtime_put_sync(ci->dev);
} else
dev_err(ci->dev, "unexpected event occurs at %s\n", __func__);
When the controller is at suspend mode, it can be waken up by external events (like vbus, dp/dm or id change). Once we receive the wakeup interrupt, we need to resume the controller first, eg open clocks, disable some wakeup settings, etc. After that, the controller can receive the normal USB interrupts. Signed-off-by: Peter Chen <peter.chen@freescale.com> --- drivers/usb/chipidea/ci.h | 1 + drivers/usb/chipidea/core.c | 22 +++++++++++++++++++++- drivers/usb/chipidea/otg.c | 5 +++++ 3 files changed, 27 insertions(+), 1 deletions(-)