ethdev: promote sibling iterators to stable

[dpdk.git] / drivers / net / bnxt / tf_ulp / ulp_mapper.h

diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.h b/drivers/net/bnxt/tf_ulp/ulp_mapper.h
index 8422f44..004e89a 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.h
@@ -18,29 +18,16 @@
 
 #define ULP_IDENTS_INVALID ((uint16_t)0xffff)
 
-/*
- * The cache table opcode is used to convey informat from the cache handler
- * to the tcam handler.  The opcodes do the following:
- * NORMAL - tcam should process all instructions as normal
- * SKIP - tcam is using the cached entry and doesn't need to process the
- *     instruction.
- * ALLOC - tcam needs to allocate the tcam index and store in the cache entry
- */
-enum bnxt_ulp_cache_table_opc {
-       BNXT_ULP_MAPPER_TCAM_TBL_OPC_NORMAL,
-       BNXT_ULP_MAPPER_TCAM_TBL_OPC_CACHE_SKIP,
-       BNXT_ULP_MAPPER_TCAM_TBL_OPC_CACHE_ALLOC
-};
-
 struct bnxt_ulp_mapper_glb_resource_entry {
        enum bnxt_ulp_resource_func     resource_func;
        uint32_t                        resource_type; /* TF_ enum type */
        uint64_t                        resource_hndl;
+       bool                            shared;
 };
 
 struct bnxt_ulp_mapper_data {
        struct bnxt_ulp_mapper_glb_resource_entry
-               glb_res_tbl[TF_DIR_MAX][BNXT_ULP_GLB_RESOURCE_TBL_MAX_SZ];
+               glb_res_tbl[TF_DIR_MAX][BNXT_ULP_GLB_RF_IDX_LAST];
        struct ulp_mapper_gen_tbl_list gen_tbl_list[BNXT_ULP_GEN_TBL_MAX_SZ];
 };
 
@@ -58,27 +45,33 @@ struct bnxt_ulp_mapper_parms {
        struct ulp_rte_act_bitmap               *act_bitmap;
        struct ulp_rte_hdr_bitmap               *hdr_bitmap;
        struct ulp_rte_hdr_field                *hdr_field;
-       uint32_t                                *comp_fld;
+       struct ulp_rte_field_bitmap             *fld_bitmap;
+       uint64_t                                *comp_fld;
        struct ulp_regfile                      *regfile;
-       struct tf                               *tfp;
        struct bnxt_ulp_context                 *ulp_ctx;
        uint32_t                                fid;
        enum bnxt_ulp_fdb_type                  flow_type;
        struct bnxt_ulp_mapper_data             *mapper_data;
-       enum bnxt_ulp_cache_table_opc           tcam_tbl_opc;
        struct bnxt_ulp_device_params           *device_params;
        uint32_t                                parent_fid;
        uint32_t                                parent_flow;
        uint8_t                                 tun_idx;
+       uint32_t                                app_priority;
+       uint64_t                                shared_hndl;
+       uint32_t                                flow_pattern_id;
+       uint32_t                                act_pattern_id;
+       uint8_t                                 app_id;
+       uint16_t                                port_id;
 };
 
 struct bnxt_ulp_mapper_create_parms {
        uint32_t                        app_priority;
        struct ulp_rte_hdr_bitmap       *hdr_bitmap;
        struct ulp_rte_hdr_field        *hdr_field;
-       uint32_t                        *comp_fld;
+       uint64_t                        *comp_fld;
        struct ulp_rte_act_bitmap       *act;
        struct ulp_rte_act_prop         *act_prop;
+       struct ulp_rte_field_bitmap     *fld_bitmap;
        uint32_t                        class_tid;
        uint32_t                        act_tid;
        uint16_t                        func_id;
@@ -91,6 +84,13 @@ struct bnxt_ulp_mapper_create_parms {
        /* if set then create a parent flow */
        uint32_t                        parent_flow;
        uint8_t                         tun_idx;
+       uint64_t                        shared_hndl;
+
+       /* support pattern based rejection */
+       uint32_t                        flow_pattern_id;
+       uint32_t                        act_pattern_id;
+       uint8_t                         app_id;
+       uint16_t                        port_id;
 };
 
 /* Function to initialize any dynamic mapper data. */
@@ -124,4 +124,10 @@ ulp_mapper_resources_free(struct bnxt_ulp_context *ulp_ctx,
                          enum bnxt_ulp_fdb_type flow_type,
                          uint32_t fid);
 
+int32_t
+ulp_mapper_get_shared_fid(struct bnxt_ulp_context *ulp,
+                         uint32_t id,
+                         uint16_t key,
+                         uint32_t *fid);
+
 #endif /* _ULP_MAPPER_H_ */