Change setter functions prefix from set_ to nthw_set_ for DBS module
Signed-off-by: Serhii Iliushyk <[email protected]>
---
drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c | 50 +++++++++----------
drivers/net/ntnic/include/ntnic_dbs.h | 22 ++++----
drivers/net/ntnic/nthw/dbs/nthw_dbs.c | 22 ++++----
3 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c
b/drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c
index 7b2e2e53fc..3257233545 100644
--- a/drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c
+++ b/drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c
@@ -198,7 +198,7 @@ static void dbs_init_tx_queue(nthw_dbs_t *p_nthw_dbs,
uint32_t queue, uint32_t s
nthw_get_tx_init(p_nthw_dbs, &init, &dummy, &busy);
} while (busy != 0);
- set_tx_init(p_nthw_dbs, start_idx, start_ptr, INIT_QUEUE, queue);
+ nthw_set_tx_init(p_nthw_dbs, start_idx, start_ptr, INIT_QUEUE, queue);
do {
nthw_get_tx_init(p_nthw_dbs, &init, &dummy, &busy);
@@ -221,14 +221,14 @@ static int nthw_virt_queue_init(struct fpga_info_s
*p_fpga_info)
if (p_nthw_dbs == NULL)
return -1;
- res = dbs_init(NULL, p_fpga, 0);/* Check that DBS exists in FPGA */
+ res = nthw_dbs_init(NULL, p_fpga, 0);/* Check that DBS exists in FPGA */
if (res) {
free(p_nthw_dbs);
return res;
}
- res = dbs_init(p_nthw_dbs, p_fpga, 0); /* Create DBS module */
+ res = nthw_dbs_init(p_nthw_dbs, p_fpga, 0); /* Create DBS module */
if (res) {
free(p_nthw_dbs);
@@ -242,7 +242,7 @@ static int nthw_virt_queue_init(struct fpga_info_s
*p_fpga_info)
txvq[i].usage = NTHW_VIRTQ_UNUSED;
}
- dbs_reset(p_nthw_dbs);
+ nthw_dbs_reset(p_nthw_dbs);
for (i = 0; i < NT_DBS_RX_QUEUES_MAX; ++i)
dbs_init_rx_queue(p_nthw_dbs, i, 0, 0);
@@ -382,8 +382,8 @@ static struct nthw_virt_queue
*nthw_setup_rx_virt_queue(nthw_dbs_t *p_nthw_dbs,
* 3. Configure the DBS.RX_DR_DATA memory; good idea to initialize all
* DBS_RX_QUEUES entries.
*/
- if (set_rx_dr_data(p_nthw_dbs, index, (uint64_t)desc_struct_phys_addr,
host_id, qs, header,
- 0) != 0) {
+ if (nthw_set_rx_dr_data(p_nthw_dbs, index,
(uint64_t)desc_struct_phys_addr,
+ host_id, qs, header, 0) != 0) {
return NULL;
}
@@ -398,9 +398,9 @@ static struct nthw_virt_queue
*nthw_setup_rx_virt_queue(nthw_dbs_t *p_nthw_dbs,
int_enable = 0;
vec = 0;
istk = 0;
- NT_LOG_DBGX(DBG, NTNIC, "set_rx_uw_data int=0 irq_vector=%i",
irq_vector);
+ NT_LOG_DBGX(DBG, NTNIC, "nthw_set_rx_uw_data int=0 irq_vector=%i",
irq_vector);
- if (set_rx_uw_data(p_nthw_dbs, index,
+ if (nthw_set_rx_uw_data(p_nthw_dbs, index,
(uint64_t)used_struct_phys_addr,
host_id, qs, 0, int_enable, vec, istk) != 0) {
return NULL;
@@ -414,7 +414,7 @@ static struct nthw_virt_queue
*nthw_setup_rx_virt_queue(nthw_dbs_t *p_nthw_dbs,
* at a later time (after we have enabled vfio interrupts in the
kernel).
*/
if (irq_vector < 0) {
- if (set_rx_am_data(p_nthw_dbs, index,
(uint64_t)avail_struct_phys_addr,
+ if (nthw_set_rx_am_data(p_nthw_dbs, index,
(uint64_t)avail_struct_phys_addr,
RX_AM_DISABLE, host_id, 0,
0) != 0) {
return NULL;
@@ -432,7 +432,7 @@ static struct nthw_virt_queue
*nthw_setup_rx_virt_queue(nthw_dbs_t *p_nthw_dbs,
* good idea to initialize all DBS_RX_QUEUES entries.
*/
uint32_t enable = rx_deferred_start ? RX_AM_DISABLE : RX_AM_ENABLE;
- if (set_rx_am_data(p_nthw_dbs, index, (uint64_t)avail_struct_phys_addr,
enable,
+ if (nthw_set_rx_am_data(p_nthw_dbs, index,
(uint64_t)avail_struct_phys_addr, enable,
host_id, 0, irq_vector >= 0 ? 1 : 0) != 0) {
return NULL;
}
@@ -520,7 +520,7 @@ static int dbs_internal_release_rx_virt_queue(struct
nthw_virt_queue *rxvq)
/* Clear UW */
rxvq->used_struct_phys_addr = NULL;
- if (set_rx_uw_data(p_nthw_dbs, rxvq->index,
(uint64_t)rxvq->used_struct_phys_addr,
+ if (nthw_set_rx_uw_data(p_nthw_dbs, rxvq->index,
(uint64_t)rxvq->used_struct_phys_addr,
rxvq->host_id, 0, PACKED(rxvq->vq_type), 0, 0, 0) != 0)
{
return -1;
}
@@ -528,7 +528,7 @@ static int dbs_internal_release_rx_virt_queue(struct
nthw_virt_queue *rxvq)
/* Disable AM */
rxvq->am_enable = RX_AM_DISABLE;
- if (set_rx_am_data(p_nthw_dbs,
+ if (nthw_set_rx_am_data(p_nthw_dbs,
rxvq->index,
(uint64_t)rxvq->avail_struct_phys_addr,
rxvq->am_enable,
@@ -546,7 +546,7 @@ static int dbs_internal_release_rx_virt_queue(struct
nthw_virt_queue *rxvq)
rxvq->avail_struct_phys_addr = NULL;
rxvq->host_id = 0;
- if (set_rx_am_data(p_nthw_dbs,
+ if (nthw_set_rx_am_data(p_nthw_dbs,
rxvq->index,
(uint64_t)rxvq->avail_struct_phys_addr,
rxvq->am_enable,
@@ -558,7 +558,7 @@ static int dbs_internal_release_rx_virt_queue(struct
nthw_virt_queue *rxvq)
/* Clear DR */
rxvq->desc_struct_phys_addr = NULL;
- if (set_rx_dr_data(p_nthw_dbs,
+ if (nthw_set_rx_dr_data(p_nthw_dbs,
rxvq->index,
(uint64_t)rxvq->desc_struct_phys_addr,
rxvq->host_id,
@@ -602,7 +602,7 @@ static int dbs_internal_release_tx_virt_queue(struct
nthw_virt_queue *txvq)
/* Clear UW */
txvq->used_struct_phys_addr = NULL;
- if (set_tx_uw_data(p_nthw_dbs, txvq->index,
(uint64_t)txvq->used_struct_phys_addr,
+ if (nthw_set_tx_uw_data(p_nthw_dbs, txvq->index,
(uint64_t)txvq->used_struct_phys_addr,
txvq->host_id, 0, PACKED(txvq->vq_type), 0, 0, 0,
txvq->in_order) != 0) {
return -1;
@@ -611,7 +611,7 @@ static int dbs_internal_release_tx_virt_queue(struct
nthw_virt_queue *txvq)
/* Disable AM */
txvq->am_enable = TX_AM_DISABLE;
- if (set_tx_am_data(p_nthw_dbs,
+ if (nthw_set_tx_am_data(p_nthw_dbs,
txvq->index,
(uint64_t)txvq->avail_struct_phys_addr,
txvq->am_enable,
@@ -629,7 +629,7 @@ static int dbs_internal_release_tx_virt_queue(struct
nthw_virt_queue *txvq)
txvq->avail_struct_phys_addr = NULL;
txvq->host_id = 0;
- if (set_tx_am_data(p_nthw_dbs,
+ if (nthw_set_tx_am_data(p_nthw_dbs,
txvq->index,
(uint64_t)txvq->avail_struct_phys_addr,
txvq->am_enable,
@@ -644,7 +644,7 @@ static int dbs_internal_release_tx_virt_queue(struct
nthw_virt_queue *txvq)
txvq->port = 0;
txvq->header = 0;
- if (set_tx_dr_data(p_nthw_dbs,
+ if (nthw_set_tx_dr_data(p_nthw_dbs,
txvq->index,
(uint64_t)txvq->desc_struct_phys_addr,
txvq->host_id,
@@ -713,8 +713,8 @@ static struct nthw_virt_queue
*nthw_setup_tx_virt_queue(nthw_dbs_t *p_nthw_dbs,
* 3. Configure the DBS.TX_DR_DATA memory; good idea to initialize all
* DBS_TX_QUEUES entries.
*/
- if (set_tx_dr_data(p_nthw_dbs, index, (uint64_t)desc_struct_phys_addr,
host_id, qs, port,
- header, 0) != 0) {
+ if (nthw_set_tx_dr_data(p_nthw_dbs, index,
(uint64_t)desc_struct_phys_addr,
+ host_id, qs, port, header, 0) != 0) {
return NULL;
}
@@ -730,7 +730,7 @@ static struct nthw_virt_queue
*nthw_setup_tx_virt_queue(nthw_dbs_t *p_nthw_dbs,
vec = 0;
istk = 0;
- if (set_tx_uw_data(p_nthw_dbs, index,
+ if (nthw_set_tx_uw_data(p_nthw_dbs, index,
(uint64_t)used_struct_phys_addr,
host_id, qs, 0, int_enable, vec, istk, in_order) != 0) {
return NULL;
@@ -740,7 +740,7 @@ static struct nthw_virt_queue
*nthw_setup_tx_virt_queue(nthw_dbs_t *p_nthw_dbs,
* 2. Configure the DBS.TX_AM_DATA memory and enable the queues you
plan to use;
* good idea to initialize all DBS_TX_QUEUES entries.
*/
- if (set_tx_am_data(p_nthw_dbs, index, (uint64_t)avail_struct_phys_addr,
TX_AM_DISABLE,
+ if (nthw_set_tx_am_data(p_nthw_dbs, index,
(uint64_t)avail_struct_phys_addr, TX_AM_DISABLE,
host_id, 0, irq_vector >= 0 ? 1 : 0) != 0) {
return NULL;
}
@@ -764,7 +764,7 @@ static struct nthw_virt_queue
*nthw_setup_tx_virt_queue(nthw_dbs_t *p_nthw_dbs,
*/
if (irq_vector < 0) {
uint32_t enable = tx_deferred_start ? TX_AM_DISABLE :
TX_AM_ENABLE;
- if (set_tx_am_data(p_nthw_dbs, index,
(uint64_t)avail_struct_phys_addr,
+ if (nthw_set_tx_am_data(p_nthw_dbs, index,
(uint64_t)avail_struct_phys_addr,
enable, host_id, 0, 0) != 0) {
return NULL;
}
@@ -1127,12 +1127,12 @@ nthw_setup_mngd_tx_virt_queue(nthw_dbs_t *p_nthw_dbs,
static int nthw_switch_rx_virt_queue(nthw_dbs_t *p_nthw_dbs, uint32_t index,
uint32_t enable)
{
- return set_rx_am_data_enable(p_nthw_dbs, index, enable);
+ return nthw_set_rx_am_data_enable(p_nthw_dbs, index, enable);
}
static int nthw_switch_tx_virt_queue(nthw_dbs_t *p_nthw_dbs, uint32_t index,
uint32_t enable)
{
- return set_tx_am_data_enable(p_nthw_dbs, index, enable);
+ return nthw_set_tx_am_data_enable(p_nthw_dbs, index, enable);
}
static uint16_t nthw_get_rx_packets(struct nthw_virt_queue *rxvq,
diff --git a/drivers/net/ntnic/include/ntnic_dbs.h
b/drivers/net/ntnic/include/ntnic_dbs.h
index c35a7cb99b..3de7206ccb 100644
--- a/drivers/net/ntnic/include/ntnic_dbs.h
+++ b/drivers/net/ntnic/include/ntnic_dbs.h
@@ -233,8 +233,8 @@ struct nthw_dbs_s {
typedef struct nthw_dbs_s nthw_dbs_t;
nthw_dbs_t *nthw_dbs_new(void);
-int dbs_init(nthw_dbs_t *p, nthw_fpga_t *p_fpga, int n_instance);
-void dbs_reset(nthw_dbs_t *p);
+int nthw_dbs_init(nthw_dbs_t *p, nthw_fpga_t *p_fpga, int n_instance);
+void nthw_dbs_reset(nthw_dbs_t *p);
int nthw_set_rx_control(nthw_dbs_t *p,
uint32_t last_queue,
@@ -253,30 +253,30 @@ int nthw_set_tx_control(nthw_dbs_t *p,
int nthw_set_rx_init(nthw_dbs_t *p, uint32_t start_idx, uint32_t start_ptr,
uint32_t init,
uint32_t queue);
int nthw_get_rx_init(nthw_dbs_t *p, uint32_t *init, uint32_t *queue, uint32_t
*busy);
-int set_tx_init(nthw_dbs_t *p, uint32_t start_idx, uint32_t start_ptr,
uint32_t init,
+int nthw_set_tx_init(nthw_dbs_t *p, uint32_t start_idx, uint32_t start_ptr,
uint32_t init,
uint32_t queue);
int nthw_get_tx_init(nthw_dbs_t *p, uint32_t *init, uint32_t *queue, uint32_t
*busy);
int nthw_set_rx_idle(nthw_dbs_t *p, uint32_t idle, uint32_t queue);
int nthw_get_rx_idle(nthw_dbs_t *p, uint32_t *idle, uint32_t *queue, uint32_t
*busy);
int nthw_set_tx_idle(nthw_dbs_t *p, uint32_t idle, uint32_t queue);
int nthw_get_tx_idle(nthw_dbs_t *p, uint32_t *idle, uint32_t *queue, uint32_t
*busy);
-int set_rx_am_data(nthw_dbs_t *p,
+int nthw_set_rx_am_data(nthw_dbs_t *p,
uint32_t index,
uint64_t guest_physical_address,
uint32_t enable,
uint32_t host_id,
uint32_t packed,
uint32_t int_enable);
-int set_rx_am_data_enable(nthw_dbs_t *p, uint32_t index, uint32_t enable);
-int set_tx_am_data(nthw_dbs_t *p,
+int nthw_set_rx_am_data_enable(nthw_dbs_t *p, uint32_t index, uint32_t enable);
+int nthw_set_tx_am_data(nthw_dbs_t *p,
uint32_t index,
uint64_t guest_physical_address,
uint32_t enable,
uint32_t host_id,
uint32_t packed,
uint32_t int_enable);
-int set_tx_am_data_enable(nthw_dbs_t *p, uint32_t index, uint32_t enable);
-int set_rx_uw_data(nthw_dbs_t *p,
+int nthw_set_tx_am_data_enable(nthw_dbs_t *p, uint32_t index, uint32_t enable);
+int nthw_set_rx_uw_data(nthw_dbs_t *p,
uint32_t index,
uint64_t guest_physical_address,
uint32_t host_id,
@@ -285,7 +285,7 @@ int set_rx_uw_data(nthw_dbs_t *p,
uint32_t int_enable,
uint32_t vec,
uint32_t istk);
-int set_tx_uw_data(nthw_dbs_t *p,
+int nthw_set_tx_uw_data(nthw_dbs_t *p,
uint32_t index,
uint64_t guest_physical_address,
uint32_t host_id,
@@ -295,14 +295,14 @@ int set_tx_uw_data(nthw_dbs_t *p,
uint32_t vec,
uint32_t istk,
uint32_t in_order);
-int set_rx_dr_data(nthw_dbs_t *p,
+int nthw_set_rx_dr_data(nthw_dbs_t *p,
uint32_t index,
uint64_t guest_physical_address,
uint32_t host_id,
uint32_t queue_size,
uint32_t header,
uint32_t packed);
-int set_tx_dr_data(nthw_dbs_t *p,
+int nthw_set_tx_dr_data(nthw_dbs_t *p,
uint32_t index,
uint64_t guest_physical_address,
uint32_t host_id,
diff --git a/drivers/net/ntnic/nthw/dbs/nthw_dbs.c
b/drivers/net/ntnic/nthw/dbs/nthw_dbs.c
index da64dbab48..25989d170b 100644
--- a/drivers/net/ntnic/nthw/dbs/nthw_dbs.c
+++ b/drivers/net/ntnic/nthw/dbs/nthw_dbs.c
@@ -76,7 +76,7 @@ nthw_dbs_t *nthw_dbs_new(void)
return p;
}
-int dbs_init(nthw_dbs_t *p, nthw_fpga_t *p_fpga, int n_instance)
+int nthw_dbs_init(nthw_dbs_t *p, nthw_fpga_t *p_fpga, int n_instance)
{
nthw_module_t *mod = nthw_fpga_query_module(p_fpga, MOD_DBS,
n_instance);
@@ -369,7 +369,7 @@ static int dbs_reset_tx_control(nthw_dbs_t *p)
return 0;
}
-void dbs_reset(nthw_dbs_t *p)
+void nthw_dbs_reset(nthw_dbs_t *p)
{
int i;
dbs_reset_rx_control(p);
@@ -462,7 +462,7 @@ int nthw_get_rx_init(nthw_dbs_t *p, uint32_t *init,
uint32_t *queue, uint32_t *b
return 0;
}
-int set_tx_init(nthw_dbs_t *p, uint32_t start_idx, uint32_t start_ptr,
uint32_t init,
+int nthw_set_tx_init(nthw_dbs_t *p, uint32_t start_idx, uint32_t start_ptr,
uint32_t init,
uint32_t queue)
{
if (p->mp_reg_tx_init_val) {
@@ -601,7 +601,7 @@ static void flush_rx_am_data(nthw_dbs_t *p, uint32_t index)
nthw_register_flush(p->mp_reg_rx_avail_monitor_data, 1);
}
-int set_rx_am_data(nthw_dbs_t *p,
+int nthw_set_rx_am_data(nthw_dbs_t *p,
uint32_t index,
uint64_t guest_physical_address,
uint32_t enable,
@@ -618,7 +618,7 @@ int set_rx_am_data(nthw_dbs_t *p,
return 0;
}
-int set_rx_am_data_enable(nthw_dbs_t *p, uint32_t index, uint32_t enable)
+int nthw_set_rx_am_data_enable(nthw_dbs_t *p, uint32_t index, uint32_t enable)
{
if (!p->mp_reg_rx_avail_monitor_data)
return -ENOTSUP;
@@ -673,7 +673,7 @@ static void flush_tx_am_data(nthw_dbs_t *p, uint32_t index)
nthw_register_flush(p->mp_reg_tx_avail_monitor_data, 1);
}
-int set_tx_am_data(nthw_dbs_t *p,
+int nthw_set_tx_am_data(nthw_dbs_t *p,
uint32_t index,
uint64_t guest_physical_address,
uint32_t enable,
@@ -690,7 +690,7 @@ int set_tx_am_data(nthw_dbs_t *p,
return 0;
}
-int set_tx_am_data_enable(nthw_dbs_t *p, uint32_t index, uint32_t enable)
+int nthw_set_tx_am_data_enable(nthw_dbs_t *p, uint32_t index, uint32_t enable)
{
if (!p->mp_reg_tx_avail_monitor_data)
return -ENOTSUP;
@@ -796,7 +796,7 @@ static void flush_rx_uw_data(nthw_dbs_t *p, uint32_t index)
nthw_register_flush(p->mp_reg_rx_used_writer_data, 1);
}
-int set_rx_uw_data(nthw_dbs_t *p,
+int nthw_set_rx_uw_data(nthw_dbs_t *p,
uint32_t index,
uint64_t guest_physical_address,
uint32_t host_id,
@@ -923,7 +923,7 @@ static void flush_tx_uw_data(nthw_dbs_t *p, uint32_t index)
nthw_register_flush(p->mp_reg_tx_used_writer_data, 1);
}
-int set_tx_uw_data(nthw_dbs_t *p,
+int nthw_set_tx_uw_data(nthw_dbs_t *p,
uint32_t index,
uint64_t guest_physical_address,
uint32_t host_id,
@@ -1019,7 +1019,7 @@ static void flush_rx_dr_data(nthw_dbs_t *p, uint32_t
index)
nthw_register_flush(p->mp_reg_rx_descriptor_reader_data, 1);
}
-int set_rx_dr_data(nthw_dbs_t *p,
+int nthw_set_rx_dr_data(nthw_dbs_t *p,
uint32_t index,
uint64_t guest_physical_address,
uint32_t host_id,
@@ -1121,7 +1121,7 @@ static void flush_tx_dr_data(nthw_dbs_t *p, uint32_t
index)
nthw_register_flush(p->mp_reg_tx_descriptor_reader_data, 1);
}
-int set_tx_dr_data(nthw_dbs_t *p,
+int nthw_set_tx_dr_data(nthw_dbs_t *p,
uint32_t index,
uint64_t guest_physical_address,
uint32_t host_id,
--
2.45.0
