From: Serhii Iliushyk <sil-plv@napatech.com>
To: dev@dpdk.org
Cc: mko-plv@napatech.com, sil-plv@napatech.com, ckm@napatech.com,
stephen@networkplumber.org
Subject: [PATCH v2 21/21] net/ntnic: fix potential name conflict
Date: Mon, 20 Oct 2025 18:43:30 +0200 [thread overview]
Message-ID: <20251020164336.283664-22-sil-plv@napatech.com> (raw)
In-Reply-To: <20251020164336.283664-1-sil-plv@napatech.com>
Drivers should not have global variables that could conflict with EAL.
Rename rte_tsc_freq to nthw_tsc_freq.
Signed-off-by: Serhii Iliushyk <sil-plv@napatech.com>
---
drivers/net/ntnic/include/stream_binary_flow_api.h | 2 +-
drivers/net/ntnic/ntnic_ethdev.c | 4 ++--
drivers/net/ntnic/ntnic_filter/ntnic_filter.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ntnic/include/stream_binary_flow_api.h b/drivers/net/ntnic/include/stream_binary_flow_api.h
index 3c6de8899b..0678b284d4 100644
--- a/drivers/net/ntnic/include/stream_binary_flow_api.h
+++ b/drivers/net/ntnic/include/stream_binary_flow_api.h
@@ -46,7 +46,7 @@
#define RAW_ENCAP_DECAP_ELEMS_MAX 16
-extern uint64_t rte_tsc_freq;
+extern uint64_t nthw_tsc_freq;
extern rte_spinlock_t nthw_lock;
/*
diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c
index 3d52889ad2..4190cfab33 100644
--- a/drivers/net/ntnic/ntnic_ethdev.c
+++ b/drivers/net/ntnic/ntnic_ethdev.c
@@ -67,7 +67,7 @@
#define MTUINITVAL 1500
-uint64_t rte_tsc_freq;
+uint64_t nthw_tsc_freq;
#define ETH_DEV_NTNIC_HELP_ARG "help"
@@ -2723,7 +2723,7 @@ nthw_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
*/
uint64_t now_rtc = rte_get_tsc_cycles();
nthw_os_wait_usec(10 * 1000);
- rte_tsc_freq = 100 * (rte_get_tsc_cycles() - now_rtc);
+ nthw_tsc_freq = 100 * (rte_get_tsc_cycles() - now_rtc);
NT_LOG_DBGX(DBG, NTNIC, "leave: ret=%d", ret);
return ret;
diff --git a/drivers/net/ntnic/ntnic_filter/ntnic_filter.c b/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
index fc5f5f8d2f..f1c7fe22e0 100644
--- a/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
+++ b/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
@@ -1213,7 +1213,7 @@ static int poll_statistics(struct pmd_internals *internals)
if (!p_nt4ga_stat || n_intf_no < 0 || n_intf_no >= NUM_ADAPTER_PORTS_MAX)
return -1;
- RTE_ASSERT(rte_tsc_freq > 0);
+ RTE_ASSERT(nthw_tsc_freq > 0);
rte_spinlock_lock(&nthw_lock);
@@ -1223,7 +1223,7 @@ static int poll_statistics(struct pmd_internals *internals)
* Check per port max once a second
* if more than a second since last stat read, do a new one
*/
- if ((now_rtc - internals->last_stat_rtc) < rte_tsc_freq) {
+ if ((now_rtc - internals->last_stat_rtc) < nthw_tsc_freq) {
rte_spinlock_unlock(&nthw_lock);
return 0;
}
@@ -1269,7 +1269,7 @@ static int poll_statistics(struct pmd_internals *internals)
}
/* Globally only once a second */
- if ((now_rtc - last_stat_rtc) < rte_tsc_freq) {
+ if ((now_rtc - last_stat_rtc) < nthw_tsc_freq) {
rte_spinlock_unlock(&nthw_lock);
rte_spinlock_unlock(&p_nt_drv->stat_lck);
return 0;
--
2.45.0
next prev parent reply other threads:[~2025-10-20 16:46 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-01 15:09 [PATCH v1 00/20] Add NT400D11 support and new features Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 01/20] net/ntnic: add stubs for init NT400D11 Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 02/20] net/ntnic: add reset setup for NT400D11 Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 03/20] net/ntnic: add reset init stage 0 " Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 04/20] net/ntnic: add reset init stage 1 " Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 05/20] net/ntnic: add reset init stage 2 " Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 06/20] net/ntnic: add reset init stage 3 and 4 " Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 07/20] net/ntnic: add reset init stage 5 " Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 08/20] net/ntnic: add reset init stage 6 " Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 09/20] net/ntnic: add reset init stage 7 " Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 10/20] net/ntnic: add reset init stage 8 " Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 11/20] net/ntnic: add fpga registers " Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 12/20] net/ntnic: add support pattern matching on inner ETH headers Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 13/20] net/ntnic: add support pattern matching on inner VLAN header Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 14/20] net/ntnic: add handling exception path option Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 15/20] net/ntnic: add flow query with count action Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 16/20] net/ntnic: add flow pull Serhii Iliushyk
2025-10-01 15:09 ` [PATCH v1 17/20] net/ntnic: extend flow dump with MBR configuration Serhii Iliushyk
2025-10-01 15:10 ` [PATCH v1 18/20] net/ntnic: make flow lock local Serhii Iliushyk
2025-10-01 15:10 ` [PATCH v1 19/20] net/ntnic: rename hwlock Serhii Iliushyk
2025-10-01 15:10 ` [PATCH v1 20/20] net/ntnic: rename nt log types Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 00/21] Add NT400D11 support and new features Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 01/21] net/ntnic: add stubs for init NT400D11 Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 02/21] net/ntnic: add reset setup for NT400D11 Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 03/21] net/ntnic: add reset initi stage 0 " Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 04/21] net/ntnic: add reset init stage 1 " Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 05/21] net/ntnic: add reset init stage 2 " Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 06/21] net/ntnic: add reset init stage 3 and 4 " Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 07/21] net/ntnic: add reset init stage 5 " Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 08/21] net/ntnic: add reset init stage 6 " Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 09/21] net/ntnic: add reset init stage 7 " Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 10/21] net/ntnic: add reset init stage 8 " Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 11/21] net/ntnic: add fpga registers " Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 12/21] net/ntnic: add support pattern matching on inner ETH headers Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 13/21] net/ntnic: add support pattern matching on inner VLAN header Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 14/21] net/ntnic: add handling exception path option Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 15/21] net/ntnic: add flow query with count action Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 16/21] net/ntnic: add flow pull Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 17/21] net/ntnic: extend flow dump with MBR configuration Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 18/21] net/ntnic: make flow lock local Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 19/21] net/ntnic: rename hwlock Serhii Iliushyk
2025-10-20 16:43 ` [PATCH v2 20/21] net/ntnic: rename nt log types Serhii Iliushyk
2025-10-20 16:43 ` Serhii Iliushyk [this message]
2025-10-20 21:38 ` [PATCH v1 00/20] Add NT400D11 support and new features Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251020164336.283664-22-sil-plv@napatech.com \
--to=sil-plv@napatech.com \
--cc=ckm@napatech.com \
--cc=dev@dpdk.org \
--cc=mko-plv@napatech.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).