Commit d67627e7 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

ice: init flow director before RDMA 



Flow director needs only one MSI-X. Load it before RDMA to save MSI-X
for it.

Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarPucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com>
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent a2031632

drivers/net/ethernet/intel/ice/ice_main.c

+4 −2
Original line number Diff line number Diff line
@@ -5186,11 +5186,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);
@@ -5198,6 +5199,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);
@@ -5221,8 +5223,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);