usb: dwc2: host: Fix wMaxPacketSize handling (fix webcam regression)

[thirdparty/kernel/stable.git] / drivers / usb / dwc2 / hcd_queue.c

diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c
index ea3aa640c15c18535a8ea2299f1e26f74e8a29f9..68bbac64b7536aec43574d543be8ff758b718fa9 100644 (file)
--- a/drivers/usb/dwc2/hcd_queue.c
+++ b/drivers/usb/dwc2/hcd_queue.c
@@ -708,7 +708,7 @@ static void dwc2_hs_pmap_unschedule(struct dwc2_hsotg *hsotg,
 static int dwc2_uframe_schedule_split(struct dwc2_hsotg *hsotg,
                                      struct dwc2_qh *qh)
 {
-       int bytecount = dwc2_hb_mult(qh->maxp) * dwc2_max_packet(qh->maxp);
+       int bytecount = qh->maxp_mult * qh->maxp;
        int ls_search_slice;
        int err = 0;
        int host_interval_in_sched;
@@ -1332,7 +1332,7 @@ static int dwc2_check_max_xfer_size(struct dwc2_hsotg *hsotg,
        u32 max_channel_xfer_size;
        int status = 0;
 
-       max_xfer_size = dwc2_max_packet(qh->maxp) * dwc2_hb_mult(qh->maxp);
+       max_xfer_size = qh->maxp * qh->maxp_mult;
        max_channel_xfer_size = hsotg->params.max_transfer_size;
 
        if (max_xfer_size > max_channel_xfer_size) {
@@ -1517,8 +1517,9 @@ static void dwc2_qh_init(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh,
        u32 prtspd = (hprt & HPRT0_SPD_MASK) >> HPRT0_SPD_SHIFT;
        bool do_split = (prtspd == HPRT0_SPD_HIGH_SPEED &&
                         dev_speed != USB_SPEED_HIGH);
-       int maxp = dwc2_hcd_get_mps(&urb->pipe_info);
-       int bytecount = dwc2_hb_mult(maxp) * dwc2_max_packet(maxp);
+       int maxp = dwc2_hcd_get_maxp(&urb->pipe_info);
+       int maxp_mult = dwc2_hcd_get_maxp_mult(&urb->pipe_info);
+       int bytecount = maxp_mult * maxp;
        char *speed, *type;
 
        /* Initialize QH */
@@ -1531,6 +1532,7 @@ static void dwc2_qh_init(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh,
 
        qh->data_toggle = DWC2_HC_PID_DATA0;
        qh->maxp = maxp;
+       qh->maxp_mult = maxp_mult;
        INIT_LIST_HEAD(&qh->qtd_list);
        INIT_LIST_HEAD(&qh->qh_list_entry);