[Intel-wired-lan] [PATCH AUTOSEL 6.14 555/642] ice: init flow director before RDMA

[Sasha Levin]

From: Michal Swiatkowski <michal.swiatkow...@linux.intel.com>

[ 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.kel...@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pu...@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkow...@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.ngu...@intel.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/net/ethernet/intel/ice/ice_main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c 
b/drivers/net/ethernet/intel/ice/ice_main.c
index e13bd5a6cb6c4..d24d46b24e371 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -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);
-- 
2.39.5