Skip to content

Commit a5df72b

Browse files
committed
ice: init flow director before RDMA
JIRA: https://issues.redhat.com/browse/RHEL-80554 Upstream commit(s): commit d67627e Author: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> Date: Tue Dec 3 07:58:17 2024 +0100 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: 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: Petr Oros <poros@redhat.com>
1 parent 7494a76 commit a5df72b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5118,18 +5118,20 @@ int ice_load(struct ice_pf *pf)
51185118

51195119
ice_napi_add(vsi);
51205120

5121+
ice_init_features(pf);
5122+
51215123
err = ice_init_rdma(pf);
51225124
if (err)
51235125
goto err_init_rdma;
51245126

5125-
ice_init_features(pf);
51265127
ice_service_task_restart(pf);
51275128

51285129
clear_bit(ICE_DOWN, pf->state);
51295130

51305131
return 0;
51315132

51325133
err_init_rdma:
5134+
ice_deinit_features(pf);
51335135
ice_tc_indir_block_unregister(vsi);
51345136
err_tc_indir_block_register:
51355137
ice_unregister_netdev(vsi);
@@ -5153,8 +5155,8 @@ void ice_unload(struct ice_pf *pf)
51535155

51545156
devl_assert_locked(priv_to_devlink(pf));
51555157

5156-
ice_deinit_features(pf);
51575158
ice_deinit_rdma(pf);
5159+
ice_deinit_features(pf);
51585160
ice_tc_indir_block_unregister(vsi);
51595161
ice_unregister_netdev(vsi);
51605162
ice_devlink_destroy_pf_port(pf);

0 commit comments

Comments
 (0)