From: Gagandeep Singh <[email protected]> Add scatter-gather (SG) support to the QDMA driver, enabled by default via the s_sg_enable flag. Add optional data validation mode controlled by the s_data_validation flag for debugging transfer correctness.
Add a workaround for hardware errata ERR050757: when RTE_DMA_DPAA_ERRATA_ERR050757 is defined, configure the source frame descriptor with stride settings (sss/ssd = FSL_QDMA_CMD_SS_ERR050757_LEN) to force PCI read transactions to stay within the errata-safe length limit, preventing data corruption on affected silicon. Signed-off-by: Gagandeep Singh <[email protected]> --- drivers/dma/dpaa/dpaa_qdma.c | 99 +++++++++++++++++++++++++++--------- 1 file changed, 75 insertions(+), 24 deletions(-) diff --git a/drivers/dma/dpaa/dpaa_qdma.c b/drivers/dma/dpaa/dpaa_qdma.c index bf2a373d70..ca615f8d8b 100644 --- a/drivers/dma/dpaa/dpaa_qdma.c +++ b/drivers/dma/dpaa/dpaa_qdma.c @@ -9,9 +9,14 @@ #include "dpaa_qdma.h" #include "dpaa_qdma_logs.h" +static int s_data_validation; +static int s_hw_err_check; +static int s_sg_enable = 1; static uint32_t s_sg_max_entry_sz = 2000; -static bool s_hw_err_check; +#ifdef RTE_DMA_DPAA_ERRATA_ERR050757 +static int s_pci_read = 1; +#endif #define DPAA_DMA_ERROR_CHECK "dpaa_dma_err_check" static inline void @@ -112,7 +117,8 @@ dma_pool_alloc(char *nm, int size, int aligned, dma_addr_t *phy_addr) if (!virt_addr) return NULL; - *phy_addr = rte_mem_virt2iova(virt_addr); + if (phy_addr) + *phy_addr = rte_mem_virt2iova(virt_addr); return virt_addr; } @@ -392,6 +398,8 @@ fsl_qdma_data_validation(struct fsl_qdma_desc *desc[], char err_msg[512]; int offset; + if (likely(!s_data_validation)) + return; offset = sprintf(err_msg, "Fatal TC%d/queue%d: ", fsl_queue->block_id, @@ -716,19 +724,21 @@ fsl_qdma_enqueue_desc_single(struct fsl_qdma_queue *fsl_queue, ft = fsl_queue->ft[fsl_queue->ci]; #ifdef RTE_DMA_DPAA_ERRATA_ERR050757 - sdf = &ft->df.sdf; - sdf->srttype = FSL_QDMA_CMD_RWTTYPE; + if (s_pci_read) { + sdf = &ft->df.sdf; + sdf->srttype = FSL_QDMA_CMD_RWTTYPE; #ifdef RTE_DMA_DPAA_ERRATA_ERR050265 - sdf->prefetch = 1; + sdf->prefetch = 1; #endif - if (len > FSL_QDMA_CMD_SS_ERR050757_LEN) { - sdf->ssen = 1; - sdf->sss = FSL_QDMA_CMD_SS_ERR050757_LEN; - sdf->ssd = FSL_QDMA_CMD_SS_ERR050757_LEN; - } else { - sdf->ssen = 0; - sdf->sss = 0; - sdf->ssd = 0; + if (len > FSL_QDMA_CMD_SS_ERR050757_LEN) { + sdf->ssen = 1; + sdf->sss = FSL_QDMA_CMD_SS_ERR050757_LEN; + sdf->ssd = FSL_QDMA_CMD_SS_ERR050757_LEN; + } else { + sdf->ssen = 0; + sdf->sss = 0; + sdf->ssd = 0; + } } #endif csgf_src = &ft->desc_sbuf; @@ -837,19 +847,21 @@ fsl_qdma_enqueue_desc_sg(struct fsl_qdma_queue *fsl_queue) csgf_src->length = total_len; csgf_dest->length = total_len; #ifdef RTE_DMA_DPAA_ERRATA_ERR050757 - sdf = &ft->df.sdf; - sdf->srttype = FSL_QDMA_CMD_RWTTYPE; + if (s_pci_read) { + sdf = &ft->df.sdf; + sdf->srttype = FSL_QDMA_CMD_RWTTYPE; #ifdef RTE_DMA_DPAA_ERRATA_ERR050265 - sdf->prefetch = 1; + sdf->prefetch = 1; #endif - if (total_len > FSL_QDMA_CMD_SS_ERR050757_LEN) { - sdf->ssen = 1; - sdf->sss = FSL_QDMA_CMD_SS_ERR050757_LEN; - sdf->ssd = FSL_QDMA_CMD_SS_ERR050757_LEN; - } else { - sdf->ssen = 0; - sdf->sss = 0; - sdf->ssd = 0; + if (total_len > FSL_QDMA_CMD_SS_ERR050757_LEN) { + sdf->ssen = 1; + sdf->sss = FSL_QDMA_CMD_SS_ERR050757_LEN; + sdf->ssd = FSL_QDMA_CMD_SS_ERR050757_LEN; + } else { + sdf->ssen = 0; + sdf->sss = 0; + sdf->ssd = 0; + } } #endif ret = fsl_qdma_enqueue_desc_to_ring(fsl_queue, num); @@ -888,6 +900,25 @@ fsl_qdma_enqueue_desc(struct fsl_qdma_queue *fsl_queue) fsl_queue->pending_num = 0; } return ret; + } else if (!s_sg_enable) { + while (fsl_queue->pending_num > 0) { + ret = fsl_qdma_enqueue_desc_single(fsl_queue, + fsl_queue->pending_desc[start].dst, + fsl_queue->pending_desc[start].src, + fsl_queue->pending_desc[start].len); + if (!ret) { + start = (start + 1) & + (fsl_queue->pending_max - 1); + fsl_queue->pending_start = start; + fsl_queue->pending_num--; + } else { + DPAA_QDMA_ERR("Eq pending desc failed(%d)", + ret); + return -EIO; + } + } + + return 0; } return fsl_qdma_enqueue_desc_sg(fsl_queue); @@ -1344,6 +1375,26 @@ dpaa_qdma_init(struct rte_dma_dev *dmadev) DPAA_QDMA_INFO("Enable DMA error checks"); } + if (getenv("DPAA_QDMA_DATA_VALIDATION")) + s_data_validation = 1; + + if (getenv("DPAA_QDMA_HW_ERR_CHECK")) + s_hw_err_check = 1; + + penv = getenv("DPAA_QDMA_SG_ENABLE"); + if (penv) + s_sg_enable = atoi(penv); + + penv = getenv("DPAA_QDMA_SG_MAX_ENTRY_SIZE"); + if (penv) + s_sg_max_entry_sz = atoi(penv); + +#ifdef RTE_DMA_DPAA_ERRATA_ERR050757 + penv = getenv("DPAA_QDMA_PCI_READ"); + if (penv) + s_pci_read = atoi(penv); +#endif + fsl_qdma->n_queues = QDMA_QUEUES * QDMA_BLOCKS; fsl_qdma->num_blocks = QDMA_BLOCKS; fsl_qdma->block_offset = QDMA_BLOCK_OFFSET; -- 2.25.1
