i40e: Do not disable/enable FCoE VSI with DCB reconfig

FCoE VSI Tx queue disable times out when reconfiguring as a result of
DCB TC configuration change event.

The hardware allows us to skip disabling and enabling of Tx queues for
VSIs with single TC enabled. As FCoE VSI is configured to have only
single TC we skip it from disable/enable flow.

Change-ID: Ia73ff3df8785ba2aa3db91e6f2c9005e61ebaec2
Signed-off-by: Neerav Parikh <neerav.parikh@intel.com>
Tested-By: Jack Morgan <jack.morgan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 3e55cef3176f07cd38ae1b7920e42de5a3d212b0..c3107dca24da38eb2c4ad1dc80a40d3fa75f6aef 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -3862,6 +3862,15 @@ static void i40e_quiesce_vsi(struct i40e_vsi *vsi)
        if (test_bit(__I40E_DOWN, &vsi->state))
                return;
 
+       /* No need to disable FCoE VSI when Tx suspended */
+       if ((test_bit(__I40E_PORT_TX_SUSPENDED, &vsi->back->state)) &&
+           vsi->type == I40E_VSI_FCOE) {
+               dev_dbg(&vsi->back->pdev->dev,
+                       "%s: VSI seid %d skipping FCoE VSI disable\n",
+                        __func__, vsi->seid);
+               return;
+       }
+
        set_bit(__I40E_NEEDS_RESTART, &vsi->state);
        if (vsi->netdev && netif_running(vsi->netdev)) {
                vsi->netdev->netdev_ops->ndo_stop(vsi->netdev);
@@ -3953,7 +3962,8 @@ static int i40e_pf_wait_txq_disabled(struct i40e_pf *pf)
        int v, ret = 0;
 
        for (v = 0; v < pf->hw.func_caps.num_vsis; v++) {
-               if (pf->vsi[v]) {
+               /* No need to wait for FCoE VSI queues */
+               if (pf->vsi[v] && pf->vsi[v]->type != I40E_VSI_FCOE) {
                        ret = i40e_vsi_wait_txq_disabled(pf->vsi[v]);
                        if (ret)
                                break;