]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
driver/ldpaa_eth:Avoid infinite loop in ldpaa_eth_rx
authorPrabhakar Kushwaha <prabhakar@freescale.com>
Thu, 2 Jul 2015 05:59:08 +0000 (11:29 +0530)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 9 Sep 2015 11:34:23 +0000 (13:34 +0200)
Change infinite loop mechanism to timer based polling for QBMAN release in
ldpaa_eth_rx.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
drivers/net/ldpaa_eth/ldpaa_eth.c

index 6de5f30f6c874162db78522057f0bb358d3db572..50ca6e45fb16d66b894433d8e8deddec6a349516 100644 (file)
@@ -31,6 +31,8 @@ static void ldpaa_eth_rx(struct ldpaa_eth_priv *priv,
        uint32_t fd_length;
        struct ldpaa_fas *fas;
        uint32_t status, err;
+       u32 timeo = (CONFIG_SYS_HZ * 2) / 1000;
+       u32 time_start;
        struct qbman_release_desc releasedesc;
        struct qbman_swp *swp = dflt_dpio->sw_portal;
 
@@ -65,10 +67,15 @@ error:
        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);
+       time_start = get_timer(0);
        do {
                /* Release buffer into the QBMAN */
                err = qbman_swp_release(swp, &releasedesc, &fd_addr, 1);
-       } while (err == -EBUSY);
+       } while (get_timer(time_start) < timeo && err == -EBUSY);
+
+       if (err == -EBUSY)
+               printf("Rx frame: QBMAN buffer release fails\n");
+
        return;
 }