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 v1 19/20] net/ntnic: rename hwlock
Date: Wed, 1 Oct 2025 17:10:01 +0200 [thread overview]
Message-ID: <20251001151018.250671-20-sil-plv@napatech.com> (raw)
In-Reply-To: <20251001151018.250671-1-sil-plv@napatech.com>
All global variables in driver should use common prefix.
Rename hwlock to nthw_lock.
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 | 14 +++++++-------
drivers/net/ntnic/ntnic_filter/ntnic_filter.c | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ntnic/include/stream_binary_flow_api.h b/drivers/net/ntnic/include/stream_binary_flow_api.h
index 4ce1561033..3c6de8899b 100644
--- a/drivers/net/ntnic/include/stream_binary_flow_api.h
+++ b/drivers/net/ntnic/include/stream_binary_flow_api.h
@@ -47,7 +47,7 @@
#define RAW_ENCAP_DECAP_ELEMS_MAX 16
extern uint64_t rte_tsc_freq;
-extern rte_spinlock_t hwlock;
+extern rte_spinlock_t nthw_lock;
/*
* Flow eth dev profile determines how the FPGA module resources are
diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c
index 29508888a3..dc9202cdc0 100644
--- a/drivers/net/ntnic/ntnic_ethdev.c
+++ b/drivers/net/ntnic/ntnic_ethdev.c
@@ -95,7 +95,7 @@ static const struct rte_pci_id nthw_pci_id_map[] = {
static const struct sg_ops_s *sg_ops;
-rte_spinlock_t hwlock = RTE_SPINLOCK_INITIALIZER;
+rte_spinlock_t nthw_lock = RTE_SPINLOCK_INITIALIZER;
/*
* Store and get adapter info
@@ -127,9 +127,9 @@ store_pdrv(struct drv_s *p_drv)
PCIIDENT_TO_FUNCNR(p_drv->ntdrv.pciident));
}
- rte_spinlock_lock(&hwlock);
+ rte_spinlock_lock(&nthw_lock);
_g_p_drv[p_drv->adapter_no] = p_drv;
- rte_spinlock_unlock(&hwlock);
+ rte_spinlock_unlock(&nthw_lock);
}
static void clear_pdrv(struct drv_s *p_drv)
@@ -137,9 +137,9 @@ static void clear_pdrv(struct drv_s *p_drv)
if (p_drv->adapter_no >= NUM_ADAPTER_MAX)
return;
- rte_spinlock_lock(&hwlock);
+ rte_spinlock_lock(&nthw_lock);
_g_p_drv[p_drv->adapter_no] = NULL;
- rte_spinlock_unlock(&hwlock);
+ rte_spinlock_unlock(&nthw_lock);
}
static struct drv_s *
@@ -147,7 +147,7 @@ get_pdrv_from_pci(struct rte_pci_addr addr)
{
int i;
struct drv_s *p_drv = NULL;
- rte_spinlock_lock(&hwlock);
+ rte_spinlock_lock(&nthw_lock);
for (i = 0; i < NUM_ADAPTER_MAX; i++) {
if (_g_p_drv[i]) {
@@ -159,7 +159,7 @@ get_pdrv_from_pci(struct rte_pci_addr addr)
}
}
- rte_spinlock_unlock(&hwlock);
+ rte_spinlock_unlock(&nthw_lock);
return p_drv;
}
diff --git a/drivers/net/ntnic/ntnic_filter/ntnic_filter.c b/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
index c1a05255ee..fc5f5f8d2f 100644
--- a/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
+++ b/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
@@ -1215,7 +1215,7 @@ static int poll_statistics(struct pmd_internals *internals)
RTE_ASSERT(rte_tsc_freq > 0);
- rte_spinlock_lock(&hwlock);
+ rte_spinlock_lock(&nthw_lock);
uint64_t now_rtc = rte_get_tsc_cycles();
@@ -1224,7 +1224,7 @@ static int poll_statistics(struct pmd_internals *internals)
* if more than a second since last stat read, do a new one
*/
if ((now_rtc - internals->last_stat_rtc) < rte_tsc_freq) {
- rte_spinlock_unlock(&hwlock);
+ rte_spinlock_unlock(&nthw_lock);
return 0;
}
@@ -1270,7 +1270,7 @@ static int poll_statistics(struct pmd_internals *internals)
/* Globally only once a second */
if ((now_rtc - last_stat_rtc) < rte_tsc_freq) {
- rte_spinlock_unlock(&hwlock);
+ rte_spinlock_unlock(&nthw_lock);
rte_spinlock_unlock(&p_nt_drv->stat_lck);
return 0;
}
@@ -1307,7 +1307,7 @@ static int poll_statistics(struct pmd_internals *internals)
}
}
- rte_spinlock_unlock(&hwlock);
+ 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-01 15:12 UTC|newest]
Thread overview: 21+ 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 ` Serhii Iliushyk [this message]
2025-10-01 15:10 ` [PATCH v1 20/20] net/ntnic: rename nt log types Serhii Iliushyk
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=20251001151018.250671-20-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).