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/octeontx2: skip flow control on LBK ports
[dpdk.git]
/
drivers
/
net
/
octeontx2
/
otx2_flow_ctrl.c
diff --git
a/drivers/net/octeontx2/otx2_flow_ctrl.c
b/drivers/net/octeontx2/otx2_flow_ctrl.c
index
0392086
..
1b84998
100644
(file)
--- a/
drivers/net/octeontx2/otx2_flow_ctrl.c
+++ b/
drivers/net/octeontx2/otx2_flow_ctrl.c
@@
-14,9
+14,6
@@
otx2_nix_rxchan_bpid_cfg(struct rte_eth_dev *eth_dev, bool enb)
struct nix_bp_cfg_rsp *rsp;
int rc;
struct nix_bp_cfg_rsp *rsp;
int rc;
- if (otx2_dev_is_vf(dev))
- return 0;
-
if (enb) {
req = otx2_mbox_alloc_msg_nix_bp_enable(mbox);
req->chan_base = 0;
if (enb) {
req = otx2_mbox_alloc_msg_nix_bp_enable(mbox);
req->chan_base = 0;
@@
-53,8
+50,10
@@
otx2_nix_flow_ctrl_get(struct rte_eth_dev *eth_dev,
struct otx2_mbox *mbox = dev->mbox;
int rc;
struct otx2_mbox *mbox = dev->mbox;
int rc;
- if (otx2_dev_is_vf(dev))
- return -ENOTSUP;
+ if (otx2_dev_is_lbk(dev)) {
+ fc_conf->mode = RTE_FC_NONE;
+ return 0;
+ }
req = otx2_mbox_alloc_msg_cgx_cfg_pause_frm(mbox);
req->set = 0;
req = otx2_mbox_alloc_msg_cgx_cfg_pause_frm(mbox);
req->set = 0;
@@
-110,7
+109,7
@@
otx2_nix_cq_bp_cfg(struct rte_eth_dev *eth_dev, bool enb)
if (enb) {
aq->cq.bpid = fc->bpid[0];
aq->cq_mask.bpid = ~(aq->cq_mask.bpid);
if (enb) {
aq->cq.bpid = fc->bpid[0];
aq->cq_mask.bpid = ~(aq->cq_mask.bpid);
- aq->cq.bp =
NIX_CQ_BP_LEVEL
;
+ aq->cq.bp =
rxq->cq_drop
;
aq->cq_mask.bp = ~(aq->cq_mask.bp);
}
aq->cq_mask.bp = ~(aq->cq_mask.bp);
}
@@
-143,8
+142,10
@@
otx2_nix_flow_ctrl_set(struct rte_eth_dev *eth_dev,
uint8_t tx_pause, rx_pause;
int rc = 0;
uint8_t tx_pause, rx_pause;
int rc = 0;
- if (otx2_dev_is_vf(dev))
+ if (otx2_dev_is_lbk(dev)) {
+ otx2_info("No flow control support for LBK bound ethports");
return -ENOTSUP;
return -ENOTSUP;
+ }
if (fc_conf->high_water || fc_conf->low_water || fc_conf->pause_time ||
fc_conf->mac_ctrl_frame_fwd || fc_conf->autoneg) {
if (fc_conf->high_water || fc_conf->low_water || fc_conf->pause_time ||
fc_conf->mac_ctrl_frame_fwd || fc_conf->autoneg) {
@@
-162,8
+163,8
@@
otx2_nix_flow_ctrl_set(struct rte_eth_dev *eth_dev,
/* Check if TX pause frame is already enabled or not */
if (fc->tx_pause ^ tx_pause) {
/* Check if TX pause frame is already enabled or not */
if (fc->tx_pause ^ tx_pause) {
- if (otx2_dev_is_A
0
(dev) && eth_dev->data->dev_started) {
- /* on A
0
, CQ should be in disabled state
+ if (otx2_dev_is_A
x
(dev) && eth_dev->data->dev_started) {
+ /* on A
x
, CQ should be in disabled state
* while setting flow control configuration.
*/
otx2_info("Stop the port=%d for setting flow control\n",
* while setting flow control configuration.
*/
otx2_info("Stop the port=%d for setting flow control\n",
@@
-198,7
+199,7
@@
otx2_nix_update_flow_ctrl_mode(struct rte_eth_dev *eth_dev)
struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
struct rte_eth_fc_conf fc_conf;
struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
struct rte_eth_fc_conf fc_conf;
- if (otx2_dev_is_
vf
(dev))
+ if (otx2_dev_is_
lbk
(dev))
return 0;
memset(&fc_conf, 0, sizeof(struct rte_eth_fc_conf));
return 0;
memset(&fc_conf, 0, sizeof(struct rte_eth_fc_conf));
@@
-207,8
+208,8
@@
otx2_nix_update_flow_ctrl_mode(struct rte_eth_dev *eth_dev)
*/
otx2_nix_flow_ctrl_get(eth_dev, &fc_conf);
*/
otx2_nix_flow_ctrl_get(eth_dev, &fc_conf);
- /* To avoid Link credit deadlock on A
0
, disable Tx FC if it's enabled */
- if (otx2_dev_is_A
0
(dev) &&
+ /* To avoid Link credit deadlock on A
x
, disable Tx FC if it's enabled */
+ if (otx2_dev_is_A
x
(dev) &&
(fc_conf.mode == RTE_FC_FULL || fc_conf.mode == RTE_FC_RX_PAUSE)) {
fc_conf.mode =
(fc_conf.mode == RTE_FC_FULL ||
(fc_conf.mode == RTE_FC_FULL || fc_conf.mode == RTE_FC_RX_PAUSE)) {
fc_conf.mode =
(fc_conf.mode == RTE_FC_FULL ||