net/ice/base: update copyright date

[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 bd634f9..c11c064 100644 (file)
--- a/drivers/net/ice/base/ice_switch.h
+++ b/drivers/net/ice/base/ice_switch.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2020 Intel Corporation
+ * Copyright(c) 2001-2021 Intel Corporation
  */
 
 #ifndef _ICE_SWITCH_H_
@@ -16,6 +16,10 @@
 #define ICE_FLTR_TX_RX (ICE_FLTR_RX | ICE_FLTR_TX)
 
 /* Switch Profile IDs for Profile related switch rules */
+#define ICE_PROFID_IPV4_TCP            4
+#define ICE_PROFID_IPV4_UDP            5
+#define ICE_PROFID_IPV6_TCP            7
+#define ICE_PROFID_IPV6_UDP            8
 #define ICE_PROFID_PPPOE_PAY           34
 #define ICE_PROFID_PPPOE_IPV4_TCP      35
 #define ICE_PROFID_PPPOE_IPV4_UDP      36
@@ -23,6 +27,33 @@
 #define ICE_PROFID_PPPOE_IPV6_TCP      38
 #define ICE_PROFID_PPPOE_IPV6_UDP      39
 #define ICE_PROFID_PPPOE_IPV6_OTHER    40
+#define ICE_PROFID_IPV4_GTPC_TEID      41
+#define ICE_PROFID_IPV4_GTPU_TEID              43
+#define ICE_PROFID_IPV6_GTPU_TEID              46
+#define ICE_PROFID_IPV4_GTPU_EH_IPV4_OTHER     47
+#define ICE_PROFID_IPV4_GTPU_IPV4_OTHER                48
+#define ICE_PROFID_IPV4_GTPU_EH_IPV4_UDP       49
+#define ICE_PROFID_IPV4_GTPU_IPV4_UDP          50
+#define ICE_PROFID_IPV4_GTPU_EH_IPV4_TCP       51
+#define ICE_PROFID_IPV4_GTPU_IPV4_TCP          52
+#define ICE_PROFID_IPV6_GTPU_EH_IPV4_OTHER     53
+#define ICE_PROFID_IPV6_GTPU_IPV4_OTHER                54
+#define ICE_PROFID_IPV6_GTPU_EH_IPV4_UDP       55
+#define ICE_PROFID_IPV6_GTPU_IPV4_UDP          56
+#define ICE_PROFID_IPV6_GTPU_EH_IPV4_TCP       57
+#define ICE_PROFID_IPV6_GTPU_IPV4_TCP          58
+#define ICE_PROFID_IPV4_GTPU_EH_IPV6_OTHER     59
+#define ICE_PROFID_IPV4_GTPU_IPV6_OTHER                60
+#define ICE_PROFID_IPV4_GTPU_EH_IPV6_UDP       61
+#define ICE_PROFID_IPV4_GTPU_IPV6_UDP          62
+#define ICE_PROFID_IPV4_GTPU_EH_IPV6_TCP       63
+#define ICE_PROFID_IPV4_GTPU_IPV6_TCP          64
+#define ICE_PROFID_IPV6_GTPU_EH_IPV6_OTHER     65
+#define ICE_PROFID_IPV6_GTPU_IPV6_OTHER                66
+#define ICE_PROFID_IPV6_GTPU_EH_IPV6_UDP       67
+#define ICE_PROFID_IPV6_GTPU_IPV6_UDP          68
+#define ICE_PROFID_IPV6_GTPU_EH_IPV6_TCP       69
+#define ICE_PROFID_IPV6_GTPU_IPV6_TCP          70
 #define ICE_PROFID_IPV4_ESP            71
 #define ICE_PROFID_IPV6_ESP            72
 #define ICE_PROFID_IPV4_AH             73
@@ -38,25 +69,17 @@
 
 #define DUMMY_ETH_HDR_LEN              16
 #define ICE_SW_RULE_RX_TX_ETH_HDR_SIZE \
-       (sizeof(struct ice_aqc_sw_rules_elem) - \
-        FIELD_SIZEOF(struct ice_aqc_sw_rules_elem, pdata) + \
-        sizeof(struct ice_sw_rule_lkup_rx_tx) + DUMMY_ETH_HDR_LEN - 1)
+       (offsetof(struct ice_aqc_sw_rules_elem, pdata.lkup_tx_rx.hdr) + \
+        (DUMMY_ETH_HDR_LEN * \
+         sizeof(((struct ice_sw_rule_lkup_rx_tx *)0)->hdr[0])))
 #define ICE_SW_RULE_RX_TX_NO_HDR_SIZE \
-       (sizeof(struct ice_aqc_sw_rules_elem) - \
-        FIELD_SIZEOF(struct ice_aqc_sw_rules_elem, pdata) + \
-        sizeof(struct ice_sw_rule_lkup_rx_tx) - 1)
+       (offsetof(struct ice_aqc_sw_rules_elem, pdata.lkup_tx_rx.hdr))
 #define ICE_SW_RULE_LG_ACT_SIZE(n) \
-       (sizeof(struct ice_aqc_sw_rules_elem) - \
-        FIELD_SIZEOF(struct ice_aqc_sw_rules_elem, pdata) + \
-        sizeof(struct ice_sw_rule_lg_act) - \
-        FIELD_SIZEOF(struct ice_sw_rule_lg_act, act) + \
-        ((n) * FIELD_SIZEOF(struct ice_sw_rule_lg_act, act)))
+       (offsetof(struct ice_aqc_sw_rules_elem, pdata.lg_act.act) + \
+        ((n) * sizeof(((struct ice_sw_rule_lg_act *)0)->act[0])))
 #define ICE_SW_RULE_VSI_LIST_SIZE(n) \
-       (sizeof(struct ice_aqc_sw_rules_elem) - \
-        FIELD_SIZEOF(struct ice_aqc_sw_rules_elem, pdata) + \
-        sizeof(struct ice_sw_rule_vsi_list) - \
-        FIELD_SIZEOF(struct ice_sw_rule_vsi_list, vsi) + \
-        ((n) * FIELD_SIZEOF(struct ice_sw_rule_vsi_list, vsi)))
+       (offsetof(struct ice_aqc_sw_rules_elem, pdata.vsi_list.vsi) + \
+        ((n) * sizeof(((struct ice_sw_rule_vsi_list *)0)->vsi[0])))
 
 /* Worst case buffer length for ice_aqc_opc_get_res_alloc */
 #define ICE_MAX_RES_TYPES 0x80
@@ -159,7 +182,6 @@ struct ice_fltr_info {
                 */
                u16 q_id:11;
                u16 hw_vsi_id:10;
-               u16 vsi_id:10;
                u16 vsi_list_id:10;
        } fwd_id;
 
@@ -395,19 +417,21 @@ ice_free_res_cntr(struct ice_hw *hw, u8 type, u8 alloc_shared, u16 num_items,
 
 /* Switch/bridge related commands */
 enum ice_status ice_update_sw_rule_bridge_mode(struct ice_hw *hw);
+enum ice_status ice_alloc_rss_global_lut(struct ice_hw *hw, bool shared_res, u16 *global_lut_id);
+enum ice_status ice_free_rss_global_lut(struct ice_hw *hw, u16 global_lut_id);
 enum ice_status
 ice_alloc_sw(struct ice_hw *hw, bool ena_stats, bool shared_res, u16 *sw_id,
             u16 *counter_id);
 enum ice_status
 ice_free_sw(struct ice_hw *hw, u16 sw_id, u16 counter_id);
 enum ice_status
-ice_aq_get_res_alloc(struct ice_hw *hw, u16 *num_entries, void *buf,
-                    u16 buf_size, struct ice_sq_cd *cd);
+ice_aq_get_res_alloc(struct ice_hw *hw, u16 *num_entries,
+                    struct ice_aqc_get_res_resp_elem *buf, u16 buf_size,
+                    struct ice_sq_cd *cd);
 enum ice_status
 ice_aq_get_res_descs(struct ice_hw *hw, u16 num_entries,
-                    struct ice_aqc_get_allocd_res_desc_resp *buf,
-                    u16 buf_size, u16 res_type, bool res_shared, u16 *desc_id,
-                    struct ice_sq_cd *cd);
+                    struct ice_aqc_res_elem *buf, u16 buf_size, u16 res_type,
+                    bool res_shared, u16 *desc_id, struct ice_sq_cd *cd);
 enum ice_status
 ice_add_vlan(struct ice_hw *hw, struct LIST_HEAD_TYPE *m_list);
 enum ice_status