Skip to contentSkip to conversation

usb: dwc3: gadget: Fix ssp speed setting

PATCH New Thinh Nguyen 1 participant 3 messages Mar 9, 2021

Subsystems (3)
lore
Share & tools
lore

Thinh Nguyen

author maintainer
#0 lore raw

cover usb: dwc3: gadget: Fix ssp speed setting

Fix a couple of issues with setting the gadget's speed for DWC_usb32 IP. We should not notice this issue with other IPs.

Thinh Nguyen (2):
usb: dwc3: gadget: Set gadget_max_speed when set ssp_rate
usb: dwc3: gadget: Use max speed if unspecified

 drivers/usb/dwc3/gadget.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

base-commit: 7f6f181b3e2c4d08f5d693eebe7901a28fab8666

Signature · 1 line
2.28.0
author maintainer
#1 lore raw

PATCH 1/2 usb: dwc3: gadget: Set gadget_max_speed when set ssp_rate

Set the dwc->gadget_max_speed to SuperSpeed Plus if the user sets the ssp_rate. The udc_set_ssp_rate() is intended for setting the gadget's speed to SuperSpeed Plus at the specified rate.

Fixes 072cab8a0fe2 ("usb: dwc3: gadget: Implement setting of SSP rate")
---
 drivers/usb/dwc3/gadget.c | 1 +
 1 file changed, 1 insertion(+)
drivers/usb/dwc3/gadget.c +1 -0
index aebcf8ec0716..53696c4bed0a 100644
@@ -2523,6 +2523,7 @@ static void dwc3_gadget_set_ssp_rate(struct usb_gadget *g,
 	unsigned long		flags;
 
 	spin_lock_irqsave(&dwc->lock, flags);
+	dwc->gadget_max_speed = USB_SPEED_SUPER_PLUS;
 	dwc->gadget_ssp_rate = rate;
 	spin_unlock_irqrestore(&dwc->lock, flags);
 }
Signature · 1 line
2.28.0
author maintainer
#2 lore raw

PATCH 2/2 usb: dwc3: gadget: Use max speed if unspecified

In reply to Thinh Nguyen

If the gadget driver doesn't specify a max_speed, then use the controller's maximum supported speed as default. For DWC_usb32 IP, the gadget's speed maybe limited to gen2x1 rate only if the driver's max_speed is unknown. This scenario should not occur with the current implementation since the default gadget driver's max_speed should always be specified. However, to make the driver more robust and help with readability, let's cover all the scenarios in __dwc3_gadget_set_speed().

Fixes 450b9e9fabd8 ("usb: dwc3: gadget: Set speed only up to the max supported")
---
 drivers/usb/dwc3/gadget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +1 -1
index 53696c4bed0a..a04a9757f541 100644
@@ -2083,7 +2083,7 @@ static void __dwc3_gadget_set_speed(struct dwc3 *dwc)
 	u32			reg;
 
 	speed = dwc->gadget_max_speed;
-	if (speed > dwc->maximum_speed)
+	if (speed == USB_SPEED_UNKNOWN || speed > dwc->maximum_speed)
 		speed = dwc->maximum_speed;
 
 	if (speed == USB_SPEED_SUPER_PLUS &&
Signature · 1 line
2.28.0