Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next...

[linux-2.6-microblaze.git] / drivers / net / ethernet / intel / ice / ice_main.c

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 29914ee..9a3b14d 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -410,8 +410,8 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
                clear_bit(ICE_VSI_PROMISC_CHANGED, vsi->state);
                if (vsi->current_netdev_flags & IFF_PROMISC) {
                        /* Apply Rx filter rule to get traffic from wire */
-                       if (!ice_is_dflt_vsi_in_use(pf->first_sw)) {
-                               err = ice_set_dflt_vsi(pf->first_sw, vsi);
+                       if (!ice_is_dflt_vsi_in_use(vsi->port_info)) {
+                               err = ice_set_dflt_vsi(vsi);
                                if (err && err != -EEXIST) {
                                        netdev_err(netdev, "Error %d setting default VSI %i Rx rule\n",
                                                   err, vsi->vsi_num);
@@ -424,8 +424,8 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
                        }
                } else {
                        /* Clear Rx filter to remove traffic from wire */
-                       if (ice_is_vsi_dflt_vsi(pf->first_sw, vsi)) {
-                               err = ice_clear_dflt_vsi(pf->first_sw);
+                       if (ice_is_vsi_dflt_vsi(vsi)) {
+                               err = ice_clear_dflt_vsi(vsi);
                                if (err) {
                                        netdev_err(netdev, "Error %d clearing default VSI %i Rx rule\n",
                                                   err, vsi->vsi_num);
@@ -3358,6 +3358,7 @@ static void ice_set_netdev_features(struct net_device *netdev)
        netdev->features |= netdev->hw_features;
 
        netdev->hw_features |= NETIF_F_HW_TC;
+       netdev->hw_features |= NETIF_F_LOOPBACK;
 
        /* encap and VLAN devices inherit default, csumo and tso features */
        netdev->hw_enc_features |= dflt_features | csumo_features |
@@ -5912,6 +5913,32 @@ ice_set_vlan_features(struct net_device *netdev, netdev_features_t features)
        return 0;
 }
 
+/**
+ * ice_set_loopback - turn on/off loopback mode on underlying PF
+ * @vsi: ptr to VSI
+ * @ena: flag to indicate the on/off setting
+ */
+static int ice_set_loopback(struct ice_vsi *vsi, bool ena)
+{
+       bool if_running = netif_running(vsi->netdev);
+       int ret;
+
+       if (if_running && !test_and_set_bit(ICE_VSI_DOWN, vsi->state)) {
+               ret = ice_down(vsi);
+               if (ret) {
+                       netdev_err(vsi->netdev, "Preparing device to toggle loopback failed\n");
+                       return ret;
+               }
+       }
+       ret = ice_aq_set_mac_loopback(&vsi->back->hw, ena, NULL);
+       if (ret)
+               netdev_err(vsi->netdev, "Failed to toggle loopback state\n");
+       if (if_running)
+               ret = ice_up(vsi);
+
+       return ret;
+}
+
 /**
  * ice_set_features - set the netdev feature flags
  * @netdev: ptr to the netdev being adjusted
@@ -5920,44 +5947,41 @@ ice_set_vlan_features(struct net_device *netdev, netdev_features_t features)
 static int
 ice_set_features(struct net_device *netdev, netdev_features_t features)
 {
+       netdev_features_t changed = netdev->features ^ features;
        struct ice_netdev_priv *np = netdev_priv(netdev);
        struct ice_vsi *vsi = np->vsi;
        struct ice_pf *pf = vsi->back;
        int ret = 0;
 
        /* Don't set any netdev advanced features with device in Safe Mode */
-       if (ice_is_safe_mode(vsi->back)) {
-               dev_err(ice_pf_to_dev(vsi->back), "Device is in Safe Mode - not enabling advanced netdev features\n");
+       if (ice_is_safe_mode(pf)) {
+               dev_err(ice_pf_to_dev(pf),
+                       "Device is in Safe Mode - not enabling advanced netdev features\n");
                return ret;
        }
 
        /* Do not change setting during reset */
        if (ice_is_reset_in_progress(pf->state)) {
-               dev_err(ice_pf_to_dev(vsi->back), "Device is resetting, changing advanced netdev features temporarily unavailable.\n");
+               dev_err(ice_pf_to_dev(pf),
+                       "Device is resetting, changing advanced netdev features temporarily unavailable.\n");
                return -EBUSY;
        }
 
        /* Multiple features can be changed in one call so keep features in
         * separate if/else statements to guarantee each feature is checked
         */
-       if (features & NETIF_F_RXHASH && !(netdev->features & NETIF_F_RXHASH))
-               ice_vsi_manage_rss_lut(vsi, true);
-       else if (!(features & NETIF_F_RXHASH) &&
-                netdev->features & NETIF_F_RXHASH)
-               ice_vsi_manage_rss_lut(vsi, false);
+       if (changed & NETIF_F_RXHASH)
+               ice_vsi_manage_rss_lut(vsi, !!(features & NETIF_F_RXHASH));
 
        ret = ice_set_vlan_features(netdev, features);
        if (ret)
                return ret;
 
-       if ((features & NETIF_F_NTUPLE) &&
-           !(netdev->features & NETIF_F_NTUPLE)) {
-               ice_vsi_manage_fdir(vsi, true);
-               ice_init_arfs(vsi);
-       } else if (!(features & NETIF_F_NTUPLE) &&
-                (netdev->features & NETIF_F_NTUPLE)) {
-               ice_vsi_manage_fdir(vsi, false);
-               ice_clear_arfs(vsi);
+       if (changed & NETIF_F_NTUPLE) {
+               bool ena = !!(features & NETIF_F_NTUPLE);
+
+               ice_vsi_manage_fdir(vsi, ena);
+               ena ? ice_init_arfs(vsi) : ice_clear_arfs(vsi);
        }
 
        /* don't turn off hw_tc_offload when ADQ is already enabled */
@@ -5966,13 +5990,17 @@ ice_set_features(struct net_device *netdev, netdev_features_t features)
                return -EACCES;
        }
 
-       if ((features & NETIF_F_HW_TC) &&
-           !(netdev->features & NETIF_F_HW_TC))
-               set_bit(ICE_FLAG_CLS_FLOWER, pf->flags);
-       else
-               clear_bit(ICE_FLAG_CLS_FLOWER, pf->flags);
+       if (changed & NETIF_F_HW_TC) {
+               bool ena = !!(features & NETIF_F_HW_TC);
 
-       return 0;
+               ena ? set_bit(ICE_FLAG_CLS_FLOWER, pf->flags) :
+                     clear_bit(ICE_FLAG_CLS_FLOWER, pf->flags);
+       }
+
+       if (changed & NETIF_F_LOOPBACK)
+               ret = ice_set_loopback(vsi, !!(features & NETIF_F_LOOPBACK));
+
+       return ret;
 }
 
 /**
@@ -6994,12 +7022,6 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)
                goto err_init_ctrlq;
        }
 
-       if (pf->first_sw->dflt_vsi_ena)
-               dev_info(dev, "Clearing default VSI, re-enable after reset completes\n");
-       /* clear the default VSI configuration if it exists */
-       pf->first_sw->dflt_vsi = NULL;
-       pf->first_sw->dflt_vsi_ena = false;
-
        ice_clear_pxe_mode(hw);
 
        err = ice_init_nvm(hw);