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/ixgbe: fix UDP zero checksum on Arm
[dpdk.git]
/
drivers
/
net
/
bnxt
/
bnxt_reps.c
diff --git
a/drivers/net/bnxt/bnxt_reps.c
b/drivers/net/bnxt/bnxt_reps.c
index
cc1189d
..
d948745
100644
(file)
--- a/
drivers/net/bnxt/bnxt_reps.c
+++ b/
drivers/net/bnxt/bnxt_reps.c
@@
-1,5
+1,5
@@
/* SPDX-License-Identifier: BSD-3-Clause
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-202
0
Broadcom
+ * Copyright(c) 2014-202
1
Broadcom
* All rights reserved.
*/
* All rights reserved.
*/
@@
-55,17
+55,17
@@
bnxt_vfr_recv(uint16_t port_id, uint16_t queue_id, struct rte_mbuf *mbuf)
mask = rep_rxr->rx_ring_struct->ring_mask;
/* Put this mbuf on the RxQ of the Representor */
mask = rep_rxr->rx_ring_struct->ring_mask;
/* Put this mbuf on the RxQ of the Representor */
- prod_rx_buf = &rep_rxr->rx_buf_ring[rep_rxr->rx_prod & mask];
- if (
!*prod_rx_buf
) {
+ prod_rx_buf = &rep_rxr->rx_buf_ring[rep_rxr->rx_
raw_
prod & mask];
+ if (
*prod_rx_buf == NULL
) {
*prod_rx_buf = mbuf;
vfr_bp->rx_bytes[que] += mbuf->pkt_len;
vfr_bp->rx_pkts[que]++;
*prod_rx_buf = mbuf;
vfr_bp->rx_bytes[que] += mbuf->pkt_len;
vfr_bp->rx_pkts[que]++;
- rep_rxr->rx_prod++;
+ rep_rxr->rx_
raw_
prod++;
} else {
/* Representor Rx ring full, drop pkt */
vfr_bp->rx_drop_bytes[que] += mbuf->pkt_len;
vfr_bp->rx_drop_pkts[que]++;
} else {
/* Representor Rx ring full, drop pkt */
vfr_bp->rx_drop_bytes[que] += mbuf->pkt_len;
vfr_bp->rx_drop_pkts[que]++;
- rte_
pktmbuf
_free(mbuf);
+ rte_
mbuf_raw
_free(mbuf);
}
return 0;
}
return 0;
@@
-184,7
+184,8
@@
int bnxt_representor_init(struct rte_eth_dev *eth_dev, void *params)
vf_rep_bp->rep_fc_r2f = rep_params->rep_fc_r2f;
vf_rep_bp->rep_fc_f2r = rep_params->rep_fc_f2r;
vf_rep_bp->rep_fc_r2f = rep_params->rep_fc_r2f;
vf_rep_bp->rep_fc_f2r = rep_params->rep_fc_f2r;
- eth_dev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR;
+ eth_dev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR |
+ RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
eth_dev->data->representor_id = rep_params->vf_id;
rte_eth_random_addr(vf_rep_bp->dflt_mac_addr);
eth_dev->data->representor_id = rep_params->vf_id;
rte_eth_random_addr(vf_rep_bp->dflt_mac_addr);
@@
-215,8
+216,9
@@
int bnxt_representor_init(struct rte_eth_dev *eth_dev, void *params)
"Switch domain id %d: Representor Device %d init done\n",
vf_rep_bp->switch_domain_id, vf_rep_bp->vf_id);
"Switch domain id %d: Representor Device %d init done\n",
vf_rep_bp->switch_domain_id, vf_rep_bp->vf_id);
- if (
vf_rep_bp->rep_based_pf
) {
+ if (
BNXT_REP_BASED_PF(vf_rep_bp)
) {
vf_rep_bp->fw_fid = vf_rep_bp->rep_based_pf + 1;
vf_rep_bp->fw_fid = vf_rep_bp->rep_based_pf + 1;
+ vf_rep_bp->parent_pf_idx = vf_rep_bp->rep_based_pf;
if (!(BNXT_REP_PF(vf_rep_bp))) {
/* VF representor for the remote PF,get first_vf_id */
rc = bnxt_hwrm_first_vf_id_query(parent_bp,
if (!(BNXT_REP_PF(vf_rep_bp))) {
/* VF representor for the remote PF,get first_vf_id */
rc = bnxt_hwrm_first_vf_id_query(parent_bp,
@@
-236,6
+238,10
@@
int bnxt_representor_init(struct rte_eth_dev *eth_dev, void *params)
}
} else {
vf_rep_bp->fw_fid = rep_params->vf_id + parent_bp->first_vf_id;
}
} else {
vf_rep_bp->fw_fid = rep_params->vf_id + parent_bp->first_vf_id;
+ if (BNXT_VF_IS_TRUSTED(parent_bp))
+ vf_rep_bp->parent_pf_idx = parent_bp->parent->fid - 1;
+ else
+ vf_rep_bp->parent_pf_idx = parent_bp->fw_fid - 1;
}
PMD_DRV_LOG(INFO, "vf_rep->fw_fid = %d\n", vf_rep_bp->fw_fid);
}
PMD_DRV_LOG(INFO, "vf_rep->fw_fid = %d\n", vf_rep_bp->fw_fid);
@@
-250,9
+256,11
@@
int bnxt_representor_uninit(struct rte_eth_dev *eth_dev)
(struct bnxt_representor *)eth_dev->data->dev_private;
uint16_t vf_id;
(struct bnxt_representor *)eth_dev->data->dev_private;
uint16_t vf_id;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
PMD_DRV_LOG(DEBUG, "BNXT Port:%d VFR uninit\n", eth_dev->data->port_id);
eth_dev->data->mac_addrs = NULL;
PMD_DRV_LOG(DEBUG, "BNXT Port:%d VFR uninit\n", eth_dev->data->port_id);
eth_dev->data->mac_addrs = NULL;
- eth_dev->dev_ops = NULL;
parent_bp = rep->parent_dev->data->dev_private;
if (!parent_bp) {
parent_bp = rep->parent_dev->data->dev_private;
if (!parent_bp) {
@@
-326,11
+334,7
@@
static int bnxt_tf_vfr_alloc(struct rte_eth_dev *vfr_ethdev)
/* update the port id so you can backtrack to ethdev */
vfr->dpdk_port_id = vfr_ethdev->data->port_id;
/* update the port id so you can backtrack to ethdev */
vfr->dpdk_port_id = vfr_ethdev->data->port_id;
- if (BNXT_STINGRAY(parent_bp)) {
- rc = bnxt_hwrm_cfa_pair_alloc(parent_bp, vfr);
- } else {
- rc = bnxt_hwrm_cfa_vfr_alloc(parent_bp, vfr->vf_id);
- }
+ rc = bnxt_hwrm_cfa_pair_alloc(parent_bp, vfr);
if (rc) {
BNXT_TF_DBG(ERR, "Failed in hwrm vfr alloc vfr:%u rc=%d\n",
vfr->vf_id, rc);
if (rc) {
BNXT_TF_DBG(ERR, "Failed in hwrm vfr alloc vfr:%u rc=%d\n",
vfr->vf_id, rc);
@@
-465,15
+469,12
@@
static int bnxt_vfr_free(struct bnxt_representor *vfr)
vfr->vf_id);
vfr->vfr_tx_cfa_action = 0;
vfr->vf_id);
vfr->vfr_tx_cfa_action = 0;
- if (BNXT_STINGRAY(parent_bp))
- rc = bnxt_hwrm_cfa_pair_free(parent_bp, vfr);
- else
- rc = bnxt_hwrm_cfa_vfr_free(parent_bp, vfr->vf_id);
+ rc = bnxt_hwrm_cfa_pair_free(parent_bp, vfr);
return rc;
}
return rc;
}
-
void
bnxt_rep_dev_stop_op(struct rte_eth_dev *eth_dev)
+
int
bnxt_rep_dev_stop_op(struct rte_eth_dev *eth_dev)
{
struct bnxt_representor *vfr_bp = eth_dev->data->dev_private;
{
struct bnxt_representor *vfr_bp = eth_dev->data->dev_private;
@@
-489,6
+490,8
@@
void bnxt_rep_dev_stop_op(struct rte_eth_dev *eth_dev)
eth_dev->data->dev_link.link_status = 0;
bnxt_rep_free_rx_mbufs(vfr_bp);
eth_dev->data->dev_link.link_status = 0;
bnxt_rep_free_rx_mbufs(vfr_bp);
+
+ return 0;
}
int bnxt_rep_dev_close_op(struct rte_eth_dev *eth_dev)
}
int bnxt_rep_dev_close_op(struct rte_eth_dev *eth_dev)
@@
-805,19
+808,24
@@
int bnxt_rep_stats_reset_op(struct rte_eth_dev *eth_dev)
return 0;
}
return 0;
}
-
void
bnxt_rep_stop_all(struct bnxt *bp)
+
int
bnxt_rep_stop_all(struct bnxt *bp)
{
uint16_t vf_id;
struct rte_eth_dev *rep_eth_dev;
{
uint16_t vf_id;
struct rte_eth_dev *rep_eth_dev;
+ int ret;
/* No vfrep ports just exit */
if (!bp->rep_info)
/* No vfrep ports just exit */
if (!bp->rep_info)
- return;
+ return
0
;
for (vf_id = 0; vf_id < BNXT_MAX_VF_REPS; vf_id++) {
rep_eth_dev = bp->rep_info[vf_id].vfr_eth_dev;
if (!rep_eth_dev)
continue;
for (vf_id = 0; vf_id < BNXT_MAX_VF_REPS; vf_id++) {
rep_eth_dev = bp->rep_info[vf_id].vfr_eth_dev;
if (!rep_eth_dev)
continue;
- bnxt_rep_dev_stop_op(rep_eth_dev);
+ ret = bnxt_rep_dev_stop_op(rep_eth_dev);
+ if (ret != 0)
+ return ret;
}
}
+
+ return 0;
}
}