USB: dwc3-msm: Enable async irq wakeup capability only if required
If driver is depending on PMIC for VBUS and ID events, then async
interrupt is not required to set wakeup capable during cable
disconnect or when dcp is connected. Otherwise this interrupt can be
fired before PMIC notification during system suspend and could mess up
run time pm counters. Hence enable async irq wakeup capability
during bus suspend and disable it during device resume.
CRs-Fixed: 634833
Change-Id: Ifea0150ee947823ba4f8183af911e150fde61f1f
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c
index 7eed125..3f92e76 100644
--- a/drivers/usb/dwc3/dwc3-msm.c
+++ b/drivers/usb/dwc3/dwc3-msm.c
@@ -238,6 +238,7 @@
unsigned long lpm_flags;
#define MDWC3_PHY_REF_AND_CORECLK_OFF BIT(0)
#define MDWC3_TCXO_SHUTDOWN BIT(1)
+#define MDWC3_ASYNC_IRQ_WAKE_CAPABILITY BIT(2)
u32 qscratch_ctl_val;
dev_t ext_chg_dev;
@@ -1823,6 +1824,7 @@
bool host_bus_suspend;
bool host_ss_active;
bool host_ss_suspend;
+ bool device_bus_suspend;
dev_dbg(mdwc->dev, "%s: entering lpm\n", __func__);
@@ -1850,6 +1852,8 @@
(mdwc->charger.chg_type == DWC3_FLOATED_CHARGER));
host_bus_suspend = mdwc->host_mode == 1;
host_ss_suspend = host_bus_suspend && host_ss_active;
+ device_bus_suspend = ((mdwc->charger.chg_type == DWC3_SDP_CHARGER) ||
+ (mdwc->charger.chg_type == DWC3_CDP_CHARGER));
if (!dcp && !host_bus_suspend)
dwc3_msm_write_reg(mdwc->base, QSCRATCH_CTRL_REG,
@@ -1952,10 +1956,16 @@
dev_info(mdwc->dev, "DWC3 in low power mode\n");
if (mdwc->hs_phy_irq) {
+ /*
+ * with DCP or during cable disconnect, we dont require wakeup
+ * using HS_PHY_IRQ. Hence enable wakeup only in case of host
+ * bus suspend and device bus suspend.
+ */
+ if (host_bus_suspend || device_bus_suspend) {
+ enable_irq_wake(mdwc->hs_phy_irq);
+ mdwc->lpm_flags |= MDWC3_ASYNC_IRQ_WAKE_CAPABILITY;
+ }
enable_irq(mdwc->hs_phy_irq);
- /* with DCP we dont require wakeup using HS_PHY_IRQ */
- if (dcp)
- disable_irq_wake(mdwc->hs_phy_irq);
}
return 0;
@@ -2089,9 +2099,12 @@
enable_irq(mdwc->hs_phy_irq);
mdwc->lpm_irq_seen = false;
}
- /* it must DCP disconnect, re-enable HS_PHY wakeup IRQ */
- if (mdwc->hs_phy_irq && dcp)
- enable_irq_wake(mdwc->hs_phy_irq);
+ /* Disable wakeup capable for HS_PHY IRQ, if enabled */
+ if (mdwc->hs_phy_irq &&
+ (mdwc->lpm_flags & MDWC3_ASYNC_IRQ_WAKE_CAPABILITY)) {
+ disable_irq_wake(mdwc->hs_phy_irq);
+ mdwc->lpm_flags &= ~MDWC3_ASYNC_IRQ_WAKE_CAPABILITY;
+ }
dev_info(mdwc->dev, "DWC3 exited from low power mode\n");
@@ -2981,7 +2994,6 @@
dev_err(&pdev->dev, "irqreq HSPHYINT failed\n");
goto disable_hs_ldo;
}
- enable_irq_wake(mdwc->hs_phy_irq);
}
if (mdwc->ext_xceiv.otg_capability) {