Avoiding phy powerdown when wakeup capable devices are connected
by checking phy_power_off flag.
Phy should be on to wake up the device from suspend using wakeup capable
devices such as keyboard and mouse.

Signed-off-by: Sandeep Maheswaram <[email protected]>
---
 drivers/usb/dwc3/core.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 05e2e54c..3b88c62 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1701,7 +1701,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, 
pm_message_t msg)
                dwc3_core_exit(dwc);
                break;
        case DWC3_GCTL_PRTCAP_HOST:
-               if (!PMSG_IS_AUTO(msg)) {
+               if (!PMSG_IS_AUTO(msg) && dwc->phy_power_off) {
                        dwc3_core_exit(dwc);
                        break;
                }
@@ -1762,13 +1762,16 @@ static int dwc3_resume_common(struct dwc3 *dwc, 
pm_message_t msg)
                spin_unlock_irqrestore(&dwc->lock, flags);
                break;
        case DWC3_GCTL_PRTCAP_HOST:
-               if (!PMSG_IS_AUTO(msg)) {
+               if (!PMSG_IS_AUTO(msg) && dwc->phy_power_off) {
                        ret = dwc3_core_init_for_resume(dwc);
                        if (ret)
                                return ret;
                        dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST);
                        break;
+               } else {
+                       dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST);
                }
+
                /* Restore GUSB2PHYCFG bits that were modified in suspend */
                reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
                if (dwc->dis_u2_susphy_quirk)
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

Reply via email to