i40e: Add and use helper to reconfigure TC for given VSI

Add helper i40e_vsi_reconfig_tc(vsi) that configures TC
for given VSI using previously stored TC bitmap.

Effectively replaces open-coded patterns:

enabled_tc = vsi->tc_config.enabled_tc;
vsi->tc_config.enabled_tc = 0;
i40e_vsi_config_tc(vsi, enabled_tc);

Reviewed-by: Michal Schmidt <mschmidt@redhat.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com>
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 26e5c21df19d966231815dcfd213c0490143eb2e..2cc7bec0557b31b9984c5206c203a484961add7c 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -5917,6 +5917,28 @@ out:
        return ret;
 }
 
+/**
+ * i40e_vsi_reconfig_tc - Reconfigure VSI Tx Scheduler for stored TC map
+ * @vsi: VSI to be reconfigured
+ *
+ * This reconfigures a particular VSI for TCs that are mapped to the
+ * TC bitmap stored previously for the VSI.
+ *
+ * Context: It is expected that the VSI queues have been quisced before
+ *          calling this function.
+ *
+ * Return: 0 on success, negative value on failure
+ **/
+static int i40e_vsi_reconfig_tc(struct i40e_vsi *vsi)
+{
+       u8 enabled_tc;
+
+       enabled_tc = vsi->tc_config.enabled_tc;
+       vsi->tc_config.enabled_tc = 0;
+
+       return i40e_vsi_config_tc(vsi, enabled_tc);
+}
+
 /**
  * i40e_get_link_speed - Returns link speed for the interface
  * @vsi: VSI to be configured
@@ -14279,7 +14301,6 @@ static struct i40e_vsi *i40e_vsi_reinit_setup(struct i40e_vsi *vsi)
        struct i40e_vsi *main_vsi;
        u16 alloc_queue_pairs;
        struct i40e_pf *pf;
-       u8 enabled_tc;
        int ret;
 
        if (!vsi)
@@ -14312,10 +14333,8 @@ static struct i40e_vsi *i40e_vsi_reinit_setup(struct i40e_vsi *vsi)
         * layout configurations.
         */
        main_vsi = i40e_pf_get_main_vsi(pf);
-       enabled_tc = main_vsi->tc_config.enabled_tc;
-       main_vsi->tc_config.enabled_tc = 0;
        main_vsi->seid = pf->main_vsi_seid;
-       i40e_vsi_config_tc(main_vsi, enabled_tc);
+       i40e_vsi_reconfig_tc(main_vsi);
 
        if (vsi->type == I40E_VSI_MAIN)
                i40e_rm_default_mac_filter(vsi, pf->hw.mac.perm_addr);
@@ -15074,11 +15093,8 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit, bool lock_acqui
                }
        } else {
                /* force a reset of TC and queue layout configurations */
-               u8 enabled_tc = main_vsi->tc_config.enabled_tc;
-
-               main_vsi->tc_config.enabled_tc = 0;
                main_vsi->seid = pf->main_vsi_seid;
-               i40e_vsi_config_tc(main_vsi, enabled_tc);
+               i40e_vsi_reconfig_tc(main_vsi);
        }
        i40e_vlan_stripping_disable(main_vsi);