Commit 4244ba02 authored by Thinh Nguyen's avatar Thinh Nguyen Committed by Felipe Balbi
Browse files

usb: dwc3: Get MDWIDTH for DWC_usb32 



DWC_usb32 supports MDWIDTH value larger than 255 and up to 1023. The
field HWPARAMS6[9:8] stores the upper 2-bit values of the DWC_usb32's
MDWIDTH. Check that parameter and properly get the MDWIDTH for
DWC_usb32.

Signed-off-by: default avatarThinh Nguyen <thinhn@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
parent 9af21dd6

drivers/usb/dwc3/core.h

+3 −0
Original line number Diff line number Diff line
@@ -366,6 +366,9 @@ 
#define DWC3_GHWPARAMS6_SRPSUPPORT		BIT(10)

#define DWC3_GHWPARAMS6_EN_FPGA			BIT(7)



/* DWC_usb32 only */

#define DWC3_GHWPARAMS6_MDWIDTH(n)		((n) & (0x3 << 8))



/* Global HWPARAMS7 Register */

#define DWC3_GHWPARAMS7_RAM1_DEPTH(n)	((n) & 0xffff)

#define DWC3_GHWPARAMS7_RAM2_DEPTH(n)	(((n) >> 16) & 0xffff)

drivers/usb/dwc3/debugfs.c

+12 −2
Original line number Diff line number Diff line
@@ -635,13 +635,18 @@ static int dwc3_tx_fifo_size_show(struct seq_file *s, void *unused) 
	struct dwc3_ep		*dep = s->private;

	struct dwc3		*dwc = dep->dwc;

	unsigned long		flags;

	int			mdwidth;

	u32			val;



	spin_lock_irqsave(&dwc->lock, flags);

	val = dwc3_core_fifo_space(dep, DWC3_TXFIFO);



	/* Convert to bytes */

	val *= DWC3_MDWIDTH(dwc->hwparams.hwparams0);

	mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0);

	if (DWC3_IP_IS(DWC32))

		mdwidth += DWC3_GHWPARAMS6_MDWIDTH(dwc->hwparams.hwparams6);



	val *= mdwidth;

	val >>= 3;

	seq_printf(s, "%u\n", val);

	spin_unlock_irqrestore(&dwc->lock, flags);
@@ -654,13 +659,18 @@ static int dwc3_rx_fifo_size_show(struct seq_file *s, void *unused) 
	struct dwc3_ep		*dep = s->private;

	struct dwc3		*dwc = dep->dwc;

	unsigned long		flags;

	int			mdwidth;

	u32			val;



	spin_lock_irqsave(&dwc->lock, flags);

	val = dwc3_core_fifo_space(dep, DWC3_RXFIFO);



	/* Convert to bytes */

	val *= DWC3_MDWIDTH(dwc->hwparams.hwparams0);

	mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0);

	if (DWC3_IP_IS(DWC32))

		mdwidth += DWC3_GHWPARAMS6_MDWIDTH(dwc->hwparams.hwparams6);



	val *= mdwidth;

	val >>= 3;

	seq_printf(s, "%u\n", val);

	spin_unlock_irqrestore(&dwc->lock, flags);

drivers/usb/dwc3/gadget.c

+7 −0
Original line number Diff line number Diff line
@@ -2006,6 +2006,8 @@ static void dwc3_gadget_setup_nump(struct dwc3 *dwc) 


	ram2_depth = DWC3_GHWPARAMS7_RAM2_DEPTH(dwc->hwparams.hwparams7);

	mdwidth = DWC3_GHWPARAMS0_MDWIDTH(dwc->hwparams.hwparams0);

	if (DWC3_IP_IS(DWC32))

		mdwidth += DWC3_GHWPARAMS6_MDWIDTH(dwc->hwparams.hwparams6);



	nump = ((ram2_depth * mdwidth / 8) - 24 - 16) / 1024;

	nump = min_t(u32, nump, 16);
@@ -2290,6 +2292,9 @@ static int dwc3_gadget_init_in_endpoint(struct dwc3_ep *dep) 
	int size;



	mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0);

	if (DWC3_IP_IS(DWC32))

		mdwidth += DWC3_GHWPARAMS6_MDWIDTH(dwc->hwparams.hwparams6);



	/* MDWIDTH is represented in bits, we need it in bytes */

	mdwidth /= 8;
@@ -2334,6 +2339,8 @@ static int dwc3_gadget_init_out_endpoint(struct dwc3_ep *dep) 
	int size;



	mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0);

	if (DWC3_IP_IS(DWC32))

		mdwidth += DWC3_GHWPARAMS6_MDWIDTH(dwc->hwparams.hwparams6);



	/* MDWIDTH is represented in bits, convert to bytes */

	mdwidth /= 8;