ice: Enable LAN_EN for the right recipes

In VEB mode, enable LAN_EN bit in the action fields for filter rules
corresponding to the right recipes.

Signed-off-by: Yashaswini Raghuram Prathivadi Bhayankaram <yashaswini.raghuram.prathivadi.bhayankaram@intel.com>
Reviewed-by: Bruce Allan <bruce.w.allan@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>

diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c
index 64e9e0c..48864b5 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_switch.c
+++ b/drivers/net/ethernet/intel/ice/ice_switch.c
@@ -644,20 +644,31 @@ static void ice_fill_sw_info(struct ice_hw *hw, struct ice_fltr_info *fi)
             fi->fltr_act == ICE_FWD_TO_Q ||
             fi->fltr_act == ICE_FWD_TO_QGRP)) {
                fi->lb_en = true;
-               /* Do not set lan_en to TRUE if
+               /* Set lan_en to TRUE if
                 * 1. The switch is a VEB AND
                 * 2
-                * 2.1 The lookup is MAC with unicast addr for MAC, OR
-                * 2.2 The lookup is MAC_VLAN with unicast addr for MAC
+                * 2.1 The lookup is VLAN, OR
+                * 2.2 The lookup is default port mode, OR
+                * 2.3 The lookup is MAC with mcast or bcast addr for MAC, OR
+                * 2.4 The lookup is MAC_VLAN with mcast or bcast addr for MAC.
                 *
-                * In all other cases, the LAN enable has to be set to true.
+                * OR
+                *
+                * The switch is a VEPA.
+                *
+                * In all other cases, the LAN enable has to be set to false.
                 */
-               if (!(hw->evb_veb &&
-                     ((fi->lkup_type == ICE_SW_LKUP_MAC &&
-                       is_unicast_ether_addr(fi->l_data.mac.mac_addr)) ||
-                      (fi->lkup_type == ICE_SW_LKUP_MAC_VLAN &&
-                       is_unicast_ether_addr(fi->l_data.mac_vlan.mac_addr)))))
+               if (hw->evb_veb) {
+                       if (fi->lkup_type == ICE_SW_LKUP_VLAN ||
+                           fi->lkup_type == ICE_SW_LKUP_DFLT ||
+                           (fi->lkup_type == ICE_SW_LKUP_MAC &&
+                            !is_unicast_ether_addr(fi->l_data.mac.mac_addr)) ||
+                           (fi->lkup_type == ICE_SW_LKUP_MAC_VLAN &&
+                            !is_unicast_ether_addr(fi->l_data.mac.mac_addr)))
+                               fi->lan_en = true;
+               } else {
                        fi->lan_en = true;
+               }
        }
 }