net/bnxt: support NAT for dest IP and port combination

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

diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index 059ee99..7774a55 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -22,11 +22,6 @@
 #include "ulp_ha_mgr.h"
 #include "bnxt_tf_pmd_shim.h"
 
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#include "ulp_template_debug_proto.h"
-#include "ulp_tf_debug.h"
-#endif
-
 static uint8_t mapper_fld_zeros[16] = { 0 };
 
 static uint8_t mapper_fld_ones[16] = {
@@ -161,13 +156,6 @@ ulp_mapper_resource_ident_allocate(struct bnxt_ulp_context *ulp_ctx,
                tf_free_identifier(tfp, &fparms);
                return rc;
        }
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-       BNXT_TF_DBG(DEBUG, "Allocated Glb Res Ident [%s][%d][%d] = 0x%04x\n",
-                   tf_dir_2_str(iparms.dir),
-                   glb_res->glb_regfile_index, iparms.ident_type, iparms.id);
-#endif
-#endif
        return rc;
 }
 
@@ -228,13 +216,6 @@ ulp_mapper_resource_index_tbl_alloc(struct bnxt_ulp_context *ulp_ctx,
                tf_free_tbl_entry(tfp, &free_parms);
                return rc;
        }
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-       BNXT_TF_DBG(DEBUG, "Allocated Glb Res Index [%s][%d][%d] = 0x%04x\n",
-                   tf_dir_2_str(aparms.dir),
-                   glb_res->glb_regfile_index, aparms.type, aparms.idx);
-#endif
-#endif
        return rc;
 }
 
@@ -884,11 +865,6 @@ ulp_mapper_ident_process(struct bnxt_ulp_mapper_parms *parms,
        } else {
                *val = iparms.id;
        }
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-       ulp_mapper_ident_field_dump("Ident", ident, tbl, iparms.id);
-#endif
-#endif
        return 0;
 
 error:
@@ -984,11 +960,6 @@ ulp_mapper_ident_extract(struct bnxt_ulp_mapper_parms *parms,
                goto error;
        }
 
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-       ulp_mapper_ident_field_dump("Ident", ident, tbl, sparms.search_id);
-#endif
-#endif
        return 0;
 
 error:
@@ -1575,13 +1546,6 @@ ulp_mapper_field_opc_process(struct bnxt_ulp_mapper_parms *parms,
        }
 
        if (!rc) {
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-               if (fld->field_src1 != BNXT_ULP_FIELD_SRC_ZERO && val_len)
-                       ulp_mapper_field_dump(name, fld, blob, write_idx, val,
-                                             val_len);
-#endif
-#endif
                return rc;
        }
 error:
@@ -1680,12 +1644,6 @@ ulp_mapper_tbl_result_build(struct bnxt_ulp_mapper_parms *parms,
                        return rc;
                }
        }
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-       BNXT_TF_DBG(DEBUG, "Result dump\n");
-       ulp_mapper_blob_dump(data);
-#endif
-#endif
        return rc;
 }
 
@@ -1919,11 +1877,6 @@ ulp_mapper_tcam_tbl_entry_write(struct bnxt_ulp_mapper_parms *parms,
                return rc;
        }
 
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-       ulp_mapper_tcam_entry_dump("TCAM", idx, tbl, key, mask, data);
-#endif
-#endif
        return rc;
 }
 
@@ -2029,12 +1982,6 @@ static void ulp_mapper_wc_tcam_tbl_post_process(struct ulp_blob *blob)
 {
        ulp_blob_perform_64B_word_swap(blob);
        ulp_blob_perform_64B_byte_swap(blob);
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-       BNXT_TF_DBG(INFO, "Dump after wc tcam post process\n");
-       ulp_mapper_blob_dump(blob);
-#endif
-#endif
 }
 
 static int32_t ulp_mapper_tcam_is_wc_tcam(struct bnxt_ulp_mapper_tbl_info *tbl)
@@ -2353,11 +2300,6 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,
                BNXT_TF_DBG(ERR, "Failed to build the result blob\n");
                return rc;
        }
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-       ulp_mapper_result_dump("EM Result", tbl, &data);
-#endif
-#endif
        if (dparms->dynamic_pad_en) {
                uint32_t abits = dparms->em_blk_align_bits;
 
@@ -2372,11 +2314,6 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,
                ulp_blob_pad_align(&data, abits);
 
                ulp_blob_perform_byte_reverse(&data, ULP_BITS_2_BYTE(abits));
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-       ulp_mapper_result_dump("EM Merged Result", tbl, &data);
-#endif
-#endif
        }
 
        /* do the transpose for the internal EM keys */
@@ -2389,11 +2326,6 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,
                }
                tmplen = ulp_blob_data_len_get(&key);
                ulp_blob_perform_byte_reverse(&key, ULP_BITS_2_BYTE(tmplen));
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-       ulp_mapper_result_dump("EM Key Transpose", tbl, &key);
-#endif
-#endif
        }
 
        rc = bnxt_ulp_cntxt_tbl_scope_id_get(parms->ulp_ctx,
@@ -2424,12 +2356,6 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,
                return rc;
        }
 
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-       ulp_mapper_em_dump("EM", &key, &data, &iparms);
-       /* tf_dump_tables(tfp, iparms.tbl_scope_id); */
-#endif
-#endif
        /* Mark action process */
        if (mtype == BNXT_ULP_FLOW_MEM_TYPE_EXT &&
            tbl->resource_type == TF_MEM_EXTERNAL)
@@ -2946,11 +2872,6 @@ ulp_mapper_gen_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 
        /* The_key is a byte array convert it to a search index */
        cache_key = ulp_blob_data_get(&key, &tmplen);
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-       ulp_mapper_gen_tbl_dump(tbl->resource_sub_type, tbl->direction, &key);
-#endif
-#endif
        /* get the generic table  */
        gen_tbl_list = &parms->mapper_data->gen_tbl_list[tbl_idx];
 
@@ -3760,11 +3681,6 @@ ulp_mapper_tbls_process(struct bnxt_ulp_mapper_parms *parms, uint32_t tid)
        for (tbl_idx = 0; tbl_idx < num_tbls && cond_goto;) {
                tbl = &tbls[tbl_idx];
                cond_goto = tbl->execute_info.cond_true_goto;
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
-#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG_MAPPER
-               ulp_mapper_table_dump(tbl, tbl_idx);
-#endif
-#endif
                /* Process the conditional func code opcodes */
                if (ulp_mapper_func_info_process(parms, tbl)) {
                        BNXT_TF_DBG(ERR, "Failed to process cond update\n");