[dpdk-dev] net/mrvl: remove MRVL_MUSDK_DMA_MEMSIZE from configuration
Checks
Commit Message
RTE_MRVL_MUSDK_DMA_MEMSIZE can be removed from DPDK configuration
as it's no longer used as a synchronization point for net and crypto
mrvl pmds.
Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
---
config/common_base | 1 -
drivers/net/mrvl/mrvl_ethdev.c | 14 +++++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
Comments
On 10/17/2017 2:49 AM, Tomasz Duszynski wrote:
> RTE_MRVL_MUSDK_DMA_MEMSIZE can be removed from DPDK configuration
> as it's no longer used as a synchronization point for net and crypto
> mrvl pmds.
>
> Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
Applied to dpdk-next-net/master, thanks.
@@ -264,7 +264,6 @@ CONFIG_RTE_LIBRTE_NFP_DEBUG=n
# Compile Marvell PMD driver
#
CONFIG_RTE_LIBRTE_MRVL_PMD=n
-CONFIG_RTE_MRVL_MUSDK_DMA_MEMSIZE=41943040
#
# Compile burst-oriented Broadcom BNXT PMD driver
@@ -93,6 +93,9 @@
#define MRVL_COOKIE_HIGH_ADDR_SHIFT (sizeof(pp2_cookie_t) * 8)
#define MRVL_COOKIE_HIGH_ADDR_MASK (~0ULL << MRVL_COOKIE_HIGH_ADDR_SHIFT)
+/* Memory size (in bytes) for MUSDK dma buffers */
+#define MRVL_MUSDK_DMA_MEMSIZE 41943040
+
static const char * const valid_args[] = {
MRVL_IFACE_NAME_ARG,
MRVL_CFG_ARG,
@@ -2193,9 +2196,14 @@ rte_pmd_mrvl_probe(struct rte_vdev_device *vdev)
* ret == -EEXIST is correct, it means DMA
* has been already initialized (by another PMD).
*/
- ret = mv_sys_dma_mem_init(RTE_MRVL_MUSDK_DMA_MEMSIZE);
- if (ret < 0 && ret != -EEXIST)
- goto out_free_kvlist;
+ ret = mv_sys_dma_mem_init(MRVL_MUSDK_DMA_MEMSIZE);
+ if (ret < 0) {
+ if (ret != -EEXIST)
+ goto out_free_kvlist;
+ else
+ RTE_LOG(INFO, PMD,
+ "DMA memory has been already initialized by a different driver.\n");
+ }
ret = mrvl_init_pp2();
if (ret) {