i40e: Fix for tx timeouts when interface is brought up if DCB is enabled
Subsystems (2)
PATCH 1/1 i40e: Fix for tx timeouts when interface is brought up if DCB is enabled
From: "Szapar, Martyna" <[email protected]>
If interface is connected to switch port configured for DCB there are TX timeouts when bringing up interface. Problem started appearing after adding in i40e driver code mqprio hardware offload mode. In function i40e_vsi_configure_bw_alloc was added resetting BW rate which should be executing when mqprio qdisc is removed but was also when there was no mqprio qdisc added and DCB was enabled. In this patch was added additional check for DCB flag so now when DCB is enabled the correct DCB configs from before mqprio patch are restored.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +8 -7
@@ -5127,15 +5127,17 @@ static int i40e_vsi_configure_bw_alloc(struct i40e_vsi *vsi, u8 enabled_tc, u8 *bw_share) {struct i40e_aqc_configure_vsi_tc_bw_data bw_data; +struct i40e_pf *pf = vsi->back;i40e_status ret;int i; -if (vsi->back->flags &I40E_FLAG_TC_MQPRIO ) +/* There is no need to reset BW when mqprio mode is on. */ +if (pf->flags &I40E_FLAG_TC_MQPRIO )return 0 ; -if (!vsi->mqprio_qopt.qopt.hw) { +if (!vsi->mqprio_qopt.qopt.hw && !(pf->flags &I40E_FLAG_DCB_ENABLED )) { ret =i40e_set_bw_limit (vsi, vsi->seid,0 );if (ret) -dev_info (&vsi->back->pdev->dev, +dev_info (&pf->pdev->dev,"Failed to reset tx rate for vsi->seid %u\n" , vsi->seid);return ret;
@@ -5144,12 +5146,11 @@ static int i40e_vsi_configure_bw_alloc(struct i40e_vsi *vsi, u8 enabled_tc,for (i =0 ; i <I40E_MAX_TRAFFIC_CLASS ; i++) bw_data.tc_bw_credits[i] = bw_share[i]; - ret =i40e_aq_config_vsi_tc_bw (&vsi->back->hw, vsi->seid, &bw_data, -NULL ); + ret =i40e_aq_config_vsi_tc_bw (&pf->hw, vsi->seid, &bw_data,NULL );if (ret) { -dev_info (&vsi->back->pdev->dev, +dev_info (&pf->pdev->dev,"AQ command Config VSI BW allocation per TC failed = %d\n" , - vsi->back->hw.aq.asq_last_status); + pf->hw.aq.asq_last_status);return -EINVAL ; }
Signature · 1 line
2.9.5
Bowers
PATCH 1/1 i40e: Fix for tx timeouts when interface is brought up if DCB is enabled
Quoted 21 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 7, 2018 5:11 PM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Szapar, Martyna <[email protected]>
Subject: [Intel-wired-lan] [PATCH] i40e: Fix for tx timeouts when interface is brought up if DCB is enabledFrom: "Szapar, Martyna" <[email protected]>
If interface is connected to switch port configured for DCB there are TX timeouts when bringing up interface. Problem started appearing after adding in i40e driver code mqprio hardware offload mode. In function
i40e_vsi_configure_bw_allocwas added resetting BW rate which should be executing when mqprio qdisc is removed but was also when there was no mqprio qdisc added and DCB was enabled. In this patch was added additional check for DCB flag so now when DCB is enabled the correct DCB configs from before mqprio patch are restored.
Quoted 4 lines
Signed-off-by Martyna Szapar <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)