driver/ldpaa_eth: Add timeout handling DQRR entry read

[u-boot] / drivers / net / ldpaa_eth / ldpaa_eth.c

diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index d4be1bada96128ac8a1069460676a8a2a93aedc5..cc949f593ae4a4f8984f18379a9f2c863d9f22d9 100644 (file)
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -77,7 +77,9 @@ static int ldpaa_eth_pull_dequeue_rx(struct eth_device *dev)
        struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)dev->priv;
        const struct ldpaa_dq *dq;
        const struct dpaa_fd *fd;
-       int i = 5, err = 0, status, loop = 20;
+       int i = 5, err = 0, status;
+       u32 timeo = (CONFIG_SYS_HZ * 2) / 1000;
+       u32 time_start;
        static struct qbman_pull_desc pulldesc;
        struct qbman_swp *swp = dflt_dpio->sw_portal;
 
@@ -92,13 +94,11 @@ static int ldpaa_eth_pull_dequeue_rx(struct eth_device *dev)
                        continue;
                }
 
-               do {
-                       loop--;
-                       dq = qbman_swp_dqrr_next(swp);
+               time_start = get_timer(0);
 
-                       if (!loop)
-                               break;
-               } while (!dq);
+                do {
+                       dq = qbman_swp_dqrr_next(swp);
+               } while (get_timer(time_start) < timeo && !dq);
 
                if (dq) {
                        /* Check for valid frame. If not sent a consume
@@ -121,6 +121,10 @@ static int ldpaa_eth_pull_dequeue_rx(struct eth_device *dev)
                        ldpaa_eth_rx(priv, fd);
                        qbman_swp_dqrr_consume(swp, dq);
                        break;
+               } else {
+                       err = -ENODATA;
+                       debug("No DQRR entries\n");
+                       break;
                }
        }
 
@@ -153,6 +157,7 @@ static void ldpaa_eth_tx_conf(struct ldpaa_eth_priv *priv,
                }
        }
 
+       flush_dcache_range(fd_addr, fd_addr + LDPAA_ETH_RX_BUFFER_SIZE);
        qbman_release_desc_clear(&releasedesc);
        qbman_release_desc_set_bpid(&releasedesc, dflt_dpbp->dpbp_attr.bpid);
        do {
@@ -166,7 +171,9 @@ static int ldpaa_eth_pull_dequeue_tx_conf(struct ldpaa_eth_priv *priv)
        const struct ldpaa_dq *dq;
        const struct dpaa_fd *fd;
        int err = 0;
-       int i = 5, status, loop = 20;
+       int i = 5, status;
+       u32 timeo = (CONFIG_SYS_HZ * 10) / 1000;
+       u32 time_start;
        static struct qbman_pull_desc pulldesc;
        struct qbman_swp *swp = dflt_dpio->sw_portal;
 
@@ -181,13 +188,11 @@ static int ldpaa_eth_pull_dequeue_tx_conf(struct ldpaa_eth_priv *priv)
                        continue;
                }
 
-               do {
-                       loop--;
-                       dq = qbman_swp_dqrr_next(swp);
+               time_start = get_timer(0);
 
-                       if (!loop)
-                               break;
-               } while (!dq);
+                do {
+                       dq = qbman_swp_dqrr_next(swp);
+               } while (get_timer(time_start) < timeo && !dq);
 
                if (dq) {
                        /* Check for valid frame. If not sent a consume
@@ -208,6 +213,10 @@ static int ldpaa_eth_pull_dequeue_tx_conf(struct ldpaa_eth_priv *priv)
                        ldpaa_eth_tx_conf(priv, fd);
                        qbman_swp_dqrr_consume(swp, dq);
                        break;
+               } else {
+                       err = -ENODATA;
+                       debug("No DQRR entries\n");
+                       break;
                }
        }
 
@@ -220,8 +229,11 @@ static int ldpaa_eth_tx(struct eth_device *net_dev, void *buf, int len)
        struct dpaa_fd fd;
        u64 buffer_start;
        int data_offset, err;
+       u32 timeo = (CONFIG_SYS_HZ * 10) / 1000;
+       u32 time_start;
        struct qbman_swp *swp = dflt_dpio->sw_portal;
        struct qbman_eq_desc ed;
+       struct qbman_release_desc releasedesc;
 
        /* Setup the FD fields */
        memset(&fd, 0, sizeof(fd));
@@ -257,9 +269,20 @@ static int ldpaa_eth_tx(struct eth_device *net_dev, void *buf, int len)
        qbman_eq_desc_clear(&ed);
        qbman_eq_desc_set_no_orp(&ed, 0);
        qbman_eq_desc_set_qd(&ed, priv->tx_qdid, priv->tx_flow_id, 0);
-       err = qbman_swp_enqueue(swp, &ed, (const struct qbman_fd *)(&fd));
-       if (err < 0)
+
+       time_start = get_timer(0);
+
+       while (get_timer(time_start) < timeo) {
+               err = qbman_swp_enqueue(swp, &ed,
+                               (const struct qbman_fd *)(&fd));
+               if (err != -EBUSY)
+                       break;
+       }
+
+       if (err < 0) {
                printf("error enqueueing Tx frame\n");
+               goto error;
+       }
 
        mdelay(1);
 
@@ -268,6 +291,20 @@ static int ldpaa_eth_tx(struct eth_device *net_dev, void *buf, int len)
                printf("error Tx Conf frame\n");
 
        return err;
+
+error:
+       qbman_release_desc_clear(&releasedesc);
+       qbman_release_desc_set_bpid(&releasedesc, dflt_dpbp->dpbp_attr.bpid);
+       time_start = get_timer(0);
+       do {
+               /* Release buffer into the QBMAN */
+               err = qbman_swp_release(swp, &releasedesc, &buffer_start, 1);
+       } while (get_timer(time_start) < timeo && err == -EBUSY);
+
+       if (err == -EBUSY)
+               printf("TX data: QBMAN buffer release fails\n");
+
+       return err;
 }
 
 static int ldpaa_eth_open(struct eth_device *net_dev, bd_t *bd)