usb: dwc2: Fix INTR OUT transfers in DDMA mode.

[ Upstream commit b2c586eb07efab982419f32b7c3bd96829bc8bcd ]

In DDMA mode if INTR OUT transfers mps not multiple of 4 then single packet
corresponds to single descriptor.

Descriptor limit set to mps and desc chain limit set to mps *
MAX_DMA_DESC_NUM_GENERIC. On that descriptors complete, to calculate
transfer size should be considered correction value for each descriptor.

In start request function, if "continue" is true then dma buffer address
should be incremmented by offset for all type of transfers, not only for
Control DATA_OUT transfers.

Fixes: cf77b5fb9b394 ("usb: dwc2: gadget: Transfer length limit checking for DDMA")
Fixes: e02f9aa6119e0 ("usb: dwc2: gadget: EP 0 specific DDMA programming")
Fixes: aa3e8bc81311e ("usb: dwc2: gadget: DDMA transfer start and complete")

Signed-off-by: Minas Harutyunyan <hminas@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 03bc479d04e0d63cb90c8009c3dd52e952c69bb7..d2d4067a1a5f4254eae40c18c55cfac0ae96c1ce 100644 (file)
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -704,8 +704,11 @@ static u32 dwc2_hsotg_read_frameno(struct dwc2_hsotg *hsotg)
  */
 static unsigned int dwc2_gadget_get_chain_limit(struct dwc2_hsotg_ep *hs_ep)
 {
+       const struct usb_endpoint_descriptor *ep_desc = hs_ep->ep.desc;
        int is_isoc = hs_ep->isochronous;
        unsigned int maxsize;
+       u32 mps = hs_ep->ep.maxpacket;
+       int dir_in = hs_ep->dir_in;
 
        if (is_isoc)
                maxsize = hs_ep->dir_in ? DEV_DMA_ISOC_TX_NBYTES_LIMIT :
@@ -716,6 +719,11 @@ static unsigned int dwc2_gadget_get_chain_limit(struct dwc2_hsotg_ep *hs_ep)
        /* Above size of one descriptor was chosen, multiple it */
        maxsize *= MAX_DMA_DESC_NUM_GENERIC;
 
+       /* Interrupt OUT EP with mps not multiple of 4 */
+       if (hs_ep->index)
+               if (usb_endpoint_xfer_int(ep_desc) && !dir_in && (mps % 4))
+                       maxsize = mps * MAX_DMA_DESC_NUM_GENERIC;
+
        return maxsize;
 }
 
@@ -731,11 +739,14 @@ static unsigned int dwc2_gadget_get_chain_limit(struct dwc2_hsotg_ep *hs_ep)
  * Isochronous - descriptor rx/tx bytes bitfield limit,
  * Control In/Bulk/Interrupt - multiple of mps. This will allow to not
  * have concatenations from various descriptors within one packet.
+ * Interrupt OUT - if mps not multiple of 4 then a single packet corresponds
+ * to a single descriptor.
  *
  * Selects corresponding mask for RX/TX bytes as well.
  */
 static u32 dwc2_gadget_get_desc_params(struct dwc2_hsotg_ep *hs_ep, u32 *mask)
 {
+       const struct usb_endpoint_descriptor *ep_desc = hs_ep->ep.desc;
        u32 mps = hs_ep->ep.maxpacket;
        int dir_in = hs_ep->dir_in;
        u32 desc_size = 0;
@@ -759,6 +770,13 @@ static u32 dwc2_gadget_get_desc_params(struct dwc2_hsotg_ep *hs_ep, u32 *mask)
                desc_size -= desc_size % mps;
        }
 
+       /* Interrupt OUT EP with mps not multiple of 4 */
+       if (hs_ep->index)
+               if (usb_endpoint_xfer_int(ep_desc) && !dir_in && (mps % 4)) {
+                       desc_size = mps;
+                       *mask = DEV_DMA_NBYTES_MASK;
+               }
+
        return desc_size;
 }
 
@@ -1094,13 +1112,7 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg,
                                length += (mps - (length % mps));
                }
 
-               /*
-                * If more data to send, adjust DMA for EP0 out data stage.
-                * ureq->dma stays unchanged, hence increment it by already
-                * passed passed data count before starting new transaction.
-                */
-               if (!index && hsotg->ep0_state == DWC2_EP0_DATA_OUT &&
-                   continuing)
+               if (continuing)
                        offset = ureq->actual;
 
                /* Fill DDMA chain entries */
@@ -2260,22 +2272,36 @@ static void dwc2_hsotg_change_ep_iso_parity(struct dwc2_hsotg *hsotg,
  */
 static unsigned int dwc2_gadget_get_xfersize_ddma(struct dwc2_hsotg_ep *hs_ep)
 {
+       const struct usb_endpoint_descriptor *ep_desc = hs_ep->ep.desc;
        struct dwc2_hsotg *hsotg = hs_ep->parent;
        unsigned int bytes_rem = 0;
+       unsigned int bytes_rem_correction = 0;
        struct dwc2_dma_desc *desc = hs_ep->desc_list;
        int i;
        u32 status;
+       u32 mps = hs_ep->ep.maxpacket;
+       int dir_in = hs_ep->dir_in;
 
        if (!desc)
                return -EINVAL;
 
+       /* Interrupt OUT EP with mps not multiple of 4 */
+       if (hs_ep->index)
+               if (usb_endpoint_xfer_int(ep_desc) && !dir_in && (mps % 4))
+                       bytes_rem_correction = 4 - (mps % 4);
+
        for (i = 0; i < hs_ep->desc_count; ++i) {
                status = desc->status;
                bytes_rem += status & DEV_DMA_NBYTES_MASK;
+               bytes_rem -= bytes_rem_correction;
 
                if (status & DEV_DMA_STS_MASK)
                        dev_err(hsotg->dev, "descriptor %d closed with %x\n",
                                i, status & DEV_DMA_STS_MASK);
+
+               if (status & DEV_DMA_L)
+                       break;
+
                desc++;
        }