Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30db103c authored by Gregory Herrero's avatar Gregory Herrero Committed by Felipe Balbi
Browse files

usb: dwc2: host: create a function to handle port_resume 



port resume sequence may be used in different places. Create a
function to handle it. Make hprt0 read-modify-write atomic and
clear HPRT0_SUSP for both writes as it is a "read, write-set,
and self-clear (R_WS_SC)" bit. Since the lock is released
between the writes, read hprt0 again.

Since the phy clock is stopped in dwc2_port_suspend(), enable it
here and remove the PCGCTL write from dwc2_hcd_hub_control()

Signed-off-by: default avatarGregory Herrero <gregory.herrero@intel.com>
Signed-off-by: default avatarMian Yousaf Kaukab <yousaf.kaukab@intel.com>
Tested-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Tested-by: default avatarDinh Nguyen <dinguyen@opensource.altera.com>
Tested-by: default avatarJohn Youn <johnyoun@synopsys.com>
Acked-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent cc047ce4

drivers/usb/dwc2/hcd.c

+30 −10
Original line number Diff line number Diff line
@@ -1484,6 +1484,35 @@ static void dwc2_port_suspend(struct dwc2_hsotg *hsotg, u16 windex) 
	}

}



/* Must NOT be called with interrupt disabled or spinlock held */

static void dwc2_port_resume(struct dwc2_hsotg *hsotg)

{

	unsigned long flags;

	u32 hprt0;

	u32 pcgctl;



	/* Resume the Phy Clock */

	pcgctl = dwc2_readl(hsotg->regs + PCGCTL);

	pcgctl &= ~PCGCTL_STOPPCLK;

	dwc2_writel(pcgctl, hsotg->regs + PCGCTL);

	usleep_range(20000, 40000);



	spin_lock_irqsave(&hsotg->lock, flags);

	hprt0 = dwc2_read_hprt0(hsotg);

	hprt0 |= HPRT0_RES;

	hprt0 &= ~HPRT0_SUSP;

	dwc2_writel(hprt0, hsotg->regs + HPRT0);

	spin_unlock_irqrestore(&hsotg->lock, flags);



	msleep(USB_RESUME_TIMEOUT);



	spin_lock_irqsave(&hsotg->lock, flags);

	hprt0 = dwc2_read_hprt0(hsotg);

	hprt0 &= ~(HPRT0_RES | HPRT0_SUSP);

	dwc2_writel(hprt0, hsotg->regs + HPRT0);

	spin_unlock_irqrestore(&hsotg->lock, flags);

}



/* Handles hub class-specific requests */

static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,

				u16 wvalue, u16 windex, char *buf, u16 wlength)
@@ -1529,17 +1558,8 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq, 
		case USB_PORT_FEAT_SUSPEND:

			dev_dbg(hsotg->dev,

				"ClearPortFeature USB_PORT_FEAT_SUSPEND\n");

			dwc2_writel(0, hsotg->regs + PCGCTL);

			usleep_range(20000, 40000);



			hprt0 = dwc2_read_hprt0(hsotg);

			hprt0 |= HPRT0_RES;

			dwc2_writel(hprt0, hsotg->regs + HPRT0);

			hprt0 &= ~HPRT0_SUSP;

			msleep(USB_RESUME_TIMEOUT);



			hprt0 &= ~HPRT0_RES;

			dwc2_writel(hprt0, hsotg->regs + HPRT0);

			dwc2_port_resume(hsotg);

			break;



		case USB_PORT_FEAT_POWER: