Merge "usb: dwc3: gadget: Fix ISO transfer performance" (1f7554fb) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/dwc3/core.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -480,6 +480,8 @@
		#define DWC3_DEPCMD_SETTRANSFRESOURCE (0x02 << 0)
		#define DWC3_DEPCMD_SETEPCONFIG (0x01 << 0)

		#define DWC3_DEPCMD_CMD(x) ((x) & 0xf)

		/* The EP number goes 0..31 so ep0 is always out and ep1 is always in */
		#define DWC3_DALEPENA_EP(n) (1 << n)

		@@ -613,6 +615,7 @@ struct dwc3_ep {
		#define DWC3_EP_BUSY (1 << 4)
		#define DWC3_EP_PENDING_REQUEST (1 << 5)
		#define DWC3_EP_MISSED_ISOC (1 << 6)
		#define DWC3_EP_TRANSFER_STARTED (1 << 8)

		/* This last one is specific to EP0 */
		#define DWC3_EP0_DIR_IN (1 << 31)

drivers/usb/dwc3/gadget.c

+51 −11

Original line number	Diff line number	Diff line
		@@ -355,7 +355,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
		}
		}

		if (cmd == DWC3_DEPCMD_STARTTRANSFER) {
		if (DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_STARTTRANSFER) {
		int needs_wakeup;

		needs_wakeup = (dwc->link_state == DWC3_LINK_STATE_U1 \|\|
		@@ -423,6 +423,20 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,

		trace_dwc3_gadget_ep_cmd(dep, cmd, params, cmd_status);

		if (ret == 0) {
		switch (DWC3_DEPCMD_CMD(cmd)) {
		case DWC3_DEPCMD_STARTTRANSFER:
		dep->flags \|= DWC3_EP_TRANSFER_STARTED;
		break;
		case DWC3_DEPCMD_ENDTRANSFER:
		dep->flags &= ~DWC3_EP_TRANSFER_STARTED;
		break;
		default:
		/* nothing */
		break;
		}
		}

		if (unlikely(susphy)) {
		reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
		reg \|= DWC3_GUSB2PHYCFG_SUSPHY;
		@@ -1200,6 +1214,14 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param)
		return 0;
		}

		static int __dwc3_gadget_get_frame(struct dwc3 *dwc)
		{
		u32 reg;

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

		static void __dwc3_gadget_start_isoc(struct dwc3 *dwc,
		struct dwc3_ep *dep, u32 cur_uf)
		{
		@@ -1214,8 +1236,11 @@ static void __dwc3_gadget_start_isoc(struct dwc3 *dwc,
		return;
		}

		/* 4 micro frames in the future */
		uf = cur_uf + dep->interval * 4;
		/*
		* Schedule the first trb for one interval in the future or at
		* least 4 microframes.
		*/
		uf = cur_uf + max_t(u32, 4, dep->interval);

		ret = __dwc3_gadget_kick_transfer(dep, uf);
		if (ret < 0)
		@@ -1285,14 +1310,30 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep dep, struct dwc3_request req)
		* errors which will force us issue EndTransfer command.
		*/
		if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
		if ((dep->flags & DWC3_EP_PENDING_REQUEST) &&
		list_empty(&dep->started_list)) {
		if ((dep->flags & DWC3_EP_PENDING_REQUEST)) {
		if (dep->flags & DWC3_EP_TRANSFER_STARTED) {
		dwc3_stop_active_transfer(dwc, dep->number, true);
		dep->flags = DWC3_EP_ENABLED;
		} else {
		u32 cur_uf;

		cur_uf = __dwc3_gadget_get_frame(dwc);
		__dwc3_gadget_start_isoc(dwc, dep, cur_uf);
		dep->flags &= ~DWC3_EP_PENDING_REQUEST;
		}
		return 0;
		}

		if ((dep->flags & DWC3_EP_BUSY) &&
		!(dep->flags & DWC3_EP_MISSED_ISOC)) {
		WARN_ON_ONCE(!dep->resource_index);
		ret = __dwc3_gadget_kick_transfer(dep,
		dep->resource_index);
		}

		goto out;
		}

		if (!dwc3_calc_trbs_left(dep))
		return 0;

		@@ -1301,6 +1342,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep dep, struct dwc3_request req)
		dwc3_trace(trace_dwc3_gadget,
		"%s: failed to kick transfers",
		dep->name);
		out:
		if (ret == -EBUSY)
		ret = 0;

		@@ -1635,10 +1677,8 @@ static const struct usb_ep_ops dwc3_gadget_ep_ops = {
		static int dwc3_gadget_get_frame(struct usb_gadget *g)
		{
		struct dwc3 *dwc = gadget_to_dwc(g);
		u32 reg;

		reg = dwc3_readl(dwc->regs, DWC3_DSTS);
		return DWC3_DSTS_SOFFN(reg);
		return __dwc3_gadget_get_frame(dwc);
		}

		static int __dwc3_gadget_wakeup(struct dwc3 *dwc)