dma/skeleton: fix index returned when no memcpy completed

If no memcopy request is completed, the ring_idx of the last completed
operation need returned by last_idx parameter. This patch fixes it.

Fixes: 05d5fc66a2 ("dma/skeleton: introduce skeleton driver")
Cc: stable@dpdk.org

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
This commit is contained in:
Chengwen Feng 2022-06-08 16:50:05 +08:00 committed by Thomas Monjalon
parent 5fc2eece8d
commit 618a40a0c9
2 changed files with 15 additions and 3 deletions

View File

@ -118,6 +118,7 @@ skeldma_start(struct rte_dma_dev *dev)
fflush_ring(hw, hw->desc_running);
fflush_ring(hw, hw->desc_completed);
hw->ridx = 0;
hw->last_ridx = hw->ridx - 1;
hw->submitted_count = 0;
hw->zero_req_count = 0;
hw->completed_count = 0;
@ -322,9 +323,11 @@ skeldma_dump(const struct rte_dma_dev *dev, FILE *f)
GET_RING_COUNT(hw->desc_completed));
(void)fprintf(f,
" next_ring_idx: %u\n"
" last_ring_idx: %u\n"
" submitted_count: %" PRIu64 "\n"
" completed_count: %" PRIu64 "\n",
hw->ridx, hw->submitted_count, hw->completed_count);
hw->ridx, hw->last_ridx,
hw->submitted_count, hw->completed_count);
return 0;
}
@ -398,11 +401,15 @@ skeldma_completed(void *dev_private,
count = RTE_MIN(nb_cpls, rte_ring_count(hw->desc_completed));
while (index < count) {
(void)rte_ring_dequeue(hw->desc_completed, (void **)&desc);
if (index == count - 1)
if (index == count - 1) {
hw->last_ridx = desc->ridx;
*last_idx = desc->ridx;
}
index++;
(void)rte_ring_enqueue(hw->desc_empty, (void *)desc);
}
if (unlikely(count == 0))
*last_idx = hw->last_ridx;
return count;
}
@ -422,11 +429,15 @@ skeldma_completed_status(void *dev_private,
count = RTE_MIN(nb_cpls, rte_ring_count(hw->desc_completed));
while (index < count) {
(void)rte_ring_dequeue(hw->desc_completed, (void **)&desc);
if (index == count - 1)
if (index == count - 1) {
hw->last_ridx = desc->ridx;
*last_idx = desc->ridx;
}
status[index++] = RTE_DMA_STATUS_SUCCESSFUL;
(void)rte_ring_enqueue(hw->desc_empty, (void *)desc);
}
if (unlikely(count == 0))
*last_idx = hw->last_ridx;
return count;
}

View File

@ -50,6 +50,7 @@ struct skeldma_hw {
/* Cache delimiter for dataplane API's operation data */
char cache1 __rte_cache_aligned;
uint16_t ridx; /* ring idx */
uint16_t last_ridx;
uint64_t submitted_count;
/* Cache delimiter for cpucopy thread's operation data */