Skip to content

Commit 94e259f

Browse files
Roger Quadrosgregkh
authored andcommitted
usb: cdns3: gadget: Fix g_audio use case when connected to Super-Speed host
Take into account gadget driver's speed limit when programming controller speed. Fixes: 7733f6c ("usb: cdns3: Add Cadence USB3 DRD Driver") Signed-off-by: Roger Quadros <[email protected]> Acked-by: Peter Chen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent f5c8d29 commit 94e259f

File tree

1 file changed

+26
-5
lines changed

1 file changed

+26
-5
lines changed

drivers/usb/cdns3/gadget.c

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2343,9 +2343,35 @@ static int cdns3_gadget_udc_start(struct usb_gadget *gadget,
23432343
{
23442344
struct cdns3_device *priv_dev = gadget_to_cdns3_device(gadget);
23452345
unsigned long flags;
2346+
enum usb_device_speed max_speed = driver->max_speed;
23462347

23472348
spin_lock_irqsave(&priv_dev->lock, flags);
23482349
priv_dev->gadget_driver = driver;
2350+
2351+
/* limit speed if necessary */
2352+
max_speed = min(driver->max_speed, gadget->max_speed);
2353+
2354+
switch (max_speed) {
2355+
case USB_SPEED_FULL:
2356+
writel(USB_CONF_SFORCE_FS, &priv_dev->regs->usb_conf);
2357+
writel(USB_CONF_USB3DIS, &priv_dev->regs->usb_conf);
2358+
break;
2359+
case USB_SPEED_HIGH:
2360+
writel(USB_CONF_USB3DIS, &priv_dev->regs->usb_conf);
2361+
break;
2362+
case USB_SPEED_SUPER:
2363+
break;
2364+
default:
2365+
dev_err(priv_dev->dev,
2366+
"invalid maximum_speed parameter %d\n",
2367+
max_speed);
2368+
/* fall through */
2369+
case USB_SPEED_UNKNOWN:
2370+
/* default to superspeed */
2371+
max_speed = USB_SPEED_SUPER;
2372+
break;
2373+
}
2374+
23492375
cdns3_gadget_config(priv_dev);
23502376
spin_unlock_irqrestore(&priv_dev->lock, flags);
23512377
return 0;
@@ -2575,12 +2601,7 @@ static int cdns3_gadget_start(struct cdns3 *cdns)
25752601
/* Check the maximum_speed parameter */
25762602
switch (max_speed) {
25772603
case USB_SPEED_FULL:
2578-
writel(USB_CONF_SFORCE_FS, &priv_dev->regs->usb_conf);
2579-
writel(USB_CONF_USB3DIS, &priv_dev->regs->usb_conf);
2580-
break;
25812604
case USB_SPEED_HIGH:
2582-
writel(USB_CONF_USB3DIS, &priv_dev->regs->usb_conf);
2583-
break;
25842605
case USB_SPEED_SUPER:
25852606
break;
25862607
default:

0 commit comments

Comments
 (0)