net/ice/base: group function prototypes together

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

diff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h
index ff42d2e..b39ce0b 100644 (file)
--- a/drivers/net/ice/base/ice_fdir.h
+++ b/drivers/net/ice/base/ice_fdir.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2019
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
 #ifndef _ICE_FDIR_H_
@@ -7,50 +7,6 @@
 
 #include "ice_common.h"
 
-/* Flow Director (FD) Filter Programming descriptor */
-struct ice_fd_fltr_desc_ctx {
-       u32 fdid;
-       u16 qindex;
-       u16 cnt_index;
-       u16 fd_vsi;
-       u16 flex_val;
-       u8 comp_q;
-       u8 comp_report;
-       u8 fd_space;
-       u8 cnt_ena;
-       u8 evict_ena;
-       u8 toq;
-       u8 toq_prio;
-       u8 dpu_recipe;
-       u8 drop;
-       u8 flex_prio;
-       u8 flex_mdid;
-       u8 dtype;
-       u8 pcmd;
-       u8 desc_prof_prio;
-       u8 desc_prof;
-       u8 swap;
-       u8 fdid_prio;
-       u8 fdid_mdid;
-};
-
-enum ice_status ice_alloc_fd_res_cntr(struct ice_hw *hw, u16 *cntr_id);
-enum ice_status ice_free_fd_res_cntr(struct ice_hw *hw, u16 cntr_id);
-void
-ice_set_fd_desc_val(struct ice_fd_fltr_desc_ctx *fd_fltr_ctx,
-                   struct ice_fltr_desc *fdir_desc);
-void ice_set_dflt_val_fd_desc(struct ice_fd_fltr_desc_ctx *fd_fltr_ctx);
-enum ice_status
-ice_alloc_fd_guar_item(struct ice_hw *hw, u16 *cntr_id, u16 num_fltr);
-enum ice_status
-ice_free_fd_guar_item(struct ice_hw *hw, u16 cntr_id, u16 num_fltr);
-enum ice_status
-ice_alloc_fd_shrd_item(struct ice_hw *hw, u16 *cntr_id, u16 num_fltr);
-enum ice_status
-ice_free_fd_shrd_item(struct ice_hw *hw, u16 cntr_id, u16 num_fltr);
-enum ice_status ice_clear_vsi_fd_table(struct ice_hw *hw, u16 vsi_num);
-enum ice_status ice_clear_pf_fd_table(struct ice_hw *hw);
-
 #define ICE_FDIR_IP_PROTOCOLS
 #define ICE_IP_PROTO_TCP               6
 #define ICE_IP_PROTO_UDP               17
@@ -82,6 +38,7 @@ enum ice_status ice_clear_pf_fd_table(struct ice_hw *hw);
 #define ICE_IPV6_SCTP_SRC_PORT_OFFSET  54
 #define ICE_IPV6_SCTP_DST_PORT_OFFSET  56
 
+#define ICE_MAC_ETHTYPE_OFFSET         12
 #define ICE_IPV4_TOS_OFFSET            15
 #define ICE_IPV4_TTL_OFFSET            22
 #define ICE_IPV6_TC_OFFSET             14
@@ -113,6 +70,33 @@ enum ice_fltr_prgm_desc_fd_status {
        ICE_FLTR_PRGM_DESC_FD_STATUS_8FLEX_BYTES,
 };
 
+/* Flow Director (FD) Filter Programming descriptor */
+struct ice_fd_fltr_desc_ctx {
+       u32 fdid;
+       u16 qindex;
+       u16 cnt_index;
+       u16 fd_vsi;
+       u16 flex_val;
+       u8 comp_q;
+       u8 comp_report;
+       u8 fd_space;
+       u8 cnt_ena;
+       u8 evict_ena;
+       u8 toq;
+       u8 toq_prio;
+       u8 dpu_recipe;
+       u8 drop;
+       u8 flex_prio;
+       u8 flex_mdid;
+       u8 dtype;
+       u8 pcmd;
+       u8 desc_prof_prio;
+       u8 desc_prof;
+       u8 swap;
+       u8 fdid_prio;
+       u8 fdid_mdid;
+};
+
 #define ICE_FLTR_PRGM_FLEX_WORD_SIZE   sizeof(__be16)
 
 struct ice_rx_flow_userdef {
@@ -151,9 +135,9 @@ struct ice_fdir_v6 {
 struct ice_fdir_udp_gtp {
        u8 flags;
        u8 msg_type;
-       u16 rsrvd_len;
-       u32 teid;
-       u16 rsrvd_seq_nbr;
+       __be16 rsrvd_len;
+       __be32 teid;
+       __be16 rsrvd_seq_nbr;
        u8 rsrvd_n_pdu_nbr;
        u8 rsrvd_next_ext_type;
        u8 rsvrd_ext_len;
@@ -168,6 +152,7 @@ struct ice_fdir_udp_gtp {
 
 struct ice_fdir_extra {
        u8 dst_mac[ETH_ALEN];   /* dest MAC address */
+       __be16 ether_type;      /* for NON_IP_L2 */
        u32 usr_def[2];         /* user data */
        __be16 vlan_type;       /* VLAN ethertype */
        __be16 vlan_tag;        /* VLAN tag info */
@@ -202,13 +187,13 @@ struct ice_fdir_fltr {
        u8 cnt_ena;
        u8 fltr_status;
        u16 cnt_index;
-       u8 fdid_prio;
        u32 fltr_id;
+       u8 fdid_prio;
        /* Set to true for an ACL filter */
        bool acl_fltr;
 };
 
-/* Dummy packet filter definition structure. */
+/* Dummy packet filter definition structure */
 struct ice_fdir_base_pkt {
        enum ice_fltr_ptype flow;
        u16 pkt_len;
@@ -217,6 +202,19 @@ struct ice_fdir_base_pkt {
        const u8 *tun_pkt;
 };
 
+enum ice_status ice_alloc_fd_res_cntr(struct ice_hw *hw, u16 *cntr_id);
+enum ice_status ice_free_fd_res_cntr(struct ice_hw *hw, u16 cntr_id);
+void ice_set_dflt_val_fd_desc(struct ice_fd_fltr_desc_ctx *fd_fltr_ctx);
+enum ice_status
+ice_alloc_fd_guar_item(struct ice_hw *hw, u16 *cntr_id, u16 num_fltr);
+enum ice_status
+ice_free_fd_guar_item(struct ice_hw *hw, u16 cntr_id, u16 num_fltr);
+enum ice_status
+ice_alloc_fd_shrd_item(struct ice_hw *hw, u16 *cntr_id, u16 num_fltr);
+enum ice_status
+ice_free_fd_shrd_item(struct ice_hw *hw, u16 cntr_id, u16 num_fltr);
+enum ice_status ice_clear_vsi_fd_table(struct ice_hw *hw, u16 vsi_num);
+enum ice_status ice_clear_pf_fd_table(struct ice_hw *hw);
 void
 ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,
                       struct ice_fltr_desc *fdesc, bool add);