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

Commit c31a1b29 authored by Hemant Kumar's avatar Hemant Kumar Committed by Gerrit - the friendly Code Review server
Browse files

usb: dwc3: Do not initiate remote wakeup from core layer 



commit c36d8e94 ("usb: dwc3: gadget: put link to U0
before Start Transfer") forcing remote wakeup even if
it is not supported by function. In case remote wakeup
fails it goes ahead and issues start transfer cmd, which
defeats the purpose of the change. Function driver needs
to make the decision if device needs to perform remote
wakeup or not by calling usb_gadget_wakeup (in HS mode) or
usb_func_wakeup (in SS or higher mode).

Change-Id: I7ec5a29ae5beb1ea501f4127f440074396db9bda
Signed-off-by: default avatarHemant Kumar <hemantk@codeaurora.org>
parent 648dc229

drivers/usb/dwc3/gadget.c

+0 −82
Original line number Diff line number Diff line
@@ -360,8 +360,6 @@ int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned cmd, u32 param) 
	return ret;

}



static int __dwc3_gadget_wakeup(struct dwc3 *dwc);



/**

 * dwc3_send_gadget_ep_cmd - issue an endpoint command

 * @dep: the endpoint to which the command is going to be issued
@@ -400,20 +398,6 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd, 
		}

	}



	if (DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_STARTTRANSFER) {

		int		needs_wakeup;



		needs_wakeup = (dwc->link_state == DWC3_LINK_STATE_U1 ||

				dwc->link_state == DWC3_LINK_STATE_U2 ||

				dwc->link_state == DWC3_LINK_STATE_U3);



		if (unlikely(needs_wakeup)) {

			ret = __dwc3_gadget_wakeup(dwc);

			dev_WARN_ONCE(dwc->dev, ret, "wakeup failed --> %d\n",

					ret);

		}

	}



	dwc3_writel(dep->regs, DWC3_DEPCMDPAR0, params->param0);

	dwc3_writel(dep->regs, DWC3_DEPCMDPAR1, params->param1);

	dwc3_writel(dep->regs, DWC3_DEPCMDPAR2, params->param2);
@@ -1852,72 +1836,6 @@ static int dwc3_gadget_get_frame(struct usb_gadget *g) 
	return __dwc3_gadget_get_frame(dwc);

}



static int __dwc3_gadget_wakeup(struct dwc3 *dwc)

{

	int			retries;



	int			ret;

	u32			reg;



	u8			link_state;

	u8			speed;



	/*

	 * According to the Databook Remote wakeup request should

	 * be issued only when the device is in early suspend state.

	 *

	 * We can check that via USB Link State bits in DSTS register.

	 */

	reg = dwc3_readl(dwc->regs, DWC3_DSTS);



	speed = reg & DWC3_DSTS_CONNECTSPD;

	if ((speed == DWC3_DSTS_SUPERSPEED) ||

	    (speed == DWC3_DSTS_SUPERSPEED_PLUS))

		return 0;



	link_state = DWC3_DSTS_USBLNKST(reg);



	switch (link_state) {

	case DWC3_LINK_STATE_RX_DET:	/* in HS, means Early Suspend */

	case DWC3_LINK_STATE_U3:	/* in HS, means SUSPEND */

		break;

	default:

		return -EINVAL;

	}



	ret = dwc3_gadget_set_link_state(dwc, DWC3_LINK_STATE_RECOV);

	if (ret < 0) {

		dev_err(dwc->dev, "failed to put link in Recovery\n");

		return ret;

	}



	/* Recent versions do this automatically */

	if (dwc->revision < DWC3_REVISION_194A) {

		/* write zeroes to Link Change Request */

		reg = dwc3_readl(dwc->regs, DWC3_DCTL);

		reg &= ~DWC3_DCTL_ULSTCHNGREQ_MASK;

		dwc3_writel(dwc->regs, DWC3_DCTL, reg);

	}



	/* poll until Link State changes to ON */

	retries = 20000;



	while (retries--) {

		reg = dwc3_readl(dwc->regs, DWC3_DSTS);



		/* in HS, means ON */

		if (DWC3_DSTS_USBLNKST(reg) == DWC3_LINK_STATE_U0)

			break;

	}



	if (DWC3_DSTS_USBLNKST(reg) != DWC3_LINK_STATE_U0) {

		dev_err(dwc->dev, "failed to send remote wakeup\n");

		return -EINVAL;

	}



	return 0;

}



#define DWC3_PM_RESUME_RETRIES		20    /* Max Number of retries */

#define DWC3_PM_RESUME_DELAY		100   /* 100 msec */