Introducing common function for queue stats update
within the acc PMDs.
Signed-off-by: Nicolas Chautru <nicolas.chau...@intel.com>
---
drivers/baseband/acc/acc_common.h | 18 ++++++++
drivers/baseband/acc/rte_acc100_pmd.c | 45 ++++++--------------
drivers/baseband/acc/rte_vrb_pmd.c | 61 +++++++++------------------
3 files changed, 50 insertions(+), 74 deletions(-)
diff --git a/drivers/baseband/acc/acc_common.h
b/drivers/baseband/acc/acc_common.h
index fddeb0737b..c364638372 100644
--- a/drivers/baseband/acc/acc_common.h
+++ b/drivers/baseband/acc/acc_common.h
@@ -1554,6 +1554,24 @@ acc_aq_avail(struct rte_bbdev_queue_data *q_data,
uint16_t num_ops)
return aq_avail;
}
+/* Update queue stats during enqueue. */
+static inline void
+acc_update_qstat_enqueue(struct rte_bbdev_queue_data *q_data,
+ uint16_t enq_count, uint16_t enq_err_count)
+{
+ q_data->queue_stats.enqueued_count += enq_count;
+ q_data->queue_stats.enqueue_err_count += enq_err_count;
+ q_data->queue_stats.enqueue_depth_avail = acc_aq_avail(q_data, 0);
+}
+
+/* Update queue stats during dequeue. */
+static inline void
+acc_update_qstat_dequeue(struct rte_bbdev_queue_data *q_data, uint16_t
deq_count)
+{
+ q_data->queue_stats.dequeued_count += deq_count;
+ q_data->queue_stats.enqueue_depth_avail = acc_aq_avail(q_data, 0);
+}
+
/* Calculates number of CBs in processed encoder TB based on 'r' and input
* length.
*/
diff --git a/drivers/baseband/acc/rte_acc100_pmd.c
b/drivers/baseband/acc/rte_acc100_pmd.c
index 4f666e514b..c27574b911 100644
--- a/drivers/baseband/acc/rte_acc100_pmd.c
+++ b/drivers/baseband/acc/rte_acc100_pmd.c
@@ -892,6 +892,7 @@ acc100_queue_stop(struct rte_bbdev *dev, uint16_t queue_id)
dev->data->queues[queue_id].queue_stats.dequeue_err_count = 0;
dev->data->queues[queue_id].queue_stats.enqueue_warn_count = 0;
dev->data->queues[queue_id].queue_stats.dequeue_warn_count = 0;
+ dev->data->queues[queue_id].queue_stats.enqueue_depth_avail = 0;
return 0;
}
@@ -3308,9 +3309,7 @@ acc100_enqueue_enc_cb(struct rte_bbdev_queue_data *q_data,
acc_dma_enqueue(q, i, &q_data->queue_stats);
- /* Update stats */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -3357,9 +3356,7 @@ acc100_enqueue_ldpc_enc_cb(struct rte_bbdev_queue_data
*q_data,
acc_dma_enqueue(q, desc_idx, &q_data->queue_stats);
- /* Update stats */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -3396,9 +3393,7 @@ acc100_enqueue_enc_tb(struct rte_bbdev_queue_data *q_data,
acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats);
- /* Update stats */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -3434,9 +3429,7 @@ acc100_enqueue_ldpc_enc_tb(struct rte_bbdev_queue_data
*q_data,
acc_dma_enqueue(q, enqueued_descs, &q_data->queue_stats);
- /* Update stats. */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -3500,9 +3493,7 @@ acc100_enqueue_dec_cb(struct rte_bbdev_queue_data *q_data,
acc_dma_enqueue(q, i, &q_data->queue_stats);
- /* Update stats */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -3538,9 +3529,7 @@ acc100_enqueue_ldpc_dec_tb(struct rte_bbdev_queue_data
*q_data,
acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats);
- /* Update stats */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -3583,9 +3572,7 @@ acc100_enqueue_ldpc_dec_cb(struct rte_bbdev_queue_data
*q_data,
acc_dma_enqueue(q, i, &q_data->queue_stats);
- /* Update stats */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -3620,9 +3607,7 @@ acc100_enqueue_dec_tb(struct rte_bbdev_queue_data *q_data,
acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats);
- /* Update stats */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -4012,8 +3997,7 @@ acc100_dequeue_enc(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_descs;
- /* Update enqueue stats */
- q_data->queue_stats.dequeued_count += dequeued_ops;
+ acc_update_qstat_dequeue(q_data, dequeued_ops);
return dequeued_ops;
}
@@ -4055,8 +4039,7 @@ acc100_dequeue_ldpc_enc(struct rte_bbdev_queue_data
*q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_descs;
- /* Update enqueue stats */
- q_data->queue_stats.dequeued_count += dequeued_ops;
+ acc_update_qstat_dequeue(q_data, dequeued_ops);
return dequeued_ops;
}
@@ -4101,8 +4084,7 @@ acc100_dequeue_dec(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_cbs;
- /* Update enqueue stats */
- q_data->queue_stats.dequeued_count += i;
+ acc_update_qstat_dequeue(q_data, i);
return i;
}
@@ -4148,8 +4130,7 @@ acc100_dequeue_ldpc_dec(struct rte_bbdev_queue_data
*q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_cbs;
- /* Update enqueue stats */
- q_data->queue_stats.dequeued_count += i;
+ acc_update_qstat_dequeue(q_data, i);
return i;
}
diff --git a/drivers/baseband/acc/rte_vrb_pmd.c
b/drivers/baseband/acc/rte_vrb_pmd.c
index 88b1104fab..4c1e036199 100644
--- a/drivers/baseband/acc/rte_vrb_pmd.c
+++ b/drivers/baseband/acc/rte_vrb_pmd.c
@@ -1109,6 +1109,7 @@ vrb_queue_stop(struct rte_bbdev *dev, uint16_t queue_id)
dev->data->queues[queue_id].queue_stats.dequeue_err_count = 0;
dev->data->queues[queue_id].queue_stats.enqueue_warn_count = 0;
dev->data->queues[queue_id].queue_stats.dequeue_warn_count = 0;
+ dev->data->queues[queue_id].queue_stats.enqueue_depth_avail = 0;
return 0;
}
@@ -2738,9 +2739,7 @@ vrb_enqueue_enc_cb(struct rte_bbdev_queue_data *q_data,
acc_dma_enqueue(q, i, &q_data->queue_stats);
- /* Update stats */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -2778,9 +2777,7 @@ vrb_enqueue_ldpc_enc_cb(struct rte_bbdev_queue_data
*q_data,
acc_dma_enqueue(q, desc_idx, &q_data->queue_stats);
- /* Update stats. */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -2817,9 +2814,7 @@ vrb_enqueue_enc_tb(struct rte_bbdev_queue_data *q_data,
acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats);
- /* Update stats */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -2864,9 +2859,7 @@ vrb_enqueue_ldpc_enc_tb(struct rte_bbdev_queue_data
*q_data,
acc_dma_enqueue(q, enqueued_descs, &q_data->queue_stats);
- /* Update stats. */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -2926,9 +2919,7 @@ vrb_enqueue_dec_cb(struct rte_bbdev_queue_data *q_data,
acc_dma_enqueue(q, i, &q_data->queue_stats);
- /* Update stats. */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -2961,9 +2952,7 @@ vrb_enqueue_ldpc_dec_tb(struct rte_bbdev_queue_data
*q_data,
acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats);
- /* Update stats. */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -3004,9 +2993,7 @@ vrb_enqueue_ldpc_dec_cb(struct rte_bbdev_queue_data
*q_data,
acc_dma_enqueue(q, i, &q_data->queue_stats);
- /* Update stats. */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -3041,9 +3028,7 @@ vrb_enqueue_dec_tb(struct rte_bbdev_queue_data *q_data,
acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats);
- /* Update stats */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -3443,8 +3428,7 @@ vrb_dequeue_enc(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_descs;
- /* Update enqueue stats. */
- q_data->queue_stats.dequeued_count += dequeued_ops;
+ acc_update_qstat_dequeue(q_data, dequeued_ops);
return dequeued_ops;
}
@@ -3486,8 +3470,7 @@ vrb_dequeue_ldpc_enc(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_descs;
- /* Update enqueue stats. */
- q_data->queue_stats.dequeued_count += dequeued_ops;
+ acc_update_qstat_dequeue(q_data, dequeued_ops);
return dequeued_ops;
}
@@ -3525,8 +3508,7 @@ vrb_dequeue_dec(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_cbs;
- /* Update enqueue stats */
- q_data->queue_stats.dequeued_count += i;
+ acc_update_qstat_dequeue(q_data, i);
return i;
}
@@ -3565,8 +3547,7 @@ vrb_dequeue_ldpc_dec(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_cbs;
- /* Update enqueue stats. */
- q_data->queue_stats.dequeued_count += i;
+ acc_update_qstat_dequeue(q_data, i);
return i;
}
@@ -3772,9 +3753,7 @@ vrb_enqueue_fft(struct rte_bbdev_queue_data *q_data,
acc_dma_enqueue(q, i, &q_data->queue_stats);
- /* Update stats */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -3840,8 +3819,7 @@ vrb_dequeue_fft(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_cbs;
- /* Update enqueue stats. */
- q_data->queue_stats.dequeued_count += i;
+ acc_update_qstat_dequeue(q_data, i);
return i;
}
@@ -4095,9 +4073,7 @@ vrb2_enqueue_mldts(struct rte_bbdev_queue_data *q_data,
acc_dma_enqueue(q, enqueued_descs, &q_data->queue_stats);
- /* Update stats. */
- q_data->queue_stats.enqueued_count += i;
- q_data->queue_stats.enqueue_err_count += num - i;
+ acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}
@@ -4192,8 +4168,9 @@ vrb2_dequeue_mldts(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_cbs;
- /* Update enqueue stats. */
- q_data->queue_stats.dequeued_count += i;
+
+ acc_update_qstat_dequeue(q_data, i);
+
return i;
}
--
2.34.1
