net/ice/base: fix NVGRE switch rule programming

[dpdk.git] / drivers / net / ice / base / ice_switch.h

diff --git a/drivers/net/ice/base/ice_switch.h b/drivers/net/ice/base/ice_switch.h
index 2f140a8..6108373 100644 (file)
--- a/drivers/net/ice/base/ice_switch.h
+++ b/drivers/net/ice/base/ice_switch.h
@@ -11,7 +11,9 @@
 #define ICE_SW_CFG_MAX_BUF_LEN 2048
 #define ICE_MAX_SW 256
 #define ICE_DFLT_VSI_INVAL 0xff
-
+#define ICE_FLTR_RX BIT(0)
+#define ICE_FLTR_TX BIT(1)
+#define ICE_FLTR_TX_RX (ICE_FLTR_RX | ICE_FLTR_TX)
 
 /* Worst case buffer length for ice_aqc_opc_get_res_alloc */
 #define ICE_MAX_RES_TYPES 0x80
@@ -77,9 +79,6 @@ struct ice_fltr_info {
        /* rule ID returned by firmware once filter rule is created */
        u16 fltr_rule_id;
        u16 flag;
-#define ICE_FLTR_RX            BIT(0)
-#define ICE_FLTR_TX            BIT(1)
-#define ICE_FLTR_TX_RX         (ICE_FLTR_RX | ICE_FLTR_TX)
 
        /* Source VSI for LOOKUP_TX or source port for LOOKUP_RX */
        u16 src;
@@ -145,10 +144,6 @@ struct ice_sw_act_ctrl {
        /* Source VSI for LOOKUP_TX or source port for LOOKUP_RX */
        u16 src;
        u16 flag;
-#define ICE_FLTR_RX             BIT(0)
-#define ICE_FLTR_TX             BIT(1)
-#define ICE_FLTR_TX_RX (ICE_FLTR_RX | ICE_FLTR_TX)
-
        enum ice_sw_fwd_act_type fltr_act;
        /* Depending on filter action */
        union {
@@ -187,6 +182,7 @@ struct ice_sw_recipe {
        /* For a chained recipe the root recipe is what should be used for
         * programming rules
         */
+       u8 is_root;
        u8 root_rid;
        u8 recp_created;
 
@@ -196,6 +192,7 @@ struct ice_sw_recipe {
         * recipe
         */
        struct ice_fv_word ext_words[ICE_MAX_CHAIN_WORDS];
+       u16 word_masks[ICE_MAX_CHAIN_WORDS];
 
        /* if this recipe is a collection of other recipe */
        u8 big_recp;
@@ -225,10 +222,13 @@ struct ice_sw_recipe {
        /* Profiles this recipe should be associated with */
        struct LIST_HEAD_TYPE fv_list;
 
-#define ICE_MAX_NUM_PROFILES 256
        /* Profiles this recipe is associated with */
        u8 num_profs, *prof_ids;
 
+       /* Possible result indexes are 44, 45, 46 and 47 */
+#define ICE_POSSIBLE_RES_IDX 0x0000F00000000000ULL
+       ice_declare_bitmap(res_idxs, ICE_MAX_FV_WORDS);
+
        /* This allows user to specify the recipe priority.
         * For now, this becomes 'fwd_priority' when recipe
         * is created, usually recipes can have 'fwd' and 'join'
@@ -368,6 +368,8 @@ ice_aq_get_res_descs(struct ice_hw *hw, u16 num_entries,
                     struct ice_sq_cd *cd);
 enum ice_status
 ice_add_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_list);
+enum ice_status
+ice_remove_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *v_list);
 void ice_rem_all_sw_rules_info(struct ice_hw *hw);
 enum ice_status ice_add_mac(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_lst);
 enum ice_status ice_remove_mac(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_lst);
@@ -376,13 +378,9 @@ ice_add_eth_mac(struct ice_hw *hw, struct LIST_HEAD_TYPE *em_list);
 enum ice_status
 ice_remove_eth_mac(struct ice_hw *hw, struct LIST_HEAD_TYPE *em_list);
 enum ice_status
-ice_remove_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *v_list);
-#ifndef NO_MACVLAN_SUPPORT
-enum ice_status
 ice_add_mac_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_list);
 enum ice_status
 ice_remove_mac_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *v_list);
-#endif /* !NO_MACVLAN_SUPPORT */
 
 enum ice_status
 ice_add_mac_with_sw_marker(struct ice_hw *hw, struct ice_fltr_info *f_info,
@@ -391,7 +389,6 @@ enum ice_status
 ice_add_mac_with_counter(struct ice_hw *hw, struct ice_fltr_info *f_info);
 void ice_remove_vsi_fltr(struct ice_hw *hw, u16 vsi_handle);
 
-
 /* Promisc/defport setup for VSIs */
 enum ice_status
 ice_cfg_dflt_vsi(struct ice_port_info *pi, u16 vsi_handle, bool set,