ice: Add support for PF/VF promiscuous mode

Implement support for VF promiscuous mode, MAC/VLAN/MAC_VLAN and PF
multicast MAC/VLAN/MAC_VLAN promiscuous mode.

Signed-off-by: Akeem G Abodunrin <akeem.g.abodunrin@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 80 insertions, 11 deletions

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 34712e38121e..879c1f176a17 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -168,6 +168,39 @@ static bool ice_vsi_fltr_changed(struct ice_vsi *vsi)
 }
 
 /**
+ * ice_cfg_promisc - Enable or disable promiscuous mode for a given PF
+ * @vsi: the VSI being configured
+ * @promisc_m: mask of promiscuous config bits
+ * @set_promisc: enable or disable promisc flag request
+ *
+ */
+static int ice_cfg_promisc(struct ice_vsi *vsi, u8 promisc_m, bool set_promisc)
+{
+        struct ice_hw *hw = &vsi->back->hw;
+        enum ice_status status = 0;
+
+        if (vsi->type != ICE_VSI_PF)
+                return 0;
+
+        if (vsi->vlan_ena) {
+                status = ice_set_vlan_vsi_promisc(hw, vsi->idx, promisc_m,
+                                                  set_promisc);
+        } else {
+                if (set_promisc)
+                        status = ice_set_vsi_promisc(hw, vsi->idx, promisc_m,
+                                                     0);
+                else
+                        status = ice_clear_vsi_promisc(hw, vsi->idx, promisc_m,
+                                                       0);
+        }
+
+        if (status)
+                return -EIO;
+
+        return 0;
+}
+
+/**
  * ice_vsi_sync_fltr - Update the VSI filter list to the HW
  * @vsi: ptr to the VSI
  *
@@ -182,6 +215,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
         struct ice_hw *hw = &pf->hw;
         enum ice_status status = 0;
         u32 changed_flags = 0;
+        u8 promisc_m;
         int err = 0;
 
         if (!vsi->netdev)
@@ -245,8 +279,35 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
                 }
         }
         /* check for changes in promiscuous modes */
-        if (changed_flags & IFF_ALLMULTI)
-                netdev_warn(netdev, "Unsupported configuration\n");
+        if (changed_flags & IFF_ALLMULTI) {
+                if (vsi->current_netdev_flags & IFF_ALLMULTI) {
+                        if (vsi->vlan_ena)
+                                promisc_m = ICE_MCAST_VLAN_PROMISC_BITS;
+                        else
+                                promisc_m = ICE_MCAST_PROMISC_BITS;
+
+                        err = ice_cfg_promisc(vsi, promisc_m, true);
+                        if (err) {
+                                netdev_err(netdev, "Error setting Multicast promiscuous mode on VSI %i\n",
+                                           vsi->vsi_num);
+                                vsi->current_netdev_flags &= ~IFF_ALLMULTI;
+                                goto out_promisc;
+                        }
+                } else if (!(vsi->current_netdev_flags & IFF_ALLMULTI)) {
+                        if (vsi->vlan_ena)
+                                promisc_m = ICE_MCAST_VLAN_PROMISC_BITS;
+                        else
+                                promisc_m = ICE_MCAST_PROMISC_BITS;
+
+                        err = ice_cfg_promisc(vsi, promisc_m, false);
+                        if (err) {
+                                netdev_err(netdev, "Error clearing Multicast promiscuous mode on VSI %i\n",
+                                           vsi->vsi_num);
+                                vsi->current_netdev_flags |= IFF_ALLMULTI;
+                                goto out_promisc;
+                        }
+                }
+        }
 
         if (((changed_flags & IFF_PROMISC) || promisc_forced_on) ||
             test_bit(ICE_VSI_FLAG_PROMISC_CHANGED, vsi->flags)) {
@@ -1665,6 +1726,7 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto,
 {
         struct ice_netdev_priv *np = netdev_priv(netdev);
         struct ice_vsi *vsi = np->vsi;
+        int ret;
 
         if (vid >= VLAN_N_VID) {
                 netdev_err(netdev, "VLAN id requested %d is out of range %d\n",
@@ -1677,8 +1739,7 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto,
 
         /* Enable VLAN pruning when VLAN 0 is added */
         if (unlikely(!vid)) {
-                int ret = ice_cfg_vlan_pruning(vsi, true);
-
+                ret = ice_cfg_vlan_pruning(vsi, true, false);
                 if (ret)
                         return ret;
         }
@@ -1687,7 +1748,13 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto,
          * needed to continue allowing all untagged packets since VLAN prune
          * list is applied to all packets by the switch
          */
-        return ice_vsi_add_vlan(vsi, vid);
+        ret = ice_vsi_add_vlan(vsi, vid);
+        if (!ret) {
+                vsi->vlan_ena = true;
+                set_bit(ICE_VSI_FLAG_VLAN_FLTR_CHANGED, vsi->flags);
+        }
+
+        return ret;
 }
 
 /**
@@ -1704,7 +1771,7 @@ ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto,
 {
         struct ice_netdev_priv *np = netdev_priv(netdev);
         struct ice_vsi *vsi = np->vsi;
-        int status;
+        int ret;
 
         if (vsi->info.pvid)
                 return -EINVAL;
@@ -1712,15 +1779,17 @@ ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto,
         /* Make sure ice_vsi_kill_vlan is successful before updating VLAN
          * information
          */
-        status = ice_vsi_kill_vlan(vsi, vid);
-        if (status)
-                return status;
+        ret = ice_vsi_kill_vlan(vsi, vid);
+        if (ret)
+                return ret;
 
         /* Disable VLAN pruning when VLAN 0 is removed */
         if (unlikely(!vid))
-                status = ice_cfg_vlan_pruning(vsi, false);
+                ret = ice_cfg_vlan_pruning(vsi, false, false);
 
-        return status;
+        vsi->vlan_ena = false;
+        set_bit(ICE_VSI_FLAG_VLAN_FLTR_CHANGED, vsi->flags);
+        return ret;
 }
 
 /**