From eeb0cfb6b2b6b731902e68af641e30bd31be3c7b Mon Sep 17 00:00:00 2001

From: Chunfeng Yun <chunfeng.yun@mediatek.com>

Date: Fri, 13 Aug 2021 14:30:51 +0800

Subject: [PATCH] usb: gadget: tegra-xudc: fix the wrong mult value for HS isoc or intr

Git-commit: eeb0cfb6b2b6b731902e68af641e30bd31be3c7b

Patch-mainline: v5.15-rc1

References: git-fixes stable-5.14.3

usb_endpoint_maxp() only returns the bit[10:0] of wMaxPacketSize

of endpoint descriptor, not includes bit[12:11] anymore, so use

usb_endpoint_maxp_mult() instead.

Meanwhile no need AND 0x7ff when get maxp, remove it.

Fixes: 49db427232fe ("usb: gadget: Add UDC driver for tegra XUSB device mode controller")

Cc: stable@vger.kernel.org

Acked-by: Felipe Balbi <balbi@kernel.org>

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>

Link: https://lore.kernel.org/r/1628836253-7432-5-git-send-email-chunfeng.yun@mediatek.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/usb/gadget/udc/tegra-xudc.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c

index c0ca7144e512..43f1b0d461c1 100644

--- a/drivers/usb/gadget/udc/tegra-xudc.c

+++ b/drivers/usb/gadget/udc/tegra-xudc.c

@@ -1610,7 +1610,7 @@ static void tegra_xudc_ep_context_setup(struct tegra_xudc_ep *ep)

 	u16 maxpacket, maxburst = 0, esit = 0;

 	u32 val;

-	maxpacket = usb_endpoint_maxp(desc) & 0x7ff;

+	maxpacket = usb_endpoint_maxp(desc);

 	if (xudc->gadget.speed == USB_SPEED_SUPER) {

 		if (!usb_endpoint_xfer_control(desc))

 			maxburst = comp_desc->bMaxBurst;

@@ -1621,7 +1621,7 @@ static void tegra_xudc_ep_context_setup(struct tegra_xudc_ep *ep)

 		   (usb_endpoint_xfer_int(desc) ||

 		    usb_endpoint_xfer_isoc(desc))) {

 		if (xudc->gadget.speed == USB_SPEED_HIGH) {

-			maxburst = (usb_endpoint_maxp(desc) >> 11) & 0x3;

+			maxburst = usb_endpoint_maxp_mult(desc) - 1;

 			if (maxburst == 0x3) {

 				dev_warn(xudc->dev,

 					 "invalid endpoint maxburst\n");

-- 

2.26.2