usb: dwc2: host: Fix ISOC flow in DDMA mode

commit b258e42688501cadb1a6dd658d6f015df9f32d8f upstream.

Fixed ISOC completion flow in DDMA mode. Added isoc
descriptor actual length value and update urb's start_frame
value.
Fixed initialization of ISOC DMA descriptors flow.

Fixes: 56f5b1cff22a ("staging: Core files for the DWC2 driver")
Fixes: 20f2eb9c4cf8 ("staging: dwc2: add microframe scheduler from downstream Pi kernel")
Fixes: c17b337c1ea4 ("usb: dwc2: host: program descriptor for next frame")
Fixes: dc4c76e7b22c ("staging: HCD descriptor DMA support for the DWC2 driver")
Fixes: 762d3a1a9cd7 ("usb: dwc2: host: process all completed urbs")
CC: stable@vger.kernel.org
Signed-off-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
Link: https://lore.kernel.org/r/a8b1e1711cc6cabfb45d92ede12e35445c66f06c.1708944698.git.Minas.Harutyunyan@synopsys.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index 70db43ce9f66c7b3228e30059afeb58ad3d31057..7255767591d086df53749b33314e6ba7b11366cc 100644 (file)
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -2929,8 +2929,11 @@ enum dwc2_transaction_type dwc2_hcd_select_transactions(
                        hsotg->available_host_channels--;
                }
                qh = list_entry(qh_ptr, struct dwc2_qh, qh_list_entry);
-               if (dwc2_assign_and_init_hc(hsotg, qh))
+               if (dwc2_assign_and_init_hc(hsotg, qh)) {
+                       if (hsotg->params.uframe_sched)
+                               hsotg->available_host_channels++;
                        break;
+               }
 
                /*
                 * Move the QH from the periodic ready schedule to the
@@ -2963,8 +2966,11 @@ enum dwc2_transaction_type dwc2_hcd_select_transactions(
                        hsotg->available_host_channels--;
                }
 
-               if (dwc2_assign_and_init_hc(hsotg, qh))
+               if (dwc2_assign_and_init_hc(hsotg, qh)) {
+                       if (hsotg->params.uframe_sched)
+                               hsotg->available_host_channels++;
                        break;
+               }
 
                /*
                 * Move the QH from the non-periodic inactive schedule to the
@@ -4320,6 +4326,8 @@ void dwc2_host_complete(struct dwc2_hsotg *hsotg, struct dwc2_qtd *qtd,
                         urb->actual_length);
 
        if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
+               if (!hsotg->params.dma_desc_enable)
+                       urb->start_frame = qtd->qh->start_active_frame;
                urb->error_count = dwc2_hcd_urb_get_error_count(qtd->urb);
                for (i = 0; i < urb->number_of_packets; ++i) {
                        urb->iso_frame_desc[i].actual_length =

diff --git a/drivers/usb/dwc2/hcd_ddma.c b/drivers/usb/dwc2/hcd_ddma.c
index a858b5f9c1d60280db272ea38e868a6b9f1217eb..6a4aa71da103f18a9ed529d254ac32d40af21fcc 100644 (file)
--- a/drivers/usb/dwc2/hcd_ddma.c
+++ b/drivers/usb/dwc2/hcd_ddma.c
@@ -589,7 +589,7 @@ static void dwc2_init_isoc_dma_desc(struct dwc2_hsotg *hsotg,
        idx = qh->td_last;
        inc = qh->host_interval;
        hsotg->frame_number = dwc2_hcd_get_frame_number(hsotg);
-       cur_idx = dwc2_frame_list_idx(hsotg->frame_number);
+       cur_idx = idx;
        next_idx = dwc2_desclist_idx_inc(qh->td_last, inc, qh->dev_speed);
 
        /*
@@ -896,6 +896,8 @@ static int dwc2_cmpl_host_isoc_dma_desc(struct dwc2_hsotg *hsotg,
 {
        struct dwc2_dma_desc *dma_desc;
        struct dwc2_hcd_iso_packet_desc *frame_desc;
+       u16 frame_desc_idx;
+       struct urb *usb_urb = qtd->urb->priv;
        u16 remain = 0;
        int rc = 0;
 
@@ -908,8 +910,11 @@ static int dwc2_cmpl_host_isoc_dma_desc(struct dwc2_hsotg *hsotg,
                                DMA_FROM_DEVICE);
 
        dma_desc = &qh->desc_list[idx];
+       frame_desc_idx = (idx - qtd->isoc_td_first) & (usb_urb->number_of_packets - 1);
 
-       frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index_last];
+       frame_desc = &qtd->urb->iso_descs[frame_desc_idx];
+       if (idx == qtd->isoc_td_first)
+               usb_urb->start_frame = dwc2_hcd_get_frame_number(hsotg);
        dma_desc->buf = (u32)(qtd->urb->dma + frame_desc->offset);
        if (chan->ep_is_in)
                remain = (dma_desc->status & HOST_DMA_ISOC_NBYTES_MASK) >>
@@ -930,7 +935,7 @@ static int dwc2_cmpl_host_isoc_dma_desc(struct dwc2_hsotg *hsotg,
                frame_desc->status = 0;
        }
 
-       if (++qtd->isoc_frame_index == qtd->urb->packet_count) {
+       if (++qtd->isoc_frame_index == usb_urb->number_of_packets) {
                /*
                 * urb->status is not used for isoc transfers here. The
                 * individual frame_desc status are used instead.
@@ -1035,11 +1040,11 @@ static void dwc2_complete_isoc_xfer_ddma(struct dwc2_hsotg *hsotg,
                                return;
                        idx = dwc2_desclist_idx_inc(idx, qh->host_interval,
                                                    chan->speed);
-                       if (!rc)
+                       if (rc == 0)
                                continue;
 
-                       if (rc == DWC2_CMPL_DONE)
-                               break;
+                       if (rc == DWC2_CMPL_DONE || rc == DWC2_CMPL_STOP)
+                               goto stop_scan;
 
                        /* rc == DWC2_CMPL_STOP */
 

diff --git a/drivers/usb/dwc2/hw.h b/drivers/usb/dwc2/hw.h
index 0ca8e7bc7aaf94af56ae56cb1923ecaee91b60ab..c2c7de88df792f369f363e1f6d6471b870d5d684 100644 (file)
--- a/drivers/usb/dwc2/hw.h
+++ b/drivers/usb/dwc2/hw.h
@@ -701,7 +701,7 @@
 #define TXSTS_QTOP_TOKEN_MASK          (0x3 << 25)
 #define TXSTS_QTOP_TOKEN_SHIFT         25
 #define TXSTS_QTOP_TERMINATE           BIT(24)
-#define TXSTS_QSPCAVAIL_MASK           (0xff << 16)
+#define TXSTS_QSPCAVAIL_MASK           (0x7f << 16)
 #define TXSTS_QSPCAVAIL_SHIFT          16
 #define TXSTS_FSPCAVAIL_MASK           (0xffff << 0)
 #define TXSTS_FSPCAVAIL_SHIFT          0