Commit b4c3a35d authored by Prabhakar Kushwaha's avatar Prabhakar Kushwaha Committed by York Sun

driver/ldpaa_eth: Add timeout handling DQRR entry read

Volatile command does not return frame immidiately, need to wait till a frame
is available in DQRR. Ideally it should be a blocking call.

Add timeout handling for DQRR frame instead of retry counter.
Signed-off-by: default avatarPrabhakar Kushwaha <prabhakar@freescale.com>
Acked-by: default avatarJoe Hershberger <joe.hershberger@ni.com>
Reviewed-by: default avatarYork Sun <yorksun@freescale.com>
parent e48df52b
...@@ -77,7 +77,9 @@ static int ldpaa_eth_pull_dequeue_rx(struct eth_device *dev) ...@@ -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; struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)dev->priv;
const struct ldpaa_dq *dq; const struct ldpaa_dq *dq;
const struct dpaa_fd *fd; 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; static struct qbman_pull_desc pulldesc;
struct qbman_swp *swp = dflt_dpio->sw_portal; struct qbman_swp *swp = dflt_dpio->sw_portal;
...@@ -92,13 +94,11 @@ static int ldpaa_eth_pull_dequeue_rx(struct eth_device *dev) ...@@ -92,13 +94,11 @@ static int ldpaa_eth_pull_dequeue_rx(struct eth_device *dev)
continue; continue;
} }
do { time_start = get_timer(0);
loop--;
dq = qbman_swp_dqrr_next(swp);
if (!loop) do {
break; dq = qbman_swp_dqrr_next(swp);
} while (!dq); } while (get_timer(time_start) < timeo && !dq);
if (dq) { if (dq) {
/* Check for valid frame. If not sent a consume /* Check for valid frame. If not sent a consume
...@@ -121,6 +121,10 @@ static int ldpaa_eth_pull_dequeue_rx(struct eth_device *dev) ...@@ -121,6 +121,10 @@ static int ldpaa_eth_pull_dequeue_rx(struct eth_device *dev)
ldpaa_eth_rx(priv, fd); ldpaa_eth_rx(priv, fd);
qbman_swp_dqrr_consume(swp, dq); qbman_swp_dqrr_consume(swp, dq);
break; break;
} else {
err = -ENODATA;
debug("No DQRR entries\n");
break;
} }
} }
...@@ -167,7 +171,9 @@ static int ldpaa_eth_pull_dequeue_tx_conf(struct ldpaa_eth_priv *priv) ...@@ -167,7 +171,9 @@ static int ldpaa_eth_pull_dequeue_tx_conf(struct ldpaa_eth_priv *priv)
const struct ldpaa_dq *dq; const struct ldpaa_dq *dq;
const struct dpaa_fd *fd; const struct dpaa_fd *fd;
int err = 0; 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; static struct qbman_pull_desc pulldesc;
struct qbman_swp *swp = dflt_dpio->sw_portal; struct qbman_swp *swp = dflt_dpio->sw_portal;
...@@ -182,13 +188,11 @@ static int ldpaa_eth_pull_dequeue_tx_conf(struct ldpaa_eth_priv *priv) ...@@ -182,13 +188,11 @@ static int ldpaa_eth_pull_dequeue_tx_conf(struct ldpaa_eth_priv *priv)
continue; continue;
} }
do { time_start = get_timer(0);
loop--;
dq = qbman_swp_dqrr_next(swp);
if (!loop) do {
break; dq = qbman_swp_dqrr_next(swp);
} while (!dq); } while (get_timer(time_start) < timeo && !dq);
if (dq) { if (dq) {
/* Check for valid frame. If not sent a consume /* Check for valid frame. If not sent a consume
...@@ -209,6 +213,10 @@ static int ldpaa_eth_pull_dequeue_tx_conf(struct ldpaa_eth_priv *priv) ...@@ -209,6 +213,10 @@ static int ldpaa_eth_pull_dequeue_tx_conf(struct ldpaa_eth_priv *priv)
ldpaa_eth_tx_conf(priv, fd); ldpaa_eth_tx_conf(priv, fd);
qbman_swp_dqrr_consume(swp, dq); qbman_swp_dqrr_consume(swp, dq);
break; break;
} else {
err = -ENODATA;
debug("No DQRR entries\n");
break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment