usb: gadget: f_uac: update maxpacket in function bind

RenJianing · RenJianing · commit 40dbf73ec0d7 · 2020-12-07T11:13:58.000+08:00
This patch fixes the bug of RV1126 USB crash when configed as
UVC + UAC + RNDIS + ADB. If we resize txfifo before opening
UAC stream, the maxpacket of epin will be the default value
1024 and txfifo will exceed the maximum limit.

Fixes: e658b2131e79 ("usb: dwc3: gadget: fix tx fifos resize for disabled eps")
Signed-off-by: Ren Jianing &lt;jianing.ren@rock-chips.com&gt;
Change-Id: I1e892b11a0bdda2877d3e17148867d21cb68238c
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
@@ -930,6 +930,7 @@ static int f_audio_bind(struct usb_configuration *c, struct usb_function *f)
 		ep = usb_ep_autoconfig(cdev->gadget, &as_in_ep_desc);
 		if (!ep)
 			goto fail;
+		ep->maxpacket = usb_endpoint_maxp(&as_in_ep_desc) & 0x7ff;
 		audio->in_ep = ep;
 		audio->in_ep->desc = &as_in_ep_desc;
 	}
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
@@ -813,6 +813,8 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
 			dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
 			return -ENODEV;
 		}
+		agdev->in_ep->maxpacket =
+			usb_endpoint_maxp(&fs_epin_desc) & 0x7ff;
 	}
 
 	agdev->in_ep_maxpsize = max_t(u16,

Original file line number	Diff line number	Diff line change
`@@ -930,6 +930,7 @@ static int f_audio_bind(struct usb_configuration c, struct usb_function f)`
`930`	`930`	`ep = usb_ep_autoconfig(cdev->gadget, &as_in_ep_desc);`
`931`	`931`	`if (!ep)`
`932`	`932`	`goto fail;`
	`933`	`+ ep->maxpacket = usb_endpoint_maxp(&as_in_ep_desc) & 0x7ff;`
`933`	`934`	`audio->in_ep = ep;`
`934`	`935`	`audio->in_ep->desc = &as_in_ep_desc;`
`935`	`936`	`}`
Original file line number	Diff line number	Diff line change
`@@ -813,6 +813,8 @@ afunc_bind(struct usb_configuration cfg, struct usb_function fn)`
`813`	`813`	`dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);`
`814`	`814`	`return -ENODEV;`
`815`	`815`	`}`
	`816`	`+ agdev->in_ep->maxpacket =`
	`817`	`+ usb_endpoint_maxp(&fs_epin_desc) & 0x7ff;`
`816`	`818`	`}`
`817`	`819`
`818`	`820`	`agdev->in_ep_maxpsize = max_t(u16,`