From patchwork Mon Jul 6 08:24:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Somnath Kotur X-Patchwork-Id: 73201 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BAD02A00C5; Mon, 6 Jul 2020 10:30:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E8FC01DA62; Mon, 6 Jul 2020 10:30:10 +0200 (CEST) Received: from relay.smtp.broadcom.com (unknown [192.19.211.62]) by dpdk.org (Postfix) with ESMTP id B68A61D711 for ; Mon, 6 Jul 2020 10:30:03 +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 DCF58298429; Mon, 6 Jul 2020 01:30:02 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 relay.smtp.broadcom.com DCF58298429 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1594024203; bh=hQ9go81ojE0IzFTvW2fXjlJh3Qc9eZM6ERaObZqk154=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mx2NNQEaNuzTQ1x4JJiP4ZDnVr17D1MHWaRMFOkc8wzfd0ObC4TA/lpkPufEITwQs cj6fFxjJn0PCoNnbjM+BQA5Fj8uzeLEKwe5nzxhPEACkd6gXV5T6PlAIGpHt3f3whm lJ8aZS/tQvCBUrn/AcL5wgzc02sOopC7RgYpAfKQ= From: Somnath Kotur To: dev@dpdk.org Cc: ferruh.yigit@intel.com Date: Mon, 6 Jul 2020 13:54:45 +0530 Message-Id: <20200706082502.26935-4-somnath.kotur@broadcom.com> X-Mailer: git-send-email 2.10.1.613.g2cc2e70 In-Reply-To: <20200706082502.26935-1-somnath.kotur@broadcom.com> References: <20200706082502.26935-1-somnath.kotur@broadcom.com> Subject: [dpdk-dev] [PATCH 03/20] net/bnxt: add support for negative conditional opcodes 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: Kishore Padmanabha Added support for negative conditional opcodes in the mapper processing. Signed-off-by: Kishore Padmanabha Reviewed-by: Ajit Kumar Khaparde Reviewed-by: Michael Baucom Signed-off-by: Somnath Kotur Signed-off-by: Venkat Duvvuru --- drivers/net/bnxt/tf_ulp/ulp_mapper.c | 21 ++++++++++++++++++--- drivers/net/bnxt/tf_ulp/ulp_template_db_act.c | 6 +++--- drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h | 11 +++++++---- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c index 3f175fb..eb77328 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c +++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c @@ -2006,21 +2006,36 @@ ulp_mapper_tbl_cond_opcode_process(struct bnxt_ulp_mapper_parms *parms, case BNXT_ULP_COND_OPCODE_NOP: rc = 0; break; - case BNXT_ULP_COND_OPCODE_COMP_FIELD: + case BNXT_ULP_COND_OPCODE_COMP_FIELD_IS_SET: if (tbl->cond_operand < BNXT_ULP_CF_IDX_LAST && ULP_COMP_FLD_IDX_RD(parms, tbl->cond_operand)) rc = 0; break; - case BNXT_ULP_COND_OPCODE_ACTION_BIT: + case BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET: if (ULP_BITMAP_ISSET(parms->act_bitmap->bits, tbl->cond_operand)) rc = 0; break; - case BNXT_ULP_COND_OPCODE_HDR_BIT: + case BNXT_ULP_COND_OPCODE_HDR_BIT_IS_SET: if (ULP_BITMAP_ISSET(parms->hdr_bitmap->bits, tbl->cond_operand)) rc = 0; break; + case BNXT_ULP_COND_OPCODE_COMP_FIELD_NOT_SET: + if (tbl->cond_operand < BNXT_ULP_CF_IDX_LAST && + !ULP_COMP_FLD_IDX_RD(parms, tbl->cond_operand)) + rc = 0; + break; + case BNXT_ULP_COND_OPCODE_ACTION_BIT_NOT_SET: + if (!ULP_BITMAP_ISSET(parms->act_bitmap->bits, + tbl->cond_operand)) + rc = 0; + break; + case BNXT_ULP_COND_OPCODE_HDR_BIT_NOT_SET: + if (!ULP_BITMAP_ISSET(parms->hdr_bitmap->bits, + tbl->cond_operand)) + rc = 0; + break; default: BNXT_TF_DBG(ERR, "Invalid arg in mapper tbl for cond opcode\n"); diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c index 3d65073..c587ff5 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c @@ -284,7 +284,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_tbl_list[] = { .resource_type = TF_TBL_TYPE_ACT_STATS_64, .resource_sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_INT_COUNT, - .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT, + .cond_opcode = BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET, .cond_operand = BNXT_ULP_ACTION_BIT_COUNT, .direction = TF_DIR_RX, .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, @@ -331,7 +331,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_tbl_list[] = { .resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4, .resource_sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .cond_opcode = BNXT_ULP_COND_OPCODE_COMP_FIELD, + .cond_opcode = BNXT_ULP_COND_OPCODE_COMP_FIELD_IS_SET, .cond_operand = BNXT_ULP_CF_IDX_ACT_ENCAP_IPV4_FLAG, .direction = TF_DIR_TX, .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, @@ -348,7 +348,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_tbl_list[] = { .resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4, .resource_sub_type = BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TYPE_NORMAL, - .cond_opcode = BNXT_ULP_COND_OPCODE_COMP_FIELD, + .cond_opcode = BNXT_ULP_COND_OPCODE_COMP_FIELD_IS_SET, .cond_operand = BNXT_ULP_CF_IDX_ACT_ENCAP_IPV6_FLAG, .direction = TF_DIR_TX, .srch_b4_alloc = BNXT_ULP_SEARCH_BEFORE_ALLOC_NO, diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h index e13d20b..6d6a734 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h @@ -127,10 +127,13 @@ enum bnxt_ulp_cf_idx { enum bnxt_ulp_cond_opcode { BNXT_ULP_COND_OPCODE_NOP = 0, - BNXT_ULP_COND_OPCODE_COMP_FIELD = 1, - BNXT_ULP_COND_OPCODE_ACTION_BIT = 2, - BNXT_ULP_COND_OPCODE_HDR_BIT = 3, - BNXT_ULP_COND_OPCODE_LAST = 4 + BNXT_ULP_COND_OPCODE_COMP_FIELD_IS_SET = 1, + BNXT_ULP_COND_OPCODE_ACTION_BIT_IS_SET = 2, + BNXT_ULP_COND_OPCODE_HDR_BIT_IS_SET = 3, + BNXT_ULP_COND_OPCODE_COMP_FIELD_NOT_SET = 4, + BNXT_ULP_COND_OPCODE_ACTION_BIT_NOT_SET = 5, + BNXT_ULP_COND_OPCODE_HDR_BIT_NOT_SET = 6, + BNXT_ULP_COND_OPCODE_LAST = 7 }; enum bnxt_ulp_critical_resource {