usb: dwc2: gadget: fix TX FIFO size and address initialization

According to DWC2 documentation, DPTxFSize field of DPTXFSIZn register
is read only, which means that software cannot change FIFO size.

Register description says:
"The value of this register is the Largest Device Mode Periodic Tx Data
FIFO Depth (parameter OTG_TX_DPERIO_DFIFO_DEPTH_n), as specified during
coreConsultant configuration."

That means, that we have to setup only FIFO start addresses (DPTxFStAddr),
taking into account reset values of DPTxFSize.

Initialize FIFO start addresses properly and remove unneeded core related
to incorrect FIFO size initialization.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 9fae0291cd69f8c3314f547eeb9d0557af517e49..78526eedf5190b682423f565dda1f5c8d4f55e3e 100644 (file)
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -259,13 +259,6 @@ enum dwc2_lx_state {
        DWC2_L3,        /* Off state */
 };
 
-/*
- * Gadget periodic tx fifo sizes as used by legacy driver
- * EP0 is not included
- */
-#define DWC2_G_P_LEGACY_TX_FIFO_SIZE {256, 256, 256, 256, 768, 768, 768, \
-                                          768, 0, 0, 0, 0, 0, 0, 0}
-
 /* Gadget ep0 states */
 enum dwc2_ep0_state {
        DWC2_EP0_SETUP,

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index eae908951eab5b134b1b858fc6a6d3637a0a2952..7db763e2e975d4f3e3bfb8855195bfe22cfa38d1 100644 (file)
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -189,6 +189,7 @@ static void dwc2_hsotg_init_fifo(struct dwc2_hsotg *hsotg)
        unsigned int ep;
        unsigned int addr;
        int timeout;
+       u32 dptxfsizn;
        u32 val;
 
        /* Reset fifo map if not correctly cleared during previous session */
@@ -217,13 +218,13 @@ static void dwc2_hsotg_init_fifo(struct dwc2_hsotg *hsotg)
         * given endpoint.
         */
        for (ep = 1; ep < MAX_EPS_CHANNELS; ep++) {
-               if (!hsotg->g_tx_fifo_sz[ep])
-                       continue;
-               val = addr;
-               val |= hsotg->g_tx_fifo_sz[ep] << FIFOSIZE_DEPTH_SHIFT;
-               WARN_ONCE(addr + hsotg->g_tx_fifo_sz[ep] > hsotg->fifo_mem,
-                         "insufficient fifo memory");
-               addr += hsotg->g_tx_fifo_sz[ep];
+               dptxfsizn = dwc2_readl(hsotg->regs + DPTXFSIZN(ep));
+
+               val = (dptxfsizn & FIFOSIZE_DEPTH_MASK) | addr;
+               addr += dptxfsizn >> FIFOSIZE_DEPTH_SHIFT;
+
+               if (addr > hsotg->fifo_mem)
+                       break;
 
                dwc2_writel(val, hsotg->regs + DPTXFSIZN(ep));
        }
@@ -3814,36 +3815,10 @@ static void dwc2_hsotg_dump(struct dwc2_hsotg *hsotg)
 static void dwc2_hsotg_of_probe(struct dwc2_hsotg *hsotg)
 {
        struct device_node *np = hsotg->dev->of_node;
-       u32 len = 0;
-       u32 i = 0;
 
        /* Enable dma if requested in device tree */
        hsotg->g_using_dma = of_property_read_bool(np, "g-use-dma");
 
-       /*
-       * Register TX periodic fifo size per endpoint.
-       * EP0 is excluded since it has no fifo configuration.
-       */
-       if (!of_find_property(np, "g-tx-fifo-size", &len))
-               goto rx_fifo;
-
-       len /= sizeof(u32);
-
-       /* Read tx fifo sizes other than ep0 */
-       if (of_property_read_u32_array(np, "g-tx-fifo-size",
-                                               &hsotg->g_tx_fifo_sz[1], len))
-               goto rx_fifo;
-
-       /* Add ep0 */
-       len++;
-
-       /* Make remaining TX fifos unavailable */
-       if (len < MAX_EPS_CHANNELS) {
-               for (i = len; i < MAX_EPS_CHANNELS; i++)
-                       hsotg->g_tx_fifo_sz[i] = 0;
-       }
-
-rx_fifo:
        /* Register RX fifo size */
        of_property_read_u32(np, "g-rx-fifo-size", &hsotg->g_rx_fifo_sz);
 
@@ -3865,13 +3840,10 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
        struct device *dev = hsotg->dev;
        int epnum;
        int ret;
-       int i;
-       u32 p_tx_fifo[] = DWC2_G_P_LEGACY_TX_FIFO_SIZE;
 
        /* Initialize to legacy fifo configuration values */
        hsotg->g_rx_fifo_sz = 2048;
        hsotg->g_np_g_tx_fifo_sz = 1024;
-       memcpy(&hsotg->g_tx_fifo_sz[1], p_tx_fifo, sizeof(p_tx_fifo));
        /* Device tree specific probe */
        dwc2_hsotg_of_probe(hsotg);
 
@@ -3889,9 +3861,6 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
        dev_dbg(dev, "NonPeriodic TXFIFO size: %d\n",
                                                hsotg->g_np_g_tx_fifo_sz);
        dev_dbg(dev, "RXFIFO size: %d\n", hsotg->g_rx_fifo_sz);
-       for (i = 0; i < MAX_EPS_CHANNELS; i++)
-               dev_dbg(dev, "Periodic TXFIFO%2d size: %d\n", i,
-                                               hsotg->g_tx_fifo_sz[i]);
 
        hsotg->gadget.max_speed = USB_SPEED_HIGH;
        hsotg->gadget.ops = &dwc2_hsotg_gadget_ops;