Merge "usb: dwc3: Do not initiate remote wakeup from core layer" (41e9747d) · Commits · e / devices / android_kernel_fairphone_FP4

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 */