ice: Move vector base setup to PF VSI
authorTony Nguyen <anthony.l.nguyen@intel.com>
Wed, 26 Jun 2019 09:20:14 +0000 (02:20 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 31 Jul 2019 17:23:04 +0000 (10:23 -0700)
When interrupt tracking was refactored, during rebuild, the call to
ice_vsi_setup_vector_base() was inadvertently removed from the PF VSI
instead of being removed from the VF VSI. During reset, the failure to
properly setup the vector base generates a call trace. Correct this so
that resets/rebuilds properly complete.

Fixes: cbe66bfee6a0 ("ice: Refactor interrupt tracking")
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_lib.c

index e9e8340b1ab7313a01863f5df32f1f9c58065bfe..01f38abd427744aa6829698015787f5433405e8c 100644 (file)
@@ -2978,6 +2978,10 @@ int ice_vsi_rebuild(struct ice_vsi *vsi)
                if (ret)
                        goto err_rings;
 
+               ret = ice_vsi_setup_vector_base(vsi);
+               if (ret)
+                       goto err_vectors;
+
                ret = ice_vsi_set_q_vectors_reg_idx(vsi);
                if (ret)
                        goto err_vectors;
@@ -2999,10 +3003,6 @@ int ice_vsi_rebuild(struct ice_vsi *vsi)
                if (ret)
                        goto err_rings;
 
-               ret = ice_vsi_setup_vector_base(vsi);
-               if (ret)
-                       goto err_vectors;
-
                ret = ice_vsi_set_q_vectors_reg_idx(vsi);
                if (ret)
                        goto err_vectors;