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

Commit c711b945 authored by Rohith Kollalsi's avatar Rohith Kollalsi
Browse files

usb: dwc3: Revert Add support for nominal elastic buffer 



Commit 3bb69751 ("usb: dwc3: Add support for nominal
elastic buffer") breaks working of current 5.4 kernel
based targets by clearing elastic buffer which is not
expected. Hence revert the change.

Change-Id: I3a492289eea1cb728c2e16ea1b991862d2219bbe
Signed-off-by: default avatarRohith Kollalsi <rkollals@codeaurora.org>
parent e8b3c550

drivers/usb/dwc3/core.c

+0 −12
Original line number Diff line number Diff line
@@ -1121,16 +1121,6 @@ int dwc3_core_init(struct dwc3 *dwc) 
	}



	dwc3_notify_event(dwc, DWC3_CONTROLLER_POST_RESET_EVENT, 0);

	/*

	 * clear Elastic buffer mode in GUSBPIPE_CTRL(0) register, otherwise

	 * it results in high link errors and could cause SS mode transfer

	 * failure.

	 */

	if (!dwc->nominal_elastic_buffer) {

		reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));

		reg &= ~DWC3_GUSB3PIPECTL_ELASTIC_BUF_MODE;

		dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg);

	}



	return 0;
@@ -1379,8 +1369,6 @@ static void dwc3_get_properties(struct dwc3 *dwc) 
				&tx_thr_num_pkt_prd);

	device_property_read_u8(dev, "snps,tx-max-burst-prd",

				&tx_max_burst_prd);

	dwc->nominal_elastic_buffer = of_property_read_bool(dev->of_node,

			"nominal-elastic-buffer");



	dwc->needs_fifo_resize = device_property_read_bool(dev,

				"tx-fifo-resize");

drivers/usb/dwc3/core.h

+0 −2
Original line number Diff line number Diff line
@@ -337,7 +337,6 @@ 
#define DWC3_GUSB3PIPECTL_TX_DEEPH_MASK	DWC3_GUSB3PIPECTL_TX_DEEPH(3)

#define DWC3_GUSB3PIPECTL_TX_DEEPH(n)	((n) << 1)

#define DWC3_GUSB3PIPECTL_DELAYP1TRANS  BIT(18)

#define DWC3_GUSB3PIPECTL_ELASTIC_BUF_MODE  (1 << 0)



/* Global TX Fifo Size Register */

#define DWC31_GTXFIFOSIZ_TXFRAMNUM	BIT(15)		/* DWC_usb31 only */
@@ -1366,7 +1365,6 @@ struct dwc3 { 
	struct dwc3_gadget_events	dbg_gadget_events;

	int			tx_fifo_size;

	int			last_fifo_depth;

	bool			nominal_elastic_buffer;



	/* IRQ timing statistics */

	int			irq;