aboutsummaryrefslogtreecommitdiff
path: root/platform/linux-dpdk
diff options
context:
space:
mode:
Diffstat (limited to 'platform/linux-dpdk')
-rw-r--r--platform/linux-dpdk/Makefile.am1
-rw-r--r--platform/linux-dpdk/include/odp/api/plat/packet_inline_types.h7
-rw-r--r--platform/linux-dpdk/include/odp_buffer_internal.h1
-rw-r--r--platform/linux-dpdk/include/odp_eventdev_internal.h4
-rw-r--r--platform/linux-dpdk/include/odp_packet_internal.h27
-rw-r--r--platform/linux-dpdk/include/odp_packet_io_internal.h4
-rw-r--r--platform/linux-dpdk/include/odp_queue_basic_internal.h4
-rw-r--r--platform/linux-dpdk/odp_crypto.c5
-rw-r--r--platform/linux-dpdk/odp_packet.c6
-rw-r--r--platform/linux-dpdk/odp_pool.c60
-rw-r--r--platform/linux-dpdk/odp_queue_basic.c5
-rw-r--r--platform/linux-dpdk/odp_queue_eventdev.c5
-rw-r--r--platform/linux-dpdk/odp_schedule_eventdev.c1
-rw-r--r--platform/linux-dpdk/odp_schedule_if.c5
-rw-r--r--platform/linux-dpdk/odp_shared_memory.c6
-rw-r--r--platform/linux-dpdk/odp_timer.c5
16 files changed, 78 insertions, 68 deletions
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
index 70ce4b980..b3365be71 100644
--- a/platform/linux-dpdk/Makefile.am
+++ b/platform/linux-dpdk/Makefile.am
@@ -104,7 +104,6 @@ odpapiabiarchinclude_HEADERS += \
endif
noinst_HEADERS = \
- ${top_srcdir}/platform/linux-generic/include/odp_align_internal.h \
${top_srcdir}/platform/linux-generic/include/odp_atomic_internal.h \
${top_srcdir}/platform/linux-generic/include/odp_bitset.h \
include/odp_buffer_internal.h \
diff --git a/platform/linux-dpdk/include/odp/api/plat/packet_inline_types.h b/platform/linux-dpdk/include/odp/api/plat/packet_inline_types.h
index 06e322066..e0169579a 100644
--- a/platform/linux-dpdk/include/odp/api/plat/packet_inline_types.h
+++ b/platform/linux-dpdk/include/odp/api/plat/packet_inline_types.h
@@ -113,7 +113,7 @@ typedef union {
uint32_t all_flags;
struct {
- uint32_t reserved1: 6;
+ uint32_t reserved1: 7;
/*
* Init flags
@@ -144,14 +144,13 @@ typedef union {
uint32_t udp_err: 1; /* UDP error */
uint32_t sctp_err: 1; /* SCTP error */
uint32_t l4_chksum_err: 1; /* L4 checksum error */
- uint32_t crypto_err: 1; /* Crypto packet operation error */
};
/* Flag groups */
struct {
- uint32_t reserved2: 6;
+ uint32_t reserved2: 7;
uint32_t other: 18; /* All other flags */
- uint32_t error: 8; /* All error flags */
+ uint32_t error: 7; /* All error flags */
} all;
} _odp_packet_flags_t;
diff --git a/platform/linux-dpdk/include/odp_buffer_internal.h b/platform/linux-dpdk/include/odp_buffer_internal.h
index 42b686a2a..3b99961c1 100644
--- a/platform/linux-dpdk/include/odp_buffer_internal.h
+++ b/platform/linux-dpdk/include/odp_buffer_internal.h
@@ -27,7 +27,6 @@ extern "C" {
#include <odp/api/std_types.h>
#include <odp/api/thread.h>
-#include <odp_align_internal.h>
#include <odp_config_internal.h>
#include <odp_event_internal.h>
diff --git a/platform/linux-dpdk/include/odp_eventdev_internal.h b/platform/linux-dpdk/include/odp_eventdev_internal.h
index f6b01ec81..66da6daee 100644
--- a/platform/linux-dpdk/include/odp_eventdev_internal.h
+++ b/platform/linux-dpdk/include/odp_eventdev_internal.h
@@ -25,9 +25,9 @@ extern "C" {
#include <odp/api/thread.h>
#include <odp/api/ticketlock.h>
-#include <odp_align_internal.h>
#include <odp_config_internal.h>
#include <odp_forward_typedefs_internal.h>
+#include <odp_macros_internal.h>
#include <odp_packet_io_internal.h>
#include <odp_ptr_ring_mpmc_internal.h>
#include <odp_queue_if.h>
@@ -88,7 +88,7 @@ struct queue_entry_s {
union queue_entry_u {
struct queue_entry_s s;
- uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct queue_entry_s))];
+ uint8_t pad[_ODP_ROUNDUP_CACHE_LINE(sizeof(struct queue_entry_s))];
};
/* Eventdev global data */
diff --git a/platform/linux-dpdk/include/odp_packet_internal.h b/platform/linux-dpdk/include/odp_packet_internal.h
index a381386fc..02d7ff7b0 100644
--- a/platform/linux-dpdk/include/odp_packet_internal.h
+++ b/platform/linux-dpdk/include/odp_packet_internal.h
@@ -20,20 +20,23 @@ extern "C" {
#include <odp/api/align.h>
#include <odp/api/debug.h>
+#include <odp/api/hints.h>
#include <odp/api/ipsec.h>
#include <odp/api/packet.h>
-#include <odp/api/plat/packet_inline_types.h>
#include <odp/api/packet_io.h>
#include <odp/api/crypto.h>
#include <odp/api/comp.h>
#include <odp/api/std.h>
+#include <odp/api/plat/packet_inline_types.h>
+
#include <odp_config_internal.h>
#include <odp_debug_internal.h>
#include <odp_event_internal.h>
#include <odp_pool_internal.h>
#include <protocols/eth.h>
+#include <stdint.h>
#include <string.h>
#include <rte_config.h>
@@ -158,13 +161,11 @@ typedef struct odp_packet_hdr_t {
int8_t subtype;
union {
- struct {
- /* Result for crypto packet op */
- odp_crypto_packet_result_t crypto_op_result;
+ /* Result for crypto packet op */
+ odp_crypto_packet_result_t crypto_op_result;
- /* Context for IPsec */
- odp_ipsec_packet_result_t ipsec_ctx;
- };
+ /* Context for IPsec */
+ odp_ipsec_packet_result_t ipsec_ctx;
/* Result for comp packet op */
odp_comp_packet_result_t comp_op_result;
@@ -271,7 +272,10 @@ static inline void _odp_packet_copy_md(odp_packet_hdr_t *dst_hdr,
odp_packet_hdr_t *src_hdr,
odp_bool_t uarea_copy)
{
+ const int8_t subtype = src_hdr->subtype;
+
dst_hdr->input = src_hdr->input;
+ dst_hdr->subtype = subtype;
dst_hdr->dst_queue = src_hdr->dst_queue;
dst_hdr->cos = src_hdr->cos;
dst_hdr->cls_mark = src_hdr->cls_mark;
@@ -321,6 +325,15 @@ static inline void _odp_packet_copy_md(odp_packet_hdr_t *dst_hdr,
dst_hdr->uarea_addr = src_uarea;
}
}
+
+ if (odp_unlikely(subtype != ODP_EVENT_PACKET_BASIC)) {
+ if (subtype == ODP_EVENT_PACKET_IPSEC)
+ dst_hdr->ipsec_ctx = src_hdr->ipsec_ctx;
+ else if (subtype == ODP_EVENT_PACKET_CRYPTO)
+ dst_hdr->crypto_op_result = src_hdr->crypto_op_result;
+ else if (subtype == ODP_EVENT_PACKET_COMP)
+ dst_hdr->comp_op_result = src_hdr->comp_op_result;
+ }
}
static inline void _odp_packet_copy_cls_md(odp_packet_hdr_t *dst_hdr,
diff --git a/platform/linux-dpdk/include/odp_packet_io_internal.h b/platform/linux-dpdk/include/odp_packet_io_internal.h
index 1f3fb650d..59410eef6 100644
--- a/platform/linux-dpdk/include/odp_packet_io_internal.h
+++ b/platform/linux-dpdk/include/odp_packet_io_internal.h
@@ -26,10 +26,10 @@ extern "C" {
#include <odp/api/plat/packet_io_inlines.h>
-#include <odp_align_internal.h>
#include <odp_classification_datamodel.h>
#include <odp_config_internal.h>
#include <odp_debug_internal.h>
+#include <odp_macros_internal.h>
#include <odp_queue_if.h>
#include <inttypes.h>
@@ -159,7 +159,7 @@ struct pktio_entry {
typedef union {
struct pktio_entry s;
- uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct pktio_entry))];
+ uint8_t pad[_ODP_ROUNDUP_CACHE_LINE(sizeof(struct pktio_entry))];
} pktio_entry_t;
typedef struct {
diff --git a/platform/linux-dpdk/include/odp_queue_basic_internal.h b/platform/linux-dpdk/include/odp_queue_basic_internal.h
index 72c77d985..36ef7c6b5 100644
--- a/platform/linux-dpdk/include/odp_queue_basic_internal.h
+++ b/platform/linux-dpdk/include/odp_queue_basic_internal.h
@@ -20,10 +20,10 @@ extern "C" {
#include <odp/api/shared_memory.h>
#include <odp/api/ticketlock.h>
-#include <odp_align_internal.h>
#include <odp_buffer_internal.h>
#include <odp_config_internal.h>
#include <odp_forward_typedefs_internal.h>
+#include <odp_macros_internal.h>
#include <odp_ptr_ring_mpmc_internal.h>
#include <odp_ptr_ring_st_internal.h>
#include <odp_ptr_ring_spsc_internal.h>
@@ -70,7 +70,7 @@ struct queue_entry_s {
union queue_entry_u {
struct queue_entry_s s;
- uint8_t pad[ROUNDUP_CACHE_LINE(sizeof(struct queue_entry_s))];
+ uint8_t pad[_ODP_ROUNDUP_CACHE_LINE(sizeof(struct queue_entry_s))];
};
typedef struct queue_global_t {
diff --git a/platform/linux-dpdk/odp_crypto.c b/platform/linux-dpdk/odp_crypto.c
index 21c9f00ee..ff6dcf0b6 100644
--- a/platform/linux-dpdk/odp_crypto.c
+++ b/platform/linux-dpdk/odp_crypto.c
@@ -1816,7 +1816,6 @@ int odp_crypto_int(odp_packet_t pkt_in,
odp_bool_t allocated = false;
odp_packet_t out_pkt = *pkt_out;
odp_crypto_packet_result_t *op_result;
- odp_packet_hdr_t *pkt_hdr;
odp_bool_t result_ok = true;
session = (crypto_session_entry_t *)(intptr_t)param->session;
@@ -1984,9 +1983,6 @@ out:
op_result->auth_status.hw_err = ODP_CRYPTO_HW_ERR_NONE;
op_result->ok = result_ok;
- pkt_hdr = packet_hdr(out_pkt);
- pkt_hdr->p.flags.crypto_err = !op_result->ok;
-
/* Synchronous, simply return results */
*pkt_out = out_pkt;
@@ -2032,7 +2028,6 @@ int odp_crypto_operation(odp_crypto_op_param_t *param,
* We cannot fail since odp_crypto_op() has already processed
* the packet. Let's indicate error in the result instead.
*/
- packet_hdr(out_pkt)->p.flags.crypto_err = 1;
packet_result.ok = false;
}
diff --git a/platform/linux-dpdk/odp_packet.c b/platform/linux-dpdk/odp_packet.c
index 1af9bf0c5..daef605d4 100644
--- a/platform/linux-dpdk/odp_packet.c
+++ b/platform/linux-dpdk/odp_packet.c
@@ -5,6 +5,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
+#include <odp/api/align.h>
#include <odp/api/buffer.h>
#include <odp/api/byteorder.h>
#include <odp/api/hash.h>
@@ -20,7 +21,6 @@
#include <odp/api/plat/packet_inlines.h>
#include <odp/api/plat/packet_io_inlines.h>
-#include <odp_align_internal.h>
#include <odp_chksum_internal.h>
#include <odp_debug_internal.h>
#include <odp_errno_define.h>
@@ -788,7 +788,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len,
if (seglen >= len) {
misalign = align <= 1 ? 0 :
- ROUNDUP_ALIGN(uaddr, align) - uaddr;
+ _ODP_ROUNDUP_ALIGN(uaddr, align) - uaddr;
if (misalign == 0)
return 0;
shift = align - misalign;
@@ -798,7 +798,7 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len,
shift = len - seglen;
uaddr -= shift;
misalign = align <= 1 ? 0 :
- ROUNDUP_ALIGN(uaddr, align) - uaddr;
+ _ODP_ROUNDUP_ALIGN(uaddr, align) - uaddr;
if (misalign)
shift += align - misalign;
}
diff --git a/platform/linux-dpdk/odp_pool.c b/platform/linux-dpdk/odp_pool.c
index 3dd79f17b..d121b8253 100644
--- a/platform/linux-dpdk/odp_pool.c
+++ b/platform/linux-dpdk/odp_pool.c
@@ -5,42 +5,41 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include <odp/api/std_types.h>
+#include <odp/api/align.h>
+#include <odp/api/hints.h>
#include <odp/api/pool.h>
-#include <odp_pool_internal.h>
-#include <odp_buffer_internal.h>
-#include <odp_packet_internal.h>
-#include <odp_timer_internal.h>
-#include <odp_align_internal.h>
#include <odp/api/shared_memory.h>
-#include <odp/api/align.h>
-#include <odp_init_internal.h>
+#include <odp/api/std_types.h>
+
+#include <odp/api/plat/pool_inline_types.h>
+
+#include <odp_buffer_internal.h>
#include <odp_config_internal.h>
-#include <odp/api/hints.h>
-#include <odp/api/debug.h>
#include <odp_debug_internal.h>
-#include <odp/api/cpumask.h>
-#include <odp_libconfig_internal.h>
#include <odp_event_vector_internal.h>
-
-#include <string.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <math.h>
-#include <inttypes.h>
-
-#include <odp/api/plat/pool_inline_types.h>
+#include <odp_init_internal.h>
+#include <odp_libconfig_internal.h>
+#include <odp_macros_internal.h>
+#include <odp_packet_internal.h>
+#include <odp_pool_internal.h>
+#include <odp_timer_internal.h>
#include <rte_config.h>
#include <rte_errno.h>
+#include <rte_malloc.h>
#include <rte_mempool.h>
#include <rte_mbuf_pool_ops.h>
-#include <rte_malloc.h>
/* ppc64 rte_memcpy.h (included through rte_mempool.h) may define vector */
#if defined(__PPC64__) && defined(vector)
#undef vector
#endif
+#include <inttypes.h>
+#include <math.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
#ifdef POOL_USE_TICKETLOCK
#include <odp/api/ticketlock.h>
#define LOCK(a) odp_ticketlock_lock(a)
@@ -420,7 +419,7 @@ static int check_params(const odp_pool_param_t *params)
return -1;
}
- if (!CHECK_IS_POWER2(params->buf.align)) {
+ if (!_ODP_CHECK_IS_POWER2(params->buf.align)) {
ODP_ERR("buf.align not power of two %u\n", params->buf.align);
return -1;
}
@@ -444,7 +443,7 @@ static int check_params(const odp_pool_param_t *params)
return -1;
}
- if (!CHECK_IS_POWER2(params->pkt.align)) {
+ if (!_ODP_CHECK_IS_POWER2(params->pkt.align)) {
ODP_ERR("pkt.align not power of two %u\n", params->pkt.align);
return -1;
}
@@ -631,7 +630,7 @@ static int reserve_uarea(pool_t *pool, uint32_t uarea_size, uint32_t num_pkt)
pool->pool_idx, pool->name);
uarea_name[ODP_SHM_NAME_LEN - 1] = 0;
- pool->uarea_size = ROUNDUP_CACHE_LINE(uarea_size);
+ pool->uarea_size = _ODP_ROUNDUP_CACHE_LINE(uarea_size);
pool->uarea_shm_size = num_pkt * (uint64_t)pool->uarea_size;
shm = odp_shm_reserve(uarea_name, pool->uarea_shm_size, ODP_PAGE_SIZE, 0);
@@ -699,8 +698,7 @@ odp_pool_t _odp_pool_create(const char *name, const odp_pool_param_t *params,
buf_align = ODP_CONFIG_BUFFER_ALIGN_MIN;
if (params->buf.align != 0)
- blk_size = ROUNDUP_ALIGN(blk_size,
- buf_align);
+ blk_size = _ODP_ROUNDUP_ALIGN(blk_size, buf_align);
hdr_size = sizeof(odp_buffer_hdr_t);
CHECK_U16_OVERFLOW(blk_size);
@@ -732,13 +730,12 @@ odp_pool_t _odp_pool_create(const char *name, const odp_pool_param_t *params,
if ((max_len + blk_size) / blk_size > params->pkt.num)
blk_size = (max_len + params->pkt.num) /
params->pkt.num;
- blk_size = ROUNDUP_ALIGN(headroom + blk_size +
- tailroom, min_align);
+ blk_size = _ODP_ROUNDUP_ALIGN(headroom + blk_size + tailroom, min_align);
/* Segment size minus headroom might be rounded down by the driver (e.g.
* ixgbe) to the nearest multiple of 1024. Round it up here to make sure the
* requested size is still going to fit without segmentation. */
- blk_size = ROUNDUP_ALIGN(blk_size - headroom, min_seg_len) + headroom;
+ blk_size = _ODP_ROUNDUP_ALIGN(blk_size - headroom, min_seg_len) + headroom;
/* Round down the block size to 16 bits */
if (blk_size > UINT16_MAX) {
@@ -783,8 +780,7 @@ odp_pool_t _odp_pool_create(const char *name, const odp_pool_param_t *params,
return ODP_POOL_INVALID;
}
- mb_ctor_arg.seg_buf_offset =
- (uint16_t)ROUNDUP_CACHE_LINE(hdr_size);
+ mb_ctor_arg.seg_buf_offset = (uint16_t)_ODP_ROUNDUP_CACHE_LINE(hdr_size);
mb_ctor_arg.seg_buf_size = mbp_ctor_arg.mbuf_data_room_size;
mb_ctor_arg.type = type;
mb_ctor_arg.event_type = event_type;
@@ -1140,7 +1136,7 @@ int odp_pool_stats_reset(odp_pool_t pool_hdl ODP_UNUSED)
* Round up the space we reserve for objhdr up to cache line size. The rte_mbuf
* that comes after this must be cache line aligned.
*/
-#define SIZEOF_OBJHDR ROUNDUP_CACHE_LINE(sizeof(struct rte_mempool_objhdr))
+#define SIZEOF_OBJHDR _ODP_ROUNDUP_CACHE_LINE(sizeof(struct rte_mempool_objhdr))
int odp_pool_ext_capability(odp_pool_type_t type,
odp_pool_ext_capability_t *capa)
diff --git a/platform/linux-dpdk/odp_queue_basic.c b/platform/linux-dpdk/odp_queue_basic.c
index 5f07bb620..c6970930d 100644
--- a/platform/linux-dpdk/odp_queue_basic.c
+++ b/platform/linux-dpdk/odp_queue_basic.c
@@ -18,6 +18,7 @@
#include <odp_config_internal.h>
#include <odp_packet_io_internal.h>
#include <odp_debug_internal.h>
+#include <odp_macros_internal.h>
#include <odp/api/hints.h>
#include <odp/api/sync.h>
#include <odp/api/plat/sync_inlines.h>
@@ -995,11 +996,11 @@ static int queue_init(queue_entry_t *queue, const char *name,
}
/* Ring size must larger than queue_size */
- if (CHECK_IS_POWER2(queue_size))
+ if (_ODP_CHECK_IS_POWER2(queue_size))
queue_size++;
/* Round up if not already a power of two */
- queue_size = ROUNDUP_POWER2_U32(queue_size);
+ queue_size = _ODP_ROUNDUP_POWER2_U32(queue_size);
/* Single-producer / single-consumer plain queue has simple and
* lock-free implementation */
diff --git a/platform/linux-dpdk/odp_queue_eventdev.c b/platform/linux-dpdk/odp_queue_eventdev.c
index 5e28112ab..e60b4e006 100644
--- a/platform/linux-dpdk/odp_queue_eventdev.c
+++ b/platform/linux-dpdk/odp_queue_eventdev.c
@@ -15,6 +15,7 @@
#include <odp_config_internal.h>
#include <odp_event_internal.h>
#include <odp_debug_internal.h>
+#include <odp_macros_internal.h>
#include <odp_libconfig_internal.h>
#include <odp_queue_if.h>
#include <odp_schedule_if.h>
@@ -1165,11 +1166,11 @@ static int queue_init(queue_entry_t *queue, const char *name,
}
/* Ring size must larger than queue_size */
- if (CHECK_IS_POWER2(queue_size))
+ if (_ODP_CHECK_IS_POWER2(queue_size))
queue_size++;
/* Round up if not already a power of two */
- queue_size = ROUNDUP_POWER2_U32(queue_size);
+ queue_size = _ODP_ROUNDUP_POWER2_U32(queue_size);
/* Default to error functions */
queue->s.enqueue = error_enqueue;
diff --git a/platform/linux-dpdk/odp_schedule_eventdev.c b/platform/linux-dpdk/odp_schedule_eventdev.c
index 8e2c2c034..3c715ae36 100644
--- a/platform/linux-dpdk/odp_schedule_eventdev.c
+++ b/platform/linux-dpdk/odp_schedule_eventdev.c
@@ -1117,5 +1117,6 @@ const schedule_api_t _odp_schedule_eventdev_api = {
.schedule_order_unlock_lock = schedule_order_unlock_lock,
.schedule_order_lock_start = schedule_order_lock_start,
.schedule_order_lock_wait = schedule_order_lock_wait,
+ .schedule_order_wait = order_lock,
.schedule_print = schedule_print
};
diff --git a/platform/linux-dpdk/odp_schedule_if.c b/platform/linux-dpdk/odp_schedule_if.c
index 73475ae88..d5b39b656 100644
--- a/platform/linux-dpdk/odp_schedule_if.c
+++ b/platform/linux-dpdk/odp_schedule_if.c
@@ -206,6 +206,11 @@ void odp_schedule_order_lock_wait(uint32_t lock_index)
_odp_sched_api->schedule_order_lock_wait(lock_index);
}
+void odp_schedule_order_wait(void)
+{
+ _odp_sched_api->schedule_order_wait();
+}
+
void odp_schedule_print(void)
{
_odp_sched_api->schedule_print();
diff --git a/platform/linux-dpdk/odp_shared_memory.c b/platform/linux-dpdk/odp_shared_memory.c
index 645ee49ef..9e2151a0d 100644
--- a/platform/linux-dpdk/odp_shared_memory.c
+++ b/platform/linux-dpdk/odp_shared_memory.c
@@ -13,9 +13,9 @@
#include <odp/api/shared_memory.h>
#include <odp/api/spinlock.h>
-#include <odp_align_internal.h>
#include <odp_config_internal.h>
#include <odp_debug_internal.h>
+#include <odp_macros_internal.h>
#include <odp_shm_internal.h>
#include <string.h>
@@ -266,8 +266,8 @@ odp_shm_t odp_shm_reserve(const char *name, uint64_t size, uint64_t align,
}
/* DPDK requires alignment to be power of two */
- if (!rte_is_power_of_2(align))
- align = ROUNDUP_POWER2_U32(align);
+ if (!_ODP_CHECK_IS_POWER2(align))
+ align = _ODP_ROUNDUP_POWER2_U32(align);
odp_spinlock_lock(&shm_tbl->lock);
diff --git a/platform/linux-dpdk/odp_timer.c b/platform/linux-dpdk/odp_timer.c
index 01f23ee31..c10b246b7 100644
--- a/platform/linux-dpdk/odp_timer.c
+++ b/platform/linux-dpdk/odp_timer.c
@@ -23,6 +23,7 @@
#include <odp_debug_internal.h>
#include <odp_init_internal.h>
#include <odp_libconfig_internal.h>
+#include <odp_macros_internal.h>
#include <odp_pool_internal.h>
#include <odp_queue_if.h>
#include <odp_ring_u32_internal.h>
@@ -650,9 +651,9 @@ odp_timer_pool_t odp_timer_pool_create(const char *name,
nsec_per_scan = res_ns;
/* Ring size must larger than param->num_timers */
- if (CHECK_IS_POWER2(num_timers))
+ if (_ODP_CHECK_IS_POWER2(num_timers))
num_timers++;
- num_timers = ROUNDUP_POWER2_U32(num_timers);
+ num_timers = _ODP_ROUNDUP_POWER2_U32(num_timers);
odp_ticketlock_lock(&timer_global->lock);