usb: dwc2: host: add flag to reflect bus state

lx_state must be used to reflect controller power state only and not
bus state. Thus add a flag to track state during bus suspend.

Signed-off-by: Gregory Herrero <gregory.herrero@intel.com>
Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@intel.com>
Tested-by: Robert Baldyga <r.baldyga@samsung.com>
Tested-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Tested-by: John Youn <johnyoun@synopsys.com>
Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 1a7982dbdad566095d913f959e967b97a28045ca..d2115d2a3db28413effb890b288aaff3d80897ec 100644 (file)
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -764,6 +764,7 @@ struct dwc2_hsotg {
        u16 frame_usecs[8];
        u16 frame_number;
        u16 periodic_qh_count;
+       bool bus_suspended;
 
 #ifdef CONFIG_USB_DWC2_TRACK_MISSED_SOFS
 #define FRAME_NUM_ARRAY_SIZE 1000

diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index b929087f26f29807b4fe6db1e92896560b330739..490ecb74382cd039b4a12ca57df3fe446905df06 100644 (file)
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -1425,6 +1425,7 @@ static void dwc2_wakeup_detected(unsigned long data)
        dev_dbg(hsotg->dev, "Clear Resume: HPRT0=%0x\n",
                dwc2_readl(hsotg->regs + HPRT0));
 
+       hsotg->bus_suspended = 0;
        dwc2_hcd_rem_wakeup(hsotg);
 
        /* Change to L0 state */
@@ -1461,8 +1462,7 @@ static void dwc2_port_suspend(struct dwc2_hsotg *hsotg, u16 windex)
        hprt0 |= HPRT0_SUSP;
        dwc2_writel(hprt0, hsotg->regs + HPRT0);
 
-       /* Update lx_state */
-       hsotg->lx_state = DWC2_L2;
+       hsotg->bus_suspended = 1;
 
        /* Suspend the Phy Clock */
        pcgctl = dwc2_readl(hsotg->regs + PCGCTL);
@@ -1510,6 +1510,7 @@ static void dwc2_port_resume(struct dwc2_hsotg *hsotg)
        hprt0 = dwc2_read_hprt0(hsotg);
        hprt0 &= ~(HPRT0_RES | HPRT0_SUSP);
        dwc2_writel(hprt0, hsotg->regs + HPRT0);
+       hsotg->bus_suspended = 0;
        spin_unlock_irqrestore(&hsotg->lock, flags);
 }