OSDN Git Service

usb: dwc3: gadget: Fix setting of DEPCFG.bInterval_m1
authorThinh Nguyen <Thinh.Nguyen@synopsys.com>
Mon, 8 Feb 2021 21:53:10 +0000 (13:53 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Feb 2021 08:39:52 +0000 (09:39 +0100)
Valid range for DEPCFG.bInterval_m1 is from 0 to 13, and it must be set
to 0 when the controller operates in full-speed. See the programming
guide for DEPCFG command section 3.2.2.1 (v3.30a).

Fixes: 72246da40f37 ("usb: Introduce DesignWare USB3 DRD Driver")
Cc: <stable@vger.kernel.org>
Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://lore.kernel.org/r/3f57026f993c0ce71498dbb06e49b3a47c4d0265.1612820995.git.Thinh.Nguyen@synopsys.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/gadget.c

index 97d707b..d0f8d3e 100644 (file)
@@ -605,7 +605,17 @@ static int dwc3_gadget_set_ep_config(struct dwc3_ep *dep, unsigned int action)
                params.param0 |= DWC3_DEPCFG_FIFO_NUMBER(dep->number >> 1);
 
        if (desc->bInterval) {
-               params.param1 |= DWC3_DEPCFG_BINTERVAL_M1(desc->bInterval - 1);
+               u8 bInterval_m1;
+
+               /*
+                * Valid range for DEPCFG.bInterval_m1 is from 0 to 13, and it
+                * must be set to 0 when the controller operates in full-speed.
+                */
+               bInterval_m1 = min_t(u8, desc->bInterval - 1, 13);
+               if (dwc->gadget->speed == USB_SPEED_FULL)
+                       bInterval_m1 = 0;
+
+               params.param1 |= DWC3_DEPCFG_BINTERVAL_M1(bInterval_m1);
                dep->interval = 1 << (desc->bInterval - 1);
        }