Merge "usb: dwc3: ep0: NAK L1 initiated between SETUP and STATUS stage" (65ee504d) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/dwc3/ep0.c

+15 −0

Original line number	Diff line number	Diff line
		@@ -816,6 +816,16 @@ static void dwc3_ep0_inspect_setup(struct dwc3 *dwc,
		if (!dwc->gadget_driver)
		goto out;

		/*
		* Workaround for SNPS STAR: 9001046257 which affects dwc3 core
		* 3.10a or earlier. LPM Not rejected during control transfer. Device
		* is programmed to reject LPM when SETUP packet is received and
		* ACK LPM after completing STATUS stage.
		*/
		if (dwc->has_lpm_erratum && dwc->revision <= DWC3_REVISION_310A)
		dwc3_masked_write_readback(dwc->regs, DWC3_DCTL,
		DWC3_DCTL_LPM_ERRATA_MASK, DWC3_DCTL_LPM_ERRATA(0));

		trace_dwc3_ctrl_req(ctrl);

		len = le16_to_cpu(ctrl->wLength);
		@@ -990,6 +1000,11 @@ static void dwc3_ep0_complete_status(struct dwc3 *dwc,
		dbg_print(dep->number, "DONE", status, "STATUS");
		dwc->ep0state = EP0_SETUP_PHASE;
		dwc3_ep0_out_start(dwc);

		if (dwc->has_lpm_erratum && dwc->revision <= DWC3_REVISION_310A)
		dwc3_masked_write_readback(dwc->regs, DWC3_DCTL,
		DWC3_DCTL_LPM_ERRATA_MASK,
		DWC3_DCTL_LPM_ERRATA(dwc->lpm_nyet_threshold));
		}

		static void dwc3_ep0_xfer_complete(struct dwc3 *dwc,

+24 −0

Original line number	Diff line number	Diff line
		@@ -64,4 +64,28 @@ static inline void dwc3_writel(void __iomem *base, u32 offset, u32 value)
		base - DWC3_GLOBALS_REGS_START + offset, value);
		}

		static inline void dwc3_masked_write_readback(void __iomem *base,
		u32 offset, const u32 mask, u32 value)
		{
		u32 write_val, tmp;

		tmp = readl_relaxed(base + offset - DWC3_GLOBALS_REGS_START);
		tmp &= ~mask; /* retain other bits */
		write_val = tmp \| value;

		writel_relaxed(write_val, base + offset - DWC3_GLOBALS_REGS_START);

		/* Read back to see if value was written */
		tmp = readl_relaxed(base + offset);

		dwc3_trace(trace_dwc3_masked_write_readback,
		"addr %p readback val %08x",
		base - DWC3_GLOBALS_REGS_START + offset, tmp);

		tmp &= mask; /* clear other bits */
		if (tmp != value)
		pr_err("%s: write: %x to %x FAILED\n",
		__func__, value, offset);
		}

		#endif /* __DRIVERS_USB_DWC3_IO_H */

+5 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,11 @@ DEFINE_EVENT(dwc3_log_msg, dwc3_writel,
		TP_ARGS(vaf)
		);

		DEFINE_EVENT(dwc3_log_msg, dwc3_masked_write_readback,
		TP_PROTO(struct va_format *vaf),
		TP_ARGS(vaf)
		);

		DEFINE_EVENT(dwc3_log_msg, dwc3_gadget,
		TP_PROTO(struct va_format *vaf),
		TP_ARGS(vaf)