From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B591FA00BE; Fri, 12 Jun 2020 15:48:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 400E41C235; Fri, 12 Jun 2020 15:34:53 +0200 (CEST) Received: from relay.smtp.broadcom.com (relay.smtp.broadcom.com [192.19.232.149]) by dpdk.org (Postfix) with ESMTP id 260AF1C00D for ; Fri, 12 Jun 2020 15:34:49 +0200 (CEST) Received: from dhcp-10-123-153-55.dhcp.broadcom.net (dhcp-10-123-153-55.dhcp.broadcom.net [10.123.153.55]) by relay.smtp.broadcom.com (Postfix) with ESMTP id F3B2C1BD7BE; Fri, 12 Jun 2020 06:34:47 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 relay.smtp.broadcom.com F3B2C1BD7BE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1591968888; bh=Sa9vdT2sJ+0UfpV6ve0KWZzw7VgvJchuQitgbnx/8eM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rcdPeMAV2ykTciJ2z5yUEMkYI97rcEUKiRcMPEgMlqsMWm9fyVFzEdiah9JbKOsWS GVPaWlfEc9lJsBrgxjiFNPfcwHIVgE3WSu0snSLbrlzII9hQSQoMo0Xf6s7PjzKTW6 yAHmiYdifHAPyky016pwoMh8QV5MrRu6+CeYRVYw= From: Somnath Kotur To: dev@dpdk.org Cc: ferruh.yigit@intel.com Date: Fri, 12 Jun 2020 18:59:17 +0530 Message-Id: <20200612132934.16488-34-somnath.kotur@broadcom.com> X-Mailer: git-send-email 2.10.1.613.g2cc2e70 In-Reply-To: <20200612132934.16488-1-somnath.kotur@broadcom.com> References: <20200612132934.16488-1-somnath.kotur@broadcom.com> Subject: [dpdk-dev] [PATCH 33/50] net/bnxt: add support for internal encap records X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Mike Baucom Modifications to allow internal encap records to be supported: - Modified the mapper index table processing to handle encap without an action record - Modified the session open code to reserve some 64 Byte internal encap records on tx - Modified the blob encap swap to support encap without action record Signed-off-by: Mike Baucom Reviewed-by: Somnath Kotur Signed-off-by: Somnath Kotur Signed-off-by: Venkat Duvvuru --- drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 3 +++ drivers/net/bnxt/tf_ulp/ulp_mapper.c | 29 +++++++++++++---------------- drivers/net/bnxt/tf_ulp/ulp_utils.c | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c index a9ed5d9..4c1a1c4 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c @@ -113,6 +113,9 @@ ulp_ctx_session_open(struct bnxt *bp, resources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_FULL_ACT_RECORD] = 16; resources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_STATS_64] = 16; + /* ENCAP */ + resources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_ENCAP_64B] = 16; + /* TCAMs */ resources->tcam_cnt[TF_DIR_TX].cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM] = 8; resources->tcam_cnt[TF_DIR_TX].cnt[TF_TCAM_TBL_TYPE_PROF_TCAM] = 8; diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c index 394d4a1..c63f78a 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c +++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c @@ -1474,7 +1474,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms, flds = ulp_mapper_act_result_fields_get(tbl, &num_flds, &encap_flds); - if (!flds || !num_flds) { + if (!flds || (!num_flds && !encap_flds)) { BNXT_TF_DBG(ERR, "template undefined for the index table\n"); return -EINVAL; } @@ -1483,7 +1483,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms, for (i = 0; i < (num_flds + encap_flds); i++) { /* set the swap index if encap swap bit is enabled */ if (parms->device_params->encap_byte_swap && encap_flds && - ((i + 1) == num_flds)) + (i == num_flds)) ulp_blob_encap_swap_idx_set(&data); /* Process the result fields */ @@ -1496,18 +1496,15 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms, BNXT_TF_DBG(ERR, "data field failed\n"); return rc; } + } - /* if encap bit swap is enabled perform the bit swap */ - if (parms->device_params->encap_byte_swap && encap_flds) { - if ((i + 1) == (num_flds + encap_flds)) - ulp_blob_perform_encap_swap(&data); + /* if encap bit swap is enabled perform the bit swap */ + if (parms->device_params->encap_byte_swap && encap_flds) { + ulp_blob_perform_encap_swap(&data); #ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG - if ((i + 1) == (num_flds + encap_flds)) { - BNXT_TF_DBG(INFO, "Dump fter encap swap\n"); - ulp_mapper_blob_dump(&data); - } + BNXT_TF_DBG(INFO, "Dump after encap swap\n"); + ulp_mapper_blob_dump(&data); #endif - } } /* Perform the tf table allocation by filling the alloc params */ @@ -1818,6 +1815,11 @@ ulp_mapper_action_tbls_process(struct bnxt_ulp_mapper_parms *parms) switch (tbl->resource_func) { case BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE: rc = ulp_mapper_index_tbl_process(parms, tbl, false); + if (rc) { + BNXT_TF_DBG(ERR, "Resource type %d failed\n", + tbl->resource_func); + return rc; + } break; default: BNXT_TF_DBG(ERR, "Unexpected action resource %d\n", @@ -1825,11 +1827,6 @@ ulp_mapper_action_tbls_process(struct bnxt_ulp_mapper_parms *parms) return -EINVAL; } } - if (rc) { - BNXT_TF_DBG(ERR, "Resource type %d failed\n", - tbl->resource_func); - return rc; - } return rc; } diff --git a/drivers/net/bnxt/tf_ulp/ulp_utils.c b/drivers/net/bnxt/tf_ulp/ulp_utils.c index c6e4dc7..79958b2 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_utils.c +++ b/drivers/net/bnxt/tf_ulp/ulp_utils.c @@ -478,7 +478,7 @@ ulp_blob_perform_encap_swap(struct ulp_blob *blob) BNXT_TF_DBG(ERR, "invalid argument\n"); return; /* failure */ } - idx = ULP_BITS_2_BYTE_NR(blob->encap_swap_idx + 1); + idx = ULP_BITS_2_BYTE_NR(blob->encap_swap_idx); end_idx = ULP_BITS_2_BYTE(blob->write_idx); while (idx <= end_idx) { -- 2.7.4