i40e: Fix issue with removal of apps from DBCNL app table

This patch fixes an issue where the driver is not flushing out the
DCBNL app table for applications that are not present in the local
DCBX application configuration TLVs.

Change-ID: I1f1ee04c81c145071b2ab15657546eb10b81fadb
Signed-off-by: Neerav Parikh <neerav.parikh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

3 files changed, 14 insertions, 11 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index e4e963af28b5..27d1d92b2ce4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -726,6 +726,7 @@ void i40e_fcoe_handle_status(struct i40e_ring *rx_ring,
 void i40e_vlan_stripping_enable(struct i40e_vsi *vsi);
 #ifdef CONFIG_I40E_DCB
 void i40e_dcbnl_flush_apps(struct i40e_pf *pf,
+                           struct i40e_dcbx_config *old_cfg,
                            struct i40e_dcbx_config *new_cfg);
 void i40e_dcbnl_set_all(struct i40e_vsi *vsi);
 void i40e_dcbnl_setup(struct i40e_vsi *vsi);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c b/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
index 183dcb63ce98..f4070b5d33d6 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
@@ -269,22 +269,21 @@ static bool i40e_dcbnl_find_app(struct i40e_dcbx_config *cfg,
 /**
  * i40e_dcbnl_flush_apps - Delete all removed APPs
  * @pf: the corresponding pf
+ * @old_cfg: old DCBX configuration data
  * @new_cfg: new DCBX configuration data
  *
  * Find and delete all APPs that are not present in the passed
  * DCB configuration
  **/
 void i40e_dcbnl_flush_apps(struct i40e_pf *pf,
+                           struct i40e_dcbx_config *old_cfg,
                            struct i40e_dcbx_config *new_cfg)
 {
         struct i40e_dcb_app_priority_table app;
-        struct i40e_dcbx_config *dcbxcfg;
-        struct i40e_hw *hw = &pf->hw;
         int i;
 
-        dcbxcfg = &hw->local_dcbx_config;
-        for (i = 0; i < dcbxcfg->numapps; i++) {
-                app = dcbxcfg->app[i];
+        for (i = 0; i < old_cfg->numapps; i++) {
+                app = old_cfg->app[i];
                 /* The APP is not available anymore delete it */
                 if (!i40e_dcbnl_find_app(new_cfg, &app))
                         i40e_dcbnl_del_app(pf, &app);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 4fb05b4c02b3..fae83ac8c822 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -5166,7 +5166,6 @@ static int i40e_handle_lldp_event(struct i40e_pf *pf,
         struct i40e_aqc_lldp_get_mib *mib =
                 (struct i40e_aqc_lldp_get_mib *)&e->desc.params.raw;
         struct i40e_hw *hw = &pf->hw;
-        struct i40e_dcbx_config *dcbx_cfg = &hw->local_dcbx_config;
         struct i40e_dcbx_config tmp_dcbx_cfg;
         bool need_reconfig = false;
         int ret = 0;
@@ -5199,8 +5198,10 @@ static int i40e_handle_lldp_event(struct i40e_pf *pf,
 
         memset(&tmp_dcbx_cfg, 0, sizeof(tmp_dcbx_cfg));
         /* Store the old configuration */
-        tmp_dcbx_cfg = *dcbx_cfg;
+        memcpy(&tmp_dcbx_cfg, &hw->local_dcbx_config, sizeof(tmp_dcbx_cfg));
 
+        /* Reset the old DCBx configuration data */
+        memset(&hw->local_dcbx_config, 0, sizeof(hw->local_dcbx_config));
         /* Get updated DCBX data from firmware */
         ret = i40e_get_dcb_config(&pf->hw);
         if (ret) {
@@ -5209,20 +5210,22 @@ static int i40e_handle_lldp_event(struct i40e_pf *pf,
         }
 
         /* No change detected in DCBX configs */
-        if (!memcmp(&tmp_dcbx_cfg, dcbx_cfg, sizeof(tmp_dcbx_cfg))) {
+        if (!memcmp(&tmp_dcbx_cfg, &hw->local_dcbx_config,
+                    sizeof(tmp_dcbx_cfg))) {
                 dev_dbg(&pf->pdev->dev, "No change detected in DCBX configuration.\n");
                 goto exit;
         }
 
-        need_reconfig = i40e_dcb_need_reconfig(pf, &tmp_dcbx_cfg, dcbx_cfg);
+        need_reconfig = i40e_dcb_need_reconfig(pf, &tmp_dcbx_cfg,
+                                               &hw->local_dcbx_config);
 
-        i40e_dcbnl_flush_apps(pf, dcbx_cfg);
+        i40e_dcbnl_flush_apps(pf, &tmp_dcbx_cfg, &hw->local_dcbx_config);
 
         if (!need_reconfig)
                 goto exit;
 
         /* Enable DCB tagging only when more than one TC */
-        if (i40e_dcb_get_num_tc(dcbx_cfg) > 1)
+        if (i40e_dcb_get_num_tc(&hw->local_dcbx_config) > 1)
                 pf->flags |= I40E_FLAG_DCB_ENABLED;
         else
                 pf->flags &= ~I40E_FLAG_DCB_ENABLED;