From: Jun Yang <[email protected]>
In dpaa2_qdma_dq_fd, passing a local uint16_t variable directly as a
pointer to qdma_cntx_idx_ring_eq caused a compiler array-bounds warning
because the function takes a pointer to an element of the ring array.
Add a per-queue scratch buffer idxs[DPAA2_QDMA_MAX_DESC] to
struct qdma_virt_queue and use idxs[0] instead of a local variable
pointer. Also consolidate the fle_sdd pointer assignment for LONG and
SG FD types to avoid code duplication.
Fixes: 388e888dc082 ("dma/dpaa2: support short FD")
Cc: [email protected]
Signed-off-by: Jun Yang <[email protected]>
---
drivers/dma/dpaa2/dpaa2_qdma.c | 26 +++++++++-----------------
drivers/dma/dpaa2/dpaa2_qdma.h | 1 +
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/drivers/dma/dpaa2/dpaa2_qdma.c b/drivers/dma/dpaa2/dpaa2_qdma.c
index 4a95f2a1ab..45d7a99805 100644
--- a/drivers/dma/dpaa2/dpaa2_qdma.c
+++ b/drivers/dma/dpaa2/dpaa2_qdma.c
@@ -935,35 +935,27 @@ dpaa2_qdma_dq_fd(const struct qbman_fd *fd,
enum dpaa2_qdma_fd_type type;
int ret;
struct qdma_cntx_sg *cntx_sg;
- struct qdma_cntx_fle_sdd *fle_sdd;
+ struct qdma_cntx_fle_sdd *fle_sdd = NULL;
att = dpaa2_qdma_fd_get_att(fd);
type = DPAA2_QDMA_FD_ATT_TYPE(att);
- if (type == DPAA2_QDMA_FD_SHORT) {
- idx = DPAA2_QDMA_FD_ATT_CNTX(att);
- ret = qdma_cntx_idx_ring_eq(qdma_vq->ring_cntx_idx,
- &idx, 1, free_space);
- if (unlikely(ret != 1))
- return -ENOSPC;
-
- return 0;
- }
- if (type == DPAA2_QDMA_FD_LONG) {
- idx = DPAA2_QDMA_FD_ATT_CNTX(att);
- fle_sdd = (void *)(uintptr_t)DPAA2_GET_FD_FLC(fd);
+ if (type == DPAA2_QDMA_FD_LONG || type == DPAA2_QDMA_FD_SG) {
+ fle_sdd = (void *)DPAA2_GET_FD_FLC(fd);
qdma_vq->fle_elem[*fle_elem_nb] = fle_sdd;
(*fle_elem_nb)++;
+ }
+ if (type == DPAA2_QDMA_FD_SHORT ||
+ type == DPAA2_QDMA_FD_LONG) {
+ idx = DPAA2_QDMA_FD_ATT_CNTX(att);
+ qdma_vq->idxs[0] = idx;
ret = qdma_cntx_idx_ring_eq(qdma_vq->ring_cntx_idx,
- &idx, 1, free_space);
+ qdma_vq->idxs, 1, free_space);
if (unlikely(ret != 1))
return -ENOSPC;
return 0;
}
if (type == DPAA2_QDMA_FD_SG) {
- fle_sdd = (void *)(uintptr_t)DPAA2_GET_FD_FLC(fd);
- qdma_vq->fle_elem[*fle_elem_nb] = fle_sdd;
- (*fle_elem_nb)++;
cntx_sg = container_of(fle_sdd,
struct qdma_cntx_sg, fle_sdd);
ret = qdma_cntx_idx_ring_eq(qdma_vq->ring_cntx_idx,
diff --git a/drivers/dma/dpaa2/dpaa2_qdma.h b/drivers/dma/dpaa2/dpaa2_qdma.h
index e2d2eb4fa8..98c64f7b45 100644
--- a/drivers/dma/dpaa2/dpaa2_qdma.h
+++ b/drivers/dma/dpaa2/dpaa2_qdma.h
@@ -290,6 +290,7 @@ struct qdma_virt_queue {
struct qdma_cntx_idx_ring *ring_cntx_idx;
/**Used for silent enabled*/
+ uint16_t idxs[DPAA2_QDMA_MAX_DESC];
struct qdma_cntx_sg *cntx_sg[DPAA2_QDMA_MAX_DESC];
struct qdma_cntx_fle_sdd *cntx_fle_sdd[DPAA2_QDMA_MAX_DESC];
uint16_t silent_idx;
--
2.43.0
