git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/ark: refactor Rx buffer recovery
[dpdk.git]
/
drivers
/
net
/
bnxt
/
rte_pmd_bnxt.c
diff --git
a/drivers/net/bnxt/rte_pmd_bnxt.c
b/drivers/net/bnxt/rte_pmd_bnxt.c
index
2df4865
..
f715438
100644
(file)
--- a/
drivers/net/bnxt/rte_pmd_bnxt.c
+++ b/
drivers/net/bnxt/rte_pmd_bnxt.c
@@
-1,5
+1,5
@@
/* SPDX-License-Identifier: BSD-3-Clause
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2017-20
18
Broadcom
+ * Copyright(c) 2017-20
21
Broadcom
* All rights reserved.
*/
* All rights reserved.
*/
@@
-8,7
+8,7
@@
#include <unistd.h>
#include <rte_dev.h>
#include <unistd.h>
#include <rte_dev.h>
-#include <
rte_
ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_malloc.h>
#include <rte_cycles.h>
#include <rte_byteorder.h>
#include <rte_malloc.h>
#include <rte_cycles.h>
#include <rte_byteorder.h>
@@
-28,8
+28,8
@@
int bnxt_rcv_msg_from_vf(struct bnxt *bp, uint16_t vf_id, void *msg)
ret_param.vf_id = vf_id;
ret_param.msg = msg;
ret_param.vf_id = vf_id;
ret_param.msg = msg;
-
_
rte_eth_dev_callback_process(bp->eth_dev, RTE_ETH_EVENT_VF_MBOX,
-
&ret_param);
+ rte_eth_dev_callback_process(bp->eth_dev, RTE_ETH_EVENT_VF_MBOX,
+ &ret_param);
/* Default to approve */
if (ret_param.retval == RTE_PMD_BNXT_MB_EVENT_PROCEED)
/* Default to approve */
if (ret_param.retval == RTE_PMD_BNXT_MB_EVENT_PROCEED)
@@
-64,9
+64,9
@@
int rte_pmd_bnxt_set_tx_loopback(uint16_t port, uint8_t on)
}
if (on)
}
if (on)
- bp->pf
.
evb_mode = BNXT_EVB_MODE_VEB;
+ bp->pf
->
evb_mode = BNXT_EVB_MODE_VEB;
else
else
- bp->pf
.
evb_mode = BNXT_EVB_MODE_VEPA;
+ bp->pf
->
evb_mode = BNXT_EVB_MODE_VEPA;
rc = bnxt_hwrm_pf_evb_mode(bp);
rc = bnxt_hwrm_pf_evb_mode(bp);
@@
-118,7
+118,7
@@
int rte_pmd_bnxt_set_all_queues_drop_en(uint16_t port, uint8_t on)
}
/* Stall all active VFs */
}
/* Stall all active VFs */
- for (i = 0; i < bp->pf
.
active_vfs; i++) {
+ for (i = 0; i < bp->pf
->
active_vfs; i++) {
rc = bnxt_hwrm_func_vf_vnic_query_and_config(bp, i,
rte_pmd_bnxt_set_all_queues_drop_en_cb, &on,
bnxt_hwrm_vnic_cfg);
rc = bnxt_hwrm_func_vf_vnic_query_and_config(bp, i,
rte_pmd_bnxt_set_all_queues_drop_en_cb, &on,
bnxt_hwrm_vnic_cfg);
@@
-197,10
+197,10
@@
int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, uint16_t vf,
}
bp = eth_dev->data->dev_private;
}
bp = eth_dev->data->dev_private;
- if (!bp->pf
.
active_vfs)
+ if (!bp->pf
->
active_vfs)
return -EINVAL;
return -EINVAL;
- if (vf >= bp->pf
.
max_vfs)
+ if (vf >= bp->pf
->
max_vfs)
return -EINVAL;
/* Add up the per queue BW and configure MAX BW of the VF */
return -EINVAL;
/* Add up the per queue BW and configure MAX BW of the VF */
@@
-216,14
+216,14
@@
int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, uint16_t vf,
}
/* Requested BW already configured */
}
/* Requested BW already configured */
- if (tot_rate == bp->pf
.
vf_info[vf].max_tx_rate)
+ if (tot_rate == bp->pf
->
vf_info[vf].max_tx_rate)
return 0;
rc = bnxt_hwrm_func_bw_cfg(bp, vf, tot_rate,
HWRM_FUNC_CFG_INPUT_ENABLES_MAX_BW);
if (!rc)
return 0;
rc = bnxt_hwrm_func_bw_cfg(bp, vf, tot_rate,
HWRM_FUNC_CFG_INPUT_ENABLES_MAX_BW);
if (!rc)
- bp->pf
.
vf_info[vf].max_tx_rate = tot_rate;
+ bp->pf
->
vf_info[vf].max_tx_rate = tot_rate;
return rc;
}
return rc;
}
@@
-265,10
+265,10
@@
int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)
return -EINVAL;
/* Prev setting same as new setting. */
return -EINVAL;
/* Prev setting same as new setting. */
- if (on == bp->pf
.
vf_info[vf].mac_spoof_en)
+ if (on == bp->pf
->
vf_info[vf].mac_spoof_en)
return 0;
return 0;
- func_flags = bp->pf
.
vf_info[vf].func_cfg_flags;
+ func_flags = bp->pf
->
vf_info[vf].func_cfg_flags;
func_flags &= ~(HWRM_FUNC_CFG_INPUT_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE |
HWRM_FUNC_CFG_INPUT_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE);
func_flags &= ~(HWRM_FUNC_CFG_INPUT_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE |
HWRM_FUNC_CFG_INPUT_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE);
@@
-281,8
+281,8
@@
int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)
rc = bnxt_hwrm_func_cfg_vf_set_flags(bp, vf, func_flags);
if (!rc) {
rc = bnxt_hwrm_func_cfg_vf_set_flags(bp, vf, func_flags);
if (!rc) {
- bp->pf
.
vf_info[vf].mac_spoof_en = on;
- bp->pf
.
vf_info[vf].func_cfg_flags = func_flags;
+ bp->pf
->
vf_info[vf].mac_spoof_en = on;
+ bp->pf
->
vf_info[vf].func_cfg_flags = func_flags;
}
return rc;
}
return rc;
@@
-325,12
+325,12
@@
int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)
rc = bnxt_hwrm_func_cfg_vf_set_vlan_anti_spoof(bp, vf, on);
if (!rc) {
rc = bnxt_hwrm_func_cfg_vf_set_vlan_anti_spoof(bp, vf, on);
if (!rc) {
- bp->pf
.
vf_info[vf].vlan_spoof_en = on;
+ bp->pf
->
vf_info[vf].vlan_spoof_en = on;
if (on) {
if (bnxt_hwrm_cfa_vlan_antispoof_cfg(bp,
if (on) {
if (bnxt_hwrm_cfa_vlan_antispoof_cfg(bp,
- bp->pf
.
first_vf_id + vf,
- bp->pf
.
vf_info[vf].vlan_count,
- bp->pf
.
vf_info[vf].vlan_as_table))
+ bp->pf
->
first_vf_id + vf,
+ bp->pf
->
vf_info[vf].vlan_count,
+ bp->pf
->
vf_info[vf].vlan_as_table))
rc = -1;
}
} else {
rc = -1;
}
} else {
@@
-415,7
+415,7
@@
int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf,
}
bp = dev->data->dev_private;
}
bp = dev->data->dev_private;
- if (!bp->pf
.
vf_info)
+ if (!bp->pf
->
vf_info)
return -EINVAL;
if (vf >= bp->pdev->max_vfs)
return -EINVAL;
if (vf >= bp->pdev->max_vfs)
@@
-436,13
+436,13
@@
int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf,
flag |= BNXT_VNIC_INFO_ALLMULTI | BNXT_VNIC_INFO_MCAST;
if (on)
flag |= BNXT_VNIC_INFO_ALLMULTI | BNXT_VNIC_INFO_MCAST;
if (on)
- bp->pf
.
vf_info[vf].l2_rx_mask |= flag;
+ bp->pf
->
vf_info[vf].l2_rx_mask |= flag;
else
else
- bp->pf
.
vf_info[vf].l2_rx_mask &= ~flag;
+ bp->pf
->
vf_info[vf].l2_rx_mask &= ~flag;
rc = bnxt_hwrm_func_vf_vnic_query_and_config(bp, vf,
vf_vnic_set_rxmask_cb,
rc = bnxt_hwrm_func_vf_vnic_query_and_config(bp, vf,
vf_vnic_set_rxmask_cb,
- &bp->pf
.
vf_info[vf].l2_rx_mask,
+ &bp->pf
->
vf_info[vf].l2_rx_mask,
bnxt_set_rx_mask_no_vlan);
if (rc)
PMD_DRV_LOG(ERR, "bnxt_hwrm_func_vf_vnic_set_rxmask failed\n");
bnxt_set_rx_mask_no_vlan);
if (rc)
PMD_DRV_LOG(ERR, "bnxt_hwrm_func_vf_vnic_set_rxmask failed\n");
@@
-475,10
+475,10
@@
static int bnxt_set_vf_table(struct bnxt *bp, uint16_t vf)
memset(&vnic, 0, sizeof(vnic));
vnic.fw_vnic_id = dflt_vnic;
if (bnxt_hwrm_vnic_qcfg(bp, &vnic,
memset(&vnic, 0, sizeof(vnic));
vnic.fw_vnic_id = dflt_vnic;
if (bnxt_hwrm_vnic_qcfg(bp, &vnic,
- bp->pf
.
first_vf_id + vf) == 0) {
+ bp->pf
->
first_vf_id + vf) == 0) {
if (bnxt_hwrm_cfa_l2_set_rx_mask(bp, &vnic,
if (bnxt_hwrm_cfa_l2_set_rx_mask(bp, &vnic,
- bp->pf
.
vf_info[vf].vlan_count,
- bp->pf
.
vf_info[vf].vlan_table))
+ bp->pf
->
vf_info[vf].vlan_count,
+ bp->pf
->
vf_info[vf].vlan_table))
rc = -1;
} else {
rc = -1;
rc = -1;
} else {
rc = -1;
@@
-506,19
+506,19
@@
int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan,
return -ENOTSUP;
bp = dev->data->dev_private;
return -ENOTSUP;
bp = dev->data->dev_private;
- if (!bp->pf
.
vf_info)
+ if (!bp->pf
->
vf_info)
return -EINVAL;
for (i = 0; vf_mask; i++, vf_mask >>= 1) {
return -EINVAL;
for (i = 0; vf_mask; i++, vf_mask >>= 1) {
- cnt = bp->pf
.
vf_info[i].vlan_count;
+ cnt = bp->pf
->
vf_info[i].vlan_count;
if ((vf_mask & 1) == 0)
continue;
if ((vf_mask & 1) == 0)
continue;
- if (bp->pf
.
vf_info[i].vlan_table == NULL) {
+ if (bp->pf
->
vf_info[i].vlan_table == NULL) {
rc = -1;
continue;
}
rc = -1;
continue;
}
- if (bp->pf
.
vf_info[i].vlan_as_table == NULL) {
+ if (bp->pf
->
vf_info[i].vlan_as_table == NULL) {
rc = -1;
continue;
}
rc = -1;
continue;
}
@@
-526,7
+526,8
@@
int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan,
/* First, search for a duplicate... */
for (j = 0; j < cnt; j++) {
if (rte_be_to_cpu_16(
/* First, search for a duplicate... */
for (j = 0; j < cnt; j++) {
if (rte_be_to_cpu_16(
- bp->pf.vf_info[i].vlan_table[j].vid) == vlan)
+ bp->pf->vf_info[i].vlan_table[j].vid) ==
+ vlan)
break;
}
if (j == cnt) {
break;
}
if (j == cnt) {
@@
-543,17
+544,17
@@
int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan,
}
/* cnt is one less than vlan_count */
}
/* cnt is one less than vlan_count */
- cnt = bp->pf
.
vf_info[i].vlan_count++;
+ cnt = bp->pf
->
vf_info[i].vlan_count++;
/*
* And finally, add to the
* end of the table
*/
/*
* And finally, add to the
* end of the table
*/
- vase = &bp->pf
.
vf_info[i].vlan_as_table[cnt];
+ vase = &bp->pf
->
vf_info[i].vlan_as_table[cnt];
// TODO: Hardcoded TPID
vase->tpid = rte_cpu_to_be_16(0x8100);
vase->vid = rte_cpu_to_be_16(vlan);
vase->mask = rte_cpu_to_be_16(0xfff);
// TODO: Hardcoded TPID
vase->tpid = rte_cpu_to_be_16(0x8100);
vase->vid = rte_cpu_to_be_16(vlan);
vase->mask = rte_cpu_to_be_16(0xfff);
- ve = &bp->pf
.
vf_info[i].vlan_table[cnt];
+ ve = &bp->pf
->
vf_info[i].vlan_table[cnt];
/* TODO: Hardcoded TPID */
ve->tpid = rte_cpu_to_be_16(0x8100);
ve->vid = rte_cpu_to_be_16(vlan);
/* TODO: Hardcoded TPID */
ve->tpid = rte_cpu_to_be_16(0x8100);
ve->vid = rte_cpu_to_be_16(vlan);
@@
-561,18
+562,19
@@
int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan,
} else {
for (j = 0; j < cnt; j++) {
if (rte_be_to_cpu_16(
} else {
for (j = 0; j < cnt; j++) {
if (rte_be_to_cpu_16(
- bp->pf.vf_info[i].vlan_table[j].vid) != vlan)
+ bp->pf->vf_info[i].vlan_table[j].vid) !=
+ vlan)
continue;
continue;
- memmove(&bp->pf
.
vf_info[i].vlan_table[j],
- &bp->pf
.
vf_info[i].vlan_table[j + 1],
+ memmove(&bp->pf
->
vf_info[i].vlan_table[j],
+ &bp->pf
->
vf_info[i].vlan_table[j + 1],
getpagesize() - ((j + 1) *
sizeof(struct bnxt_vlan_table_entry)));
getpagesize() - ((j + 1) *
sizeof(struct bnxt_vlan_table_entry)));
- memmove(&bp->pf
.
vf_info[i].vlan_as_table[j],
- &bp->pf
.
vf_info[i].vlan_as_table[j + 1],
+ memmove(&bp->pf
->
vf_info[i].vlan_as_table[j],
+ &bp->pf
->
vf_info[i].vlan_as_table[j + 1],
getpagesize() - ((j + 1) * sizeof(struct
bnxt_vlan_antispoof_table_entry)));
j--;
getpagesize() - ((j + 1) * sizeof(struct
bnxt_vlan_antispoof_table_entry)));
j--;
- cnt = --bp->pf
.
vf_info[i].vlan_count;
+ cnt = --bp->pf
->
vf_info[i].vlan_count;
}
}
bnxt_set_vf_table(bp, i);
}
}
bnxt_set_vf_table(bp, i);
@@
-614,7
+616,7
@@
int rte_pmd_bnxt_get_vf_stats(uint16_t port,
return -ENOTSUP;
}
return -ENOTSUP;
}
- return bnxt_hwrm_func_qstats(bp, bp->pf
.
first_vf_id + vf_id, stats,
+ return bnxt_hwrm_func_qstats(bp, bp->pf
->
first_vf_id + vf_id, stats,
NULL);
}
NULL);
}
@@
-650,7
+652,7
@@
int rte_pmd_bnxt_reset_vf_stats(uint16_t port,
return -ENOTSUP;
}
return -ENOTSUP;
}
- return bnxt_hwrm_func_clr_stats(bp, bp->pf
.
first_vf_id + vf_id);
+ return bnxt_hwrm_func_clr_stats(bp, bp->pf
->
first_vf_id + vf_id);
}
int rte_pmd_bnxt_get_vf_rx_status(uint16_t port, uint16_t vf_id)
}
int rte_pmd_bnxt_get_vf_rx_status(uint16_t port, uint16_t vf_id)
@@
-719,7
+721,7
@@
int rte_pmd_bnxt_get_vf_tx_drop_count(uint16_t port, uint16_t vf_id,
return -ENOTSUP;
}
return -ENOTSUP;
}
- return bnxt_hwrm_func_qstats_tx_drop(bp, bp->pf
.
first_vf_id + vf_id,
+ return bnxt_hwrm_func_qstats_tx_drop(bp, bp->pf
->
first_vf_id + vf_id,
count);
}
count);
}
@@
-759,7
+761,7
@@
int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct rte_ether_addr *addr,
}
/* If the VF currently uses a random MAC, update default to this one */
}
/* If the VF currently uses a random MAC, update default to this one */
- if (bp->pf
.
vf_info[vf_id].random_mac) {
+ if (bp->pf
->
vf_info[vf_id].random_mac) {
if (rte_pmd_bnxt_get_vf_rx_status(port, vf_id) <= 0)
bnxt_hwrm_func_vf_mac(bp, vf_id, (uint8_t *)addr);
}
if (rte_pmd_bnxt_get_vf_rx_status(port, vf_id) <= 0)
bnxt_hwrm_func_vf_mac(bp, vf_id, (uint8_t *)addr);
}
@@
-771,11
+773,11
@@
int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct rte_ether_addr *addr,
memset(&vnic, 0, sizeof(struct bnxt_vnic_info));
vnic.fw_vnic_id = rte_le_to_cpu_16(rc);
memset(&vnic, 0, sizeof(struct bnxt_vnic_info));
vnic.fw_vnic_id = rte_le_to_cpu_16(rc);
- rc = bnxt_hwrm_vnic_qcfg(bp, &vnic, bp->pf
.
first_vf_id + vf_id);
+ rc = bnxt_hwrm_vnic_qcfg(bp, &vnic, bp->pf
->
first_vf_id + vf_id);
if (rc < 0)
goto exit;
if (rc < 0)
goto exit;
- STAILQ_FOREACH(filter, &bp->pf
.
vf_info[vf_id].filter, next) {
+ STAILQ_FOREACH(filter, &bp->pf
->
vf_info[vf_id].filter, next) {
if (filter->flags ==
HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX &&
filter->enables ==
if (filter->flags ==
HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX &&
filter->enables ==
@@
-841,9
+843,9
@@
rte_pmd_bnxt_set_vf_vlan_insert(uint16_t port, uint16_t vf,
return -ENOTSUP;
}
return -ENOTSUP;
}
- bp->pf
.
vf_info[vf].dflt_vlan = vlan_id;
+ bp->pf
->
vf_info[vf].dflt_vlan = vlan_id;
if (bnxt_hwrm_func_qcfg_current_vf_vlan(bp, vf) ==
if (bnxt_hwrm_func_qcfg_current_vf_vlan(bp, vf) ==
- bp->pf
.
vf_info[vf].dflt_vlan)
+ bp->pf
->
vf_info[vf].dflt_vlan)
return 0;
rc = bnxt_hwrm_set_vf_vlan(bp, vf);
return 0;
rc = bnxt_hwrm_set_vf_vlan(bp, vf);
@@
-886,10
+888,10
@@
int rte_pmd_bnxt_set_vf_persist_stats(uint16_t port, uint16_t vf, uint8_t on)
return -EINVAL;
/* Prev setting same as new setting. */
return -EINVAL;
/* Prev setting same as new setting. */
- if (on == bp->pf
.
vf_info[vf].persist_stats)
+ if (on == bp->pf
->
vf_info[vf].persist_stats)
return 0;
return 0;
- func_flags = bp->pf
.
vf_info[vf].func_cfg_flags;
+ func_flags = bp->pf
->
vf_info[vf].func_cfg_flags;
if (on)
func_flags |=
if (on)
func_flags |=
@@
-900,8
+902,8
@@
int rte_pmd_bnxt_set_vf_persist_stats(uint16_t port, uint16_t vf, uint8_t on)
rc = bnxt_hwrm_func_cfg_vf_set_flags(bp, vf, func_flags);
if (!rc) {
rc = bnxt_hwrm_func_cfg_vf_set_flags(bp, vf, func_flags);
if (!rc) {
- bp->pf
.
vf_info[vf].persist_stats = on;
- bp->pf
.
vf_info[vf].func_cfg_flags = func_flags;
+ bp->pf
->
vf_info[vf].persist_stats = on;
+ bp->pf
->
vf_info[vf].func_cfg_flags = func_flags;
}
return rc;
}
return rc;