usb: musb: support ISO high bandwidth for gadget mode (f11d893d) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/usb/musb/musb_gadget.c

+37 −12

Original line number	Original line	Diff line number	Diff line
	@@ -337,13 +337,15 @@ static void txstate(struct musb musb, struct musb_request req)
	csr \|= (MUSB_TXCSR_DMAENAB \|		csr \|= (MUSB_TXCSR_DMAENAB \|
	MUSB_TXCSR_MODE);		MUSB_TXCSR_MODE);
	/* against programming guide */		/* against programming guide */
	} else		} else {
	csr \|= (MUSB_TXCSR_AUTOSET		csr \|= (MUSB_TXCSR_DMAENAB
	\| MUSB_TXCSR_DMAENAB
	\| MUSB_TXCSR_DMAMODE		\| MUSB_TXCSR_DMAMODE
	\| MUSB_TXCSR_MODE);		\| MUSB_TXCSR_MODE);
			if (!musb_ep->hb_mult)
			csr \|= MUSB_TXCSR_AUTOSET;
			}
	csr &= ~MUSB_TXCSR_P_UNDERRUN;		csr &= ~MUSB_TXCSR_P_UNDERRUN;

	musb_writew(epio, MUSB_TXCSR, csr);		musb_writew(epio, MUSB_TXCSR, csr);
	}		}
	}		}
	@@ -643,6 +645,7 @@ static void rxstate(struct musb musb, struct musb_request req)
	*/		*/

	csr \|= MUSB_RXCSR_DMAENAB;		csr \|= MUSB_RXCSR_DMAENAB;
			if (!musb_ep->hb_mult)
	csr \|= MUSB_RXCSR_AUTOCLEAR;		csr \|= MUSB_RXCSR_AUTOCLEAR;
	#ifdef USE_MODE1		#ifdef USE_MODE1
	/* csr \|= MUSB_RXCSR_DMAMODE; */		/* csr \|= MUSB_RXCSR_DMAMODE; */
	@@ -875,9 +878,25 @@ static int musb_gadget_enable(struct usb_ep *ep,

	/* REVISIT this rules out high bandwidth periodic transfers */		/* REVISIT this rules out high bandwidth periodic transfers */
	tmp = le16_to_cpu(desc->wMaxPacketSize);		tmp = le16_to_cpu(desc->wMaxPacketSize);
	if (tmp & ~0x07ff)		if (tmp & ~0x07ff) {
			int ok;

			if (usb_endpoint_dir_in(desc))
			ok = musb->hb_iso_tx;
			else
			ok = musb->hb_iso_rx;

			if (!ok) {
			DBG(4, "%s: not support ISO high bandwidth\n", __func__);
	goto fail;		goto fail;
	musb_ep->packet_sz = tmp;		}
			musb_ep->hb_mult = (tmp >> 11) & 3;
			} else {
			musb_ep->hb_mult = 0;
			}

			musb_ep->packet_sz = tmp & 0x7ff;
			tmp = musb_ep->packet_sz * (musb_ep->hb_mult + 1);

	/* enable the interrupts for the endpoint, set the endpoint		/* enable the interrupts for the endpoint, set the endpoint
	* packet size (or fail), set the mode, clear the fifo		* packet size (or fail), set the mode, clear the fifo
	@@ -890,8 +909,11 @@ static int musb_gadget_enable(struct usb_ep *ep,
	musb_ep->is_in = 1;		musb_ep->is_in = 1;
	if (!musb_ep->is_in)		if (!musb_ep->is_in)
	goto fail;		goto fail;
	if (tmp > hw_ep->max_packet_sz_tx)
			if (tmp > hw_ep->max_packet_sz_tx) {
			DBG(4, "%s: packet size beyond hw fifo size\n", __func__);
	goto fail;		goto fail;
			}

	int_txe \|= (1 << epnum);		int_txe \|= (1 << epnum);
	musb_writew(mbase, MUSB_INTRTXE, int_txe);		musb_writew(mbase, MUSB_INTRTXE, int_txe);
	@@ -906,7 +928,7 @@ static int musb_gadget_enable(struct usb_ep *ep,
	if (musb->hwvers < MUSB_HWVERS_2000)		if (musb->hwvers < MUSB_HWVERS_2000)
	musb_writew(regs, MUSB_TXMAXP, hw_ep->max_packet_sz_tx);		musb_writew(regs, MUSB_TXMAXP, hw_ep->max_packet_sz_tx);
	else		else
	musb_writew(regs, MUSB_TXMAXP, tmp);		musb_writew(regs, MUSB_TXMAXP, musb_ep->packet_sz \| (musb_ep->hb_mult << 11));

	csr = MUSB_TXCSR_MODE \| MUSB_TXCSR_CLRDATATOG;		csr = MUSB_TXCSR_MODE \| MUSB_TXCSR_CLRDATATOG;
	if (musb_readw(regs, MUSB_TXCSR)		if (musb_readw(regs, MUSB_TXCSR)
	@@ -927,8 +949,11 @@ static int musb_gadget_enable(struct usb_ep *ep,
	musb_ep->is_in = 0;		musb_ep->is_in = 0;
	if (musb_ep->is_in)		if (musb_ep->is_in)
	goto fail;		goto fail;
	if (tmp > hw_ep->max_packet_sz_rx)
			if (tmp > hw_ep->max_packet_sz_rx) {
			DBG(4, "%s: packet size beyond hw fifo size\n", __func__);
	goto fail;		goto fail;
			}

	int_rxe \|= (1 << epnum);		int_rxe \|= (1 << epnum);
	musb_writew(mbase, MUSB_INTRRXE, int_rxe);		musb_writew(mbase, MUSB_INTRRXE, int_rxe);
	@@ -942,7 +967,7 @@ static int musb_gadget_enable(struct usb_ep *ep,
	if (musb->hwvers < MUSB_HWVERS_2000)		if (musb->hwvers < MUSB_HWVERS_2000)
	musb_writew(regs, MUSB_RXMAXP, hw_ep->max_packet_sz_rx);		musb_writew(regs, MUSB_RXMAXP, hw_ep->max_packet_sz_rx);
	else		else
	musb_writew(regs, MUSB_RXMAXP, tmp);		musb_writew(regs, MUSB_RXMAXP, musb_ep->packet_sz \| (musb_ep->hb_mult << 11));

	/* force shared fifo to OUT-only mode */		/* force shared fifo to OUT-only mode */
	if (hw_ep->is_shared_fifo) {		if (hw_ep->is_shared_fifo) {

drivers/usb/musb/musb_gadget.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -79,6 +79,8 @@ struct musb_ep {

	/* true if lock must be dropped but req_list may not be advanced */		/* true if lock must be dropped but req_list may not be advanced */
	u8 busy;		u8 busy;

			u8 hb_mult;
	};		};

	static inline struct musb_ep to_musb_ep(struct usb_ep ep)		static inline struct musb_ep to_musb_ep(struct usb_ep ep)