d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove config prefix used with make

Browse Source 
The config options CONFIG_RTE_* are simple RTE_* defines with meson.
Now that make support is dropped, update the names in logs and comments.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Acked-by: Haiyue Wang <haiyue.wang@intel.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Acked-by: David Marchand <david.marchand@redhat.com>
This commit is contained in:
Thomas Monjalon 2020-10-22 21:22:45 +02:00
parent a796c922d2
commit 19653eed40
17 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/test/test_cryptodev.c
View File

@ -14022,9 +14022,7 @@ test_cryptodev_qat_raw_api(void /*argv __rte_unused, int argc __rte_unused*/)
RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));
if (gbl_driver_id == -1) {
RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check that both "
"CONFIG_RTE_LIBRTE_PMD_QAT and CONFIG_RTE_LIBRTE_PMD_QAT_SYM "
"are enabled in config file to run this testsuite.\n");
RTE_LOG(ERR, USER1, "QAT PMD must be loaded.\n");
return TEST_SKIPPED;
}

2
drivers/net/bnxt/bnxt_ethdev.c
View File

@ -1255,7 +1255,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS) {
PMD_DRV_LOG(ERR,
"RxQ cnt %d > CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
"RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS);
}

2
drivers/net/ixgbe/ixgbe_rxtx.c
View File

@ -5920,7 +5920,7 @@ ixgbe_config_rss_filter(struct rte_eth_dev *dev,
return 0;
}
/* Stubs needed for linkage when CONFIG_RTE_ARCH_PPC_64 is set */
/* Stubs needed for linkage when RTE_ARCH_PPC_64 is set */
#if defined(RTE_ARCH_PPC_64)
int
ixgbe_rx_vec_dev_conf_condition_check(struct rte_eth_dev __rte_unused *dev)

2
drivers/net/sfc/sfc_ef10_essb_rx.c
View File

@ -47,7 +47,7 @@
* Each HW Rx descriptor has many Rx buffers. The number of buffers
* in one HW Rx descriptor is equal to size of contiguous block
* provided by Rx buffers memory pool. The contiguous block size
* depends on CONFIG_RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB and rte_mbuf
* depends on RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB and rte_mbuf
* data size specified on the memory pool creation. Typical rte_mbuf
* data size is about 2k which makes a bit less than 32 buffers in
* contiguous block with default bucket size equal to 64k.

2
lib/librte_eal/arm/include/rte_atomic_32.h
View File

@ -6,7 +6,7 @@
#define _RTE_ATOMIC_ARM32_H_
#ifndef RTE_FORCE_INTRINSICS
# error Platform must be built with CONFIG_RTE_FORCE_INTRINSICS
# error Platform must be built with RTE_FORCE_INTRINSICS
#endif
#ifdef __cplusplus

2
lib/librte_eal/arm/include/rte_atomic_64.h
View File

@ -7,7 +7,7 @@
#define _RTE_ATOMIC_ARM64_H_
#ifndef RTE_FORCE_INTRINSICS
# error Platform must be built with CONFIG_RTE_FORCE_INTRINSICS
# error Platform must be built with RTE_FORCE_INTRINSICS
#endif
#ifdef __cplusplus

2
lib/librte_eal/arm/include/rte_byteorder.h
View File

@ -6,7 +6,7 @@
#define _RTE_BYTEORDER_ARM_H_
#ifndef RTE_FORCE_INTRINSICS
# error Platform must be built with CONFIG_RTE_FORCE_INTRINSICS
# error Platform must be built with RTE_FORCE_INTRINSICS
#endif
#ifdef __cplusplus

2
lib/librte_eal/arm/include/rte_mcslock.h
View File

@ -6,7 +6,7 @@
#define _RTE_MCSLOCK_ARM_H_
#ifndef RTE_FORCE_INTRINSICS
# error Platform must be built with CONFIG_RTE_FORCE_INTRINSICS
# error Platform must be built with RTE_FORCE_INTRINSICS
#endif
#ifdef __cplusplus

2
lib/librte_eal/arm/include/rte_spinlock.h
View File

@ -6,7 +6,7 @@
#define _RTE_SPINLOCK_ARM_H_
#ifndef RTE_FORCE_INTRINSICS
# error Platform must be built with CONFIG_RTE_FORCE_INTRINSICS
# error Platform must be built with RTE_FORCE_INTRINSICS
#endif
#ifdef __cplusplus

2
lib/librte_eal/arm/include/rte_ticketlock.h
View File

@ -6,7 +6,7 @@
#define _RTE_TICKETLOCK_ARM_H_
#ifndef RTE_FORCE_INTRINSICS
# error Platform must be built with CONFIG_RTE_FORCE_INTRINSICS
# error Platform must be built with RTE_FORCE_INTRINSICS
#endif
#ifdef __cplusplus

4
lib/librte_eal/common/eal_common_dynmem.c
View File

@ -120,7 +120,7 @@ eal_dynmem_memseg_lists_init(void)
if (max_seglists_per_type == 0) {
RTE_LOG(ERR, EAL, "Cannot accommodate all memory types, please increase %s\n",
RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS));
RTE_STR(RTE_MAX_MEMSEG_LISTS));
goto out;
}
@ -180,7 +180,7 @@ eal_dynmem_memseg_lists_init(void)
if (msl_idx >= RTE_MAX_MEMSEG_LISTS) {
RTE_LOG(ERR, EAL,
"No more space in memseg lists, please increase %s\n",
RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS));
RTE_STR(RTE_MAX_MEMSEG_LISTS));
goto out;
}
msl = &mcfg->memsegs[msl_idx++];

6
lib/librte_eal/freebsd/eal_memory.c
View File

@ -173,8 +173,8 @@ rte_eal_hugepage_init(void)
}
if (msl_idx == RTE_MAX_MEMSEG_LISTS) {
RTE_LOG(ERR, EAL, "Could not find space for memseg. Please increase %s and/or %s in configuration.\n",
RTE_STR(CONFIG_RTE_MAX_MEMSEG_PER_TYPE),
RTE_STR(CONFIG_RTE_MAX_MEM_MB_PER_TYPE));
RTE_STR(RTE_MAX_MEMSEG_PER_TYPE),
RTE_STR(RTE_MAX_MEM_MB_PER_TYPE));
return -1;
}
arr = &msl->memseg_arr;
@ -405,7 +405,7 @@ memseg_primary_init(void)
if (msl_idx >= RTE_MAX_MEMSEG_LISTS) {
RTE_LOG(ERR, EAL,
"No more space in memseg lists, please increase %s\n",
RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS));
RTE_STR(RTE_MAX_MEMSEG_LISTS));
return -1;
}

8
lib/librte_eal/linux/eal_memory.c
View File

@ -713,8 +713,8 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)
}
if (msl_idx == RTE_MAX_MEMSEG_LISTS) {
RTE_LOG(ERR, EAL, "Could not find space for memseg. Please increase %s and/or %s in configuration.\n",
RTE_STR(CONFIG_RTE_MAX_MEMSEG_PER_TYPE),
RTE_STR(CONFIG_RTE_MAX_MEM_MB_PER_TYPE));
RTE_STR(RTE_MAX_MEMSEG_PER_TYPE),
RTE_STR(RTE_MAX_MEM_MB_PER_TYPE));
return -1;
}
@ -963,7 +963,7 @@ prealloc_segments(struct hugepage_file *hugepages, int n_pages)
}
if (msl_idx == RTE_MAX_MEMSEG_LISTS) {
RTE_LOG(ERR, EAL, "Not enough space in memseg lists, please increase %s\n",
RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS));
RTE_STR(RTE_MAX_MEMSEG_LISTS));
return -1;
}
@ -1818,7 +1818,7 @@ memseg_primary_init_32(void)
if (msl_idx >= RTE_MAX_MEMSEG_LISTS) {
RTE_LOG(ERR, EAL,
"No more space in memseg lists, please increase %s\n",
RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS));
RTE_STR(RTE_MAX_MEMSEG_LISTS));
return -1;
}

2
lib/librte_eal/linux/eal_timer.c
View File

@ -163,7 +163,7 @@ rte_eal_hpet_init(int make_default)
RTE_LOG(ERR, EAL, "ERROR: Cannot mmap "DEV_HPET"!\n"
"Please enable CONFIG_HPET_MMAP in your kernel configuration "
"to allow HPET support.\n"
"To run without using HPET, set CONFIG_RTE_LIBEAL_USE_HPET=n "
"To run without using HPET, unset RTE_LIBEAL_USE_HPET "
"in your build configuration or use '--no-hpet' EAL flag.\n");
close(fd);
internal_conf->no_hpet = 1;

2
lib/librte_eal/linux/eal_vfio_mp_sync.c
View File

@ -17,7 +17,7 @@
* @file
* VFIO socket for communication between primary and secondary processes.
*
* This file is only compiled if CONFIG_RTE_EAL_VFIO is set to "y".
* This file is only compiled if RTE_EAL_VFIO is set.
*/
#ifdef VFIO_PRESENT

3
lib/librte_mbuf/rte_mbuf_core.h
View File

@ -495,8 +495,7 @@ struct rte_mbuf {
* It should only be accessed using the following functions:
* rte_mbuf_refcnt_update(), rte_mbuf_refcnt_read(), and
* rte_mbuf_refcnt_set(). The functionality of these functions (atomic,
* or non-atomic) is controlled by the CONFIG_RTE_MBUF_REFCNT_ATOMIC
* config option.
* or non-atomic) is controlled by the RTE_MBUF_REFCNT_ATOMIC flag.
*/
uint16_t refcnt;
uint16_t nb_segs; /**< Number of segments. */

10
lib/librte_rcu/rte_rcu_qsbr.h
View File

@ -84,7 +84,7 @@ struct rte_rcu_qsbr_cnt {
* changes to various APIs.
*/
uint32_t lock_cnt;
/**< Lock counter. Used when CONFIG_RTE_LIBRTE_RCU_DEBUG is enabled */
/**< Lock counter. Used when RTE_LIBRTE_RCU_DEBUG is enabled */
} __rte_cache_aligned;
#define __RTE_QSBR_CNT_THR_OFFLINE 0
@ -383,11 +383,11 @@ rte_rcu_qsbr_thread_offline(struct rte_rcu_qsbr *v, unsigned int thread_id)
* This API is provided to aid debugging. This should be called before
* accessing a shared data structure.
*
* When CONFIG_RTE_LIBRTE_RCU_DEBUG is enabled a lock counter is incremented.
* When RTE_LIBRTE_RCU_DEBUG is enabled a lock counter is incremented.
* Similarly rte_rcu_qsbr_unlock will decrement the counter. When the
* rte_rcu_qsbr_check API will verify that this counter is 0.
*
* When CONFIG_RTE_LIBRTE_RCU_DEBUG is disabled, this API will do nothing.
* When RTE_LIBRTE_RCU_DEBUG is disabled, this API will do nothing.
*
* @param v
* QS variable
@ -416,11 +416,11 @@ rte_rcu_qsbr_lock(__rte_unused struct rte_rcu_qsbr *v,
* This API is provided to aid debugging. This should be called after
* accessing a shared data structure.
*
* When CONFIG_RTE_LIBRTE_RCU_DEBUG is enabled, rte_rcu_qsbr_unlock will
* When RTE_LIBRTE_RCU_DEBUG is enabled, rte_rcu_qsbr_unlock will
* decrement a lock counter. rte_rcu_qsbr_check API will verify that this
* counter is 0.
*
* When CONFIG_RTE_LIBRTE_RCU_DEBUG is disabled, this API will do nothing.
* When RTE_LIBRTE_RCU_DEBUG is disabled, this API will do nothing.
*
* @param v
* QS variable