New upstream version 18.05

[deb_dpdk.git] / drivers / net / qede / base / bcm_osal.c

diff --git a/drivers/net/qede/base/bcm_osal.c b/drivers/net/qede/base/bcm_osal.c
index fe42f32..ca1c2b1 100644 (file)
--- a/drivers/net/qede/base/bcm_osal.c
+++ b/drivers/net/qede/base/bcm_osal.c
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2016 QLogic Corporation.
+ * Copyright (c) 2016 - 2018 Cavium Inc.
  * All rights reserved.
- * www.qlogic.com
+ * www.cavium.com
  *
  * See LICENSE.qede_pmd for copyright and licensing details.
  */
@@ -133,10 +133,10 @@ void *osal_dma_alloc_coherent(struct ecore_dev *p_dev,
        snprintf(mz_name, sizeof(mz_name) - 1, "%lx",
                                        (unsigned long)rte_get_timer_cycles());
        if (core_id == (unsigned int)LCORE_ID_ANY)
-               core_id = 0;
+               core_id = rte_get_master_lcore();
        socket_id = rte_lcore_to_socket_id(core_id);
-       mz = rte_memzone_reserve_aligned(mz_name, size,
-                                        socket_id, 0, RTE_CACHE_LINE_SIZE);
+       mz = rte_memzone_reserve_aligned(mz_name, size, socket_id,
+                       RTE_MEMZONE_IOVA_CONTIG, RTE_CACHE_LINE_SIZE);
        if (!mz) {
                DP_ERR(p_dev, "Unable to allocate DMA memory "
                       "of size %zu bytes - %s\n",
@@ -172,9 +172,10 @@ void *osal_dma_alloc_coherent_aligned(struct ecore_dev *p_dev,
        snprintf(mz_name, sizeof(mz_name) - 1, "%lx",
                                        (unsigned long)rte_get_timer_cycles());
        if (core_id == (unsigned int)LCORE_ID_ANY)
-               core_id = 0;
+               core_id = rte_get_master_lcore();
        socket_id = rte_lcore_to_socket_id(core_id);
-       mz = rte_memzone_reserve_aligned(mz_name, size, socket_id, 0, align);
+       mz = rte_memzone_reserve_aligned(mz_name, size, socket_id,
+                       RTE_MEMZONE_IOVA_CONTIG, align);
        if (!mz) {
                DP_ERR(p_dev, "Unable to allocate DMA memory "
                       "of size %zu bytes - %s\n",