d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/octeontx2: fix flow control initial state

Browse Source 
Currently when application requests for RTE_FC_NONE earlier
than PMD's internal fc mode update, flow control set routine
is returning without updating the flow control state.

Patch updates the PMD's internal fc mode details during
dev_configure to ensure any flow control set requests
issued later are handled properly.

Fixes: 609945f1ce90 ("net/octeontx2: support flow control")
Cc: stable@dpdk.org

Signed-off-by: Vamsi Attunuru <vattunuru@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
This commit is contained in:
Vamsi Attunuru 2020-02-06 09:57:13 +05:30 committed by Jerin Jacob
parent 5f081dea52
commit 29bb974576
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/octeontx2/otx2_ethdev.c
View File

@ -1744,6 +1744,12 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
if (rc)
goto cq_fini;
rc = otx2_nix_flow_ctrl_init(eth_dev);
if (rc) {
otx2_err("Failed to init flow ctrl mode %d", rc);
goto cq_fini;
}
rc = otx2_nix_mc_addr_list_install(eth_dev);
if (rc < 0) {
otx2_err("Failed to install mc address list rc=%d", rc);

2
drivers/net/octeontx2/otx2_ethdev.h
View File

@ -511,6 +511,8 @@ int otx2_cgx_mac_addr_set(struct rte_eth_dev *eth_dev,
struct rte_ether_addr *addr);
/* Flow Control */
int otx2_nix_flow_ctrl_init(struct rte_eth_dev *eth_dev);
int otx2_nix_flow_ctrl_get(struct rte_eth_dev *eth_dev,
struct rte_eth_fc_conf *fc_conf);

35
drivers/net/octeontx2/otx2_flow_ctrl.c
View File

@ -200,16 +200,14 @@ int
otx2_nix_update_flow_ctrl_mode(struct rte_eth_dev *eth_dev)
{
struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
struct otx2_fc_info *fc = &dev->fc_info;
struct rte_eth_fc_conf fc_conf;
if (otx2_dev_is_lbk(dev) || otx2_dev_is_sdp(dev))
return 0;
memset(&fc_conf, 0, sizeof(struct rte_eth_fc_conf));
/* Both Rx & Tx flow ctrl get enabled(RTE_FC_FULL) in HW
* by AF driver, update those info in PMD structure.
*/
otx2_nix_flow_ctrl_get(eth_dev, &fc_conf);
fc_conf.mode = fc->mode;
/* To avoid Link credit deadlock on Ax, disable Tx FC if it's enabled */
if (otx2_dev_is_Ax(dev) &&
@ -223,3 +221,32 @@ otx2_nix_update_flow_ctrl_mode(struct rte_eth_dev *eth_dev)
return otx2_nix_flow_ctrl_set(eth_dev, &fc_conf);
}
int
otx2_nix_flow_ctrl_init(struct rte_eth_dev *eth_dev)
{
struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
struct otx2_fc_info *fc = &dev->fc_info;
struct rte_eth_fc_conf fc_conf;
int rc;
if (otx2_dev_is_lbk(dev) || otx2_dev_is_sdp(dev))
return 0;
memset(&fc_conf, 0, sizeof(struct rte_eth_fc_conf));
/* Both Rx & Tx flow ctrl get enabled(RTE_FC_FULL) in HW
* by AF driver, update those info in PMD structure.
*/
rc = otx2_nix_flow_ctrl_get(eth_dev, &fc_conf);
if (rc)
goto exit;
fc->mode = fc_conf.mode;
fc->rx_pause = (fc_conf.mode == RTE_FC_FULL) ||
(fc_conf.mode == RTE_FC_RX_PAUSE);
fc->tx_pause = (fc_conf.mode == RTE_FC_FULL) ||
(fc_conf.mode == RTE_FC_TX_PAUSE);
exit:
return rc;
}