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

Commit bb77ee08 authored by Linyu Yuan's avatar Linyu Yuan
Browse files

usb: dwc3: msm: allow suspend in host mode 



Allow controller enter lpm without power collapse.
Also change the DT flag to 'qcom,ignore-wakeup-src-in-hostmode'.

Change-Id: I49f98ad2c7857c8507fa815c50bdcc13db2cb8b7
Signed-off-by: default avatarLinyu Yuan <linyyuan@codeaurora.org>
parent abde0222

drivers/usb/dwc3/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1922,7 +1922,7 @@ static int dwc3_resume(struct device *dev) 
		 * which is now out of LPM. This allows runtime_suspend later.

		 */

		if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST &&

		    dwc->host_poweroff_in_pm_suspend)

		    dwc->ignore_wakeup_src_in_hostmode)

			goto runtime_set_active;



		return 0;

drivers/usb/dwc3/core.h

+1 −1
Original line number Diff line number Diff line
@@ -1365,7 +1365,7 @@ struct dwc3 { 
	 * and core will power collapse. This also leads to reset-resume of

	 * connected devices on PM resume.

	 */

	bool			host_poweroff_in_pm_suspend;

	bool			ignore_wakeup_src_in_hostmode;

	int			retries_on_error;

	/*  If true, GDSC collapse will happen in HOST mode bus suspend */

	bool			gdsc_collapse_in_host_suspend;

drivers/usb/dwc3/dwc3-msm.c

+13 −35
Original line number Diff line number Diff line
@@ -2277,13 +2277,13 @@ static void dwc3_msm_power_collapse_por(struct dwc3_msm *mdwc) 


}



static int dwc3_msm_prepare_suspend(struct dwc3_msm *mdwc, bool ignore_p3_state)

static int dwc3_msm_prepare_suspend(struct dwc3_msm *mdwc)

{

	unsigned long timeout;

	u32 reg = 0;



	if (!ignore_p3_state && ((mdwc->in_host_mode || mdwc->in_device_mode)

			&& dwc3_msm_is_superspeed(mdwc) && !mdwc->in_restart)) {

	if ((mdwc->in_host_mode || mdwc->in_device_mode)

			&& dwc3_msm_is_superspeed(mdwc) && !mdwc->in_restart) {

		if (!atomic_read(&mdwc->in_p3)) {

			dev_err(mdwc->dev, "Not in P3,aborting LPM sequence\n");

			return -EBUSY;
@@ -2482,7 +2482,7 @@ static int dwc3_msm_update_bus_bw(struct dwc3_msm *mdwc, enum bus_vote bv) 
	return ret;

}



static int dwc3_msm_suspend(struct dwc3_msm *mdwc, bool force_power_collapse)

static int dwc3_msm_suspend(struct dwc3_msm *mdwc, bool enable_wakeup)

{

	int ret;

	struct dwc3 *dwc = platform_get_drvdata(mdwc->dwc3);
@@ -2544,7 +2544,7 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc, bool force_power_collapse) 
		return -EBUSY;

	}



	ret = dwc3_msm_prepare_suspend(mdwc, force_power_collapse);

	ret = dwc3_msm_prepare_suspend(mdwc);

	if (ret) {

		mutex_unlock(&mdwc->suspend_resume_mutex);

		return ret;
@@ -2623,7 +2623,7 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc, bool force_power_collapse) 


	/* Perform controller power collapse */

	if (!(mdwc->in_host_mode || mdwc->in_device_mode) ||

	      mdwc->in_restart || force_power_collapse) {

	      mdwc->in_restart) {

		mdwc->lpm_flags |= MDWC3_POWER_COLLAPSE;

		dev_dbg(mdwc->dev, "%s: power collapse\n", __func__);

		dwc3_msm_config_gdsc(mdwc, 0);
@@ -2656,7 +2656,7 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc, bool force_power_collapse) 
	 * using HS_PHY_IRQ or SS_PHY_IRQ. Hence enable wakeup only in

	 * case of host bus suspend and device bus suspend.

	 */

	if (mdwc->in_device_mode || mdwc->in_host_mode) {

	if (!(mdwc->lpm_flags & MDWC3_POWER_COLLAPSE) && enable_wakeup) {

		if (mdwc->use_pdc_interrupts) {

			enable_usb_pdc_interrupt(mdwc, true);

		} else {
@@ -3937,8 +3937,8 @@ static int dwc3_msm_probe(struct platform_device *pdev) 
		mdwc->pm_qos_latency = 0;

	}



	if (of_property_read_bool(node, "qcom,host-poweroff-in-pm-suspend")) {

		dwc->host_poweroff_in_pm_suspend = true;

	if (of_property_read_bool(node, "qcom,ignore-wakeup-src-in-hostmode")) {

		dwc->ignore_wakeup_src_in_hostmode = true;

		dev_dbg(mdwc->dev, "%s: Core power collapse on host PM suspend\n",

								__func__);

	}
@@ -4778,7 +4778,7 @@ static int dwc3_msm_pm_suspend(struct device *dev) 
	 * Check if pm_suspend can proceed irrespective of runtimePM state of

	 * host.

	 */

	if (!dwc->host_poweroff_in_pm_suspend || !mdwc->in_host_mode) {

	if (!dwc->ignore_wakeup_src_in_hostmode || !mdwc->in_host_mode) {

		if (!atomic_read(&dwc->in_lpm)) {

			dev_err(mdwc->dev, "Abort PM suspend!! (USB is outside LPM)\n");

			return -EBUSY;
@@ -4789,20 +4789,7 @@ static int dwc3_msm_pm_suspend(struct device *dev) 
		return 0;

	}



	/*

	 * PHYs also need to be power collapsed, so call notify_disconnect

	 * before suspend to ensure it.

	 */

	usb_phy_notify_disconnect(mdwc->hs_phy, USB_SPEED_HIGH);

	mdwc->hs_phy->flags &= ~PHY_HOST_MODE;

	usb_phy_notify_disconnect(mdwc->ss_phy, USB_SPEED_SUPER);

	mdwc->ss_phy->flags &= ~PHY_HOST_MODE;



	/*

	 * Power collapse the core. Hence call dwc3_msm_suspend with

	 * 'force_power_collapse' set to 'true'.

	 */

	ret = dwc3_msm_suspend(mdwc, true);

	ret = dwc3_msm_suspend(mdwc, false);

	if (!ret)

		atomic_set(&mdwc->pm_suspended, 1);
@@ -4819,7 +4806,7 @@ static int dwc3_msm_pm_resume(struct device *dev) 


	atomic_set(&mdwc->pm_suspended, 0);



	if (!dwc->host_poweroff_in_pm_suspend || !mdwc->in_host_mode) {

	if (!dwc->ignore_wakeup_src_in_hostmode || !mdwc->in_host_mode) {

		/* kick in otg state machine */

		queue_work(mdwc->dwc3_wq, &mdwc->resume_work);
@@ -4832,15 +4819,6 @@ static int dwc3_msm_pm_resume(struct device *dev) 
	pm_runtime_set_active(dev);

	pm_runtime_enable(dev);



	/* Restore PHY flags if hibernated in host mode */

	mdwc->hs_phy->flags |= PHY_HOST_MODE;

	usb_phy_notify_connect(mdwc->hs_phy, USB_SPEED_HIGH);

	if (dwc->maximum_speed >= USB_SPEED_SUPER) {

		mdwc->ss_phy->flags |= PHY_HOST_MODE;

		usb_phy_notify_connect(mdwc->ss_phy,

					USB_SPEED_SUPER);

	}



	/* kick in otg state machine */

	queue_work(mdwc->dwc3_wq, &mdwc->resume_work);
@@ -4868,7 +4846,7 @@ static int dwc3_msm_runtime_suspend(struct device *dev) 
	dev_dbg(dev, "DWC3-msm runtime suspend\n");

	dbg_event(0xFF, "RT Sus", 0);



	return dwc3_msm_suspend(mdwc, false);

	return dwc3_msm_suspend(mdwc, true);

}



static int dwc3_msm_runtime_resume(struct device *dev)

drivers/usb/dwc3/host.c

+2 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ int dwc3_host_init(struct dwc3 *dwc) 
	if (dwc->revision <= DWC3_REVISION_300A)

		props[prop_idx++].name = "quirk-broken-port-ped";



	if (dwc->host_poweroff_in_pm_suspend)

		props[prop_idx++].name = "host-poweroff-in-pm-suspend";

	if (dwc->ignore_wakeup_src_in_hostmode)

		props[prop_idx++].name = "ignore-wakeup-src-in-hostmode";



	if (prop_idx) {

		ret = platform_device_add_properties(xhci, props);

drivers/usb/host/xhci-plat.c

+58 −1
Original line number Diff line number Diff line
@@ -314,6 +314,11 @@ static int xhci_plat_probe(struct platform_device *pdev) 
	}



	hcd_to_bus(xhci->shared_hcd)->skip_resume = true;

	if (device_property_read_bool(&pdev->dev,

				"ignore-wakeup-src-in-hostmode")) {

		hcd_to_bus(hcd)->skip_resume = false;

		hcd_to_bus(xhci->shared_hcd)->skip_resume = false;

	}



	/* imod_interval is the interrupt moderation value in nanoseconds. */

	xhci->imod_interval = 40000;
@@ -425,6 +430,58 @@ static int xhci_plat_remove(struct platform_device *dev) 
	return 0;

}



static int __maybe_unused xhci_plat_suspend(struct device *dev)

{

	struct usb_hcd  *hcd = dev_get_drvdata(dev);

	struct xhci_hcd *xhci = hcd_to_xhci(hcd);



	if (!xhci)

		return 0;



	/*

	 * 'skip_resume' will be true for targets not supporting PM suspend if

	 * runtimePM state is active. No need of xhci_plat PM ops in such case.

	 */

	if (hcd_to_bus(hcd)->skip_resume) {

		dev_dbg(dev, "xhci-plat skip PM suspend\n");

		return 0;

	}



	dev_dbg(dev, "xhci-plat PM suspend\n");



	/* Disable wakeup capability */

	return xhci_suspend(xhci, false);

}



static int __maybe_unused xhci_plat_resume(struct device *dev)

{

	struct usb_hcd  *hcd = dev_get_drvdata(dev);

	struct xhci_hcd *xhci = hcd_to_xhci(hcd);

	int ret;



	if (!xhci)

		return 0;



	/* xhci PM ops not required if 'skip_resume' is true */

	if (hcd_to_bus(hcd)->skip_resume) {

		dev_dbg(dev, "xhci-plat skip PM resume\n");

		return 0;

	}



	dev_dbg(dev, "xhci-plat PM resume\n");



	ret = xhci_priv_resume_quirk(hcd);

	if (ret)

		return ret;



	ret = xhci_resume(xhci, false);

	pm_runtime_disable(dev);

	pm_runtime_set_active(dev);

	pm_runtime_enable(dev);



	return ret;

}



static int __maybe_unused xhci_plat_runtime_idle(struct device *dev)

{

	/*
@@ -477,7 +534,7 @@ static int __maybe_unused xhci_plat_runtime_resume(struct device *dev) 
}



static const struct dev_pm_ops xhci_plat_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(NULL, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(xhci_plat_suspend, xhci_plat_resume)



	SET_RUNTIME_PM_OPS(xhci_plat_runtime_suspend,

			   xhci_plat_runtime_resume,