ice: init flow director before RDMA
[ Upstream commit d67627e7b53203ca150e54723abbed81a0716286 ] Flow director needs only one MSI-X. Load it before RDMA to save MSI-X for it. Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
58cdd1ee65
commit
3c8b4657a6
@@ -5175,11 +5175,12 @@ int ice_load(struct ice_pf *pf)
|
||||
|
||||
ice_napi_add(vsi);
|
||||
|
||||
ice_init_features(pf);
|
||||
|
||||
err = ice_init_rdma(pf);
|
||||
if (err)
|
||||
goto err_init_rdma;
|
||||
|
||||
ice_init_features(pf);
|
||||
ice_service_task_restart(pf);
|
||||
|
||||
clear_bit(ICE_DOWN, pf->state);
|
||||
@@ -5187,6 +5188,7 @@ int ice_load(struct ice_pf *pf)
|
||||
return 0;
|
||||
|
||||
err_init_rdma:
|
||||
ice_deinit_features(pf);
|
||||
ice_tc_indir_block_unregister(vsi);
|
||||
err_tc_indir_block_register:
|
||||
ice_unregister_netdev(vsi);
|
||||
@@ -5210,8 +5212,8 @@ void ice_unload(struct ice_pf *pf)
|
||||
|
||||
devl_assert_locked(priv_to_devlink(pf));
|
||||
|
||||
ice_deinit_features(pf);
|
||||
ice_deinit_rdma(pf);
|
||||
ice_deinit_features(pf);
|
||||
ice_tc_indir_block_unregister(vsi);
|
||||
ice_unregister_netdev(vsi);
|
||||
ice_devlink_destroy_pf_port(pf);
|
||||
|
||||
Reference in New Issue
Block a user