From: Prashant Gupta <[email protected]> Add RTE_PROC_PRIMARY checks in device initialization paths for net/dpaa, crypto/dpaa_sec and dma/dpaa drivers. Secondary processes should skip hardware initialization to prevent segfaults when accessing hardware registers that are only mapped in the primary process.
Signed-off-by: Prashant Gupta <[email protected]> --- drivers/crypto/dpaa_sec/dpaa_sec.c | 3 --- drivers/dma/dpaa/dpaa_qdma.c | 31 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index c53ee70853..5caf6b18dc 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -3782,9 +3782,6 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, RTE_DPAA_MAX_NB_SEC_QPS, }; - if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return 0; - cryptodev = rte_cryptodev_pmd_create(dpaa_dev->name, &dpaa_dev->device, &init_params); if (cryptodev == NULL) { DPAA_SEC_ERR("failed to create cryptodev vdev"); diff --git a/drivers/dma/dpaa/dpaa_qdma.c b/drivers/dma/dpaa/dpaa_qdma.c index a695f58bc5..6a4022c652 100644 --- a/drivers/dma/dpaa/dpaa_qdma.c +++ b/drivers/dma/dpaa/dpaa_qdma.c @@ -9,8 +9,14 @@ #include "dpaa_qdma.h" #include "dpaa_qdma_logs.h" -static uint32_t s_sg_max_entry_sz = 2000; +static int s_data_validation; static bool s_hw_err_check; +static int s_sg_enable = 1; +static uint32_t s_sg_max_entry_sz = 2000; + +#ifdef RTE_DMA_DPAA_ERRATA_ERR050757 +static int s_pci_read = 1; +#endif #define DPAA_DMA_ERROR_CHECK "dpaa_dma_err_check" @@ -1346,11 +1352,34 @@ dpaa_qdma_init(struct rte_dma_dev *dmadev) int ret; uint32_t i, j, k; + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -ENOTSUP; + if (dpaa_get_devargs(dmadev->device->devargs, DPAA_DMA_ERROR_CHECK)) { s_hw_err_check = true; 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; + + char *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
