From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E33B145B68; Fri, 18 Oct 2024 11:06:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 818B340A4B; Fri, 18 Oct 2024 11:06:11 +0200 (CEST) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mails.dpdk.org (Postfix) with ESMTP id E023E40A4B for ; Fri, 18 Oct 2024 11:06:09 +0200 (CEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-71e579abb99so1314721b3a.2 for ; Fri, 18 Oct 2024 02:06:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1729242369; x=1729847169; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NW8bdgc7haOZeNJYDvpu17X6ed8hfqjcBOgASm+aemo=; b=CcalY/6m7TQQwhIPiNpNy7JZI2tFhuGP0gvLx6MU3NxkH4A5i1EchuwC5o5oDX807J bGy1FzkLG6PT0Z7BeV8wpuXknfST082XylTNWDLZp8EHnQ0egf58aoXYfZ048ATaH+LP jgwy452UCUNIai9lfsyaF9uL8tHcnApMDWs4g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729242369; x=1729847169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NW8bdgc7haOZeNJYDvpu17X6ed8hfqjcBOgASm+aemo=; b=n7BPSCAislDa743LHWa2YgZcpcj4W9JxAycZgavnNrGW8+YyfPucQog8OlBEibjKKw g3e/8WCuxGOLNV5UvExqopd6u5Xd0KVUCuUjevKZG94G5291VowCxnheJSBUWPJ0pn6K 0Puk/mUni9JPx/mpvsyseS0hTWdqan+sXiZ0GAmSMQBwGYjwhAtO/QFBMv7OaImF3vH7 Yk00WH0ZHbOEDy7Punr0v/KrkP+p7oFl9bRjgH9OJDrOAFJHm8C8Xc8Jhjvl6jla+wNd wsLv8RX2WxpAnl/FOr9DB+twDuG8FWSxemNu+3wcy0FpfJL3GNNldpI7L2qChknkpeYC +I5g== X-Gm-Message-State: AOJu0YwzqmnlTnnn9IjcUUkXzcXix7WCoiuo/LY52fQHIs5LAt9yMGb+ jJuCzQMM5qiKl0Jjx5fHdcVrV0Diw1GC7ZDmC5SPWsIoV92zMRflyPIXBvRNeVfMgld3zqpT+dh F752gRUVyz+fEqVfUaxnSA5Lj9fCRABtr1GcsDEbklgE/SFQPIl+radAGwPiv3c2kA6skvNOsFp ZfUmJsYAp+tPFOChrQci7zmfhgpC+EbITeF3c9qLdLYg== X-Google-Smtp-Source: AGHT+IFYqdHgx+VQqRVZu1tx6l7gCq4OiD286jOFyuiC7vvLNbMY4rtWDQ3DB9s+9zwWjpwNSw/62Q== X-Received: by 2002:a05:6a00:2e27:b0:71e:79a9:ec55 with SMTP id d2e1a72fcca58-71ea31ae956mr2453553b3a.7.1729242368220; Fri, 18 Oct 2024 02:06:08 -0700 (PDT) Received: from dhcp-10-123-154-23.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71ea3311f45sm1009891b3a.14.2024.10.18.02.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 02:06:07 -0700 (PDT) From: Sriharsha Basavapatna To: dev@dpdk.org Cc: Kishore Padmanabha , Sriharsha Basavapatna , Michael Baucom , Ajit Khaparde Subject: [PATCH v5 41/47] net/bnxt: tf_ulp: support a few generic template items Date: Fri, 18 Oct 2024 14:41:18 +0530 Message-Id: <20241018091124.3373258-42-sriharsha.basavapatna@broadcom.com> X-Mailer: git-send-email 2.39.0.189.g4dbebc36b0 In-Reply-To: <20241018091124.3373258-1-sriharsha.basavapatna@broadcom.com> References: <20241018091124.3373258-1-sriharsha.basavapatna@broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Kishore Padmanabha This patch provides the following changes. support generic template items Add support for jump action, dynamic tunnels and flow priority to thor2 platform. fix generic application template The queue action is enabled for Thor2 platform. Enabled rejection check for every action template. Fixed dynamic vxlan ip tunnel configuration. fix vxlan ip customer tunnel The upar id is not populated correctly to set the tunnel id in the tcam table. fix compiler warnings This change fixes several compiler warnings. Signed-off-by: Kishore Padmanabha Signed-off-by: Sriharsha Basavapatna Reviewed-by: Michael Baucom Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c | 9 +++++++++ drivers/net/bnxt/tf_ulp/ulp_mapper.c | 11 +++-------- drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 12 ++++++++++++ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c index 3d48f42c1b..d30339393e 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c @@ -536,6 +536,15 @@ ulp_tfc_cntxt_app_caps_init(struct bnxt *bp, uint8_t app_id, uint32_t dev_id) } } ulp_ctx->cfg_data->feature_bits = info[i].feature_bits; + bnxt_ulp_default_app_priority_set(ulp_ctx, + info[i].default_priority); + bnxt_ulp_max_def_priority_set(ulp_ctx, + info[i].max_def_priority); + bnxt_ulp_min_flow_priority_set(ulp_ctx, + info[i].min_flow_priority); + bnxt_ulp_max_flow_priority_set(ulp_ctx, + info[i].max_flow_priority); + bnxt_ulp_cntxt_ptr2_default_class_bits_set(ulp_ctx, info[i].default_class_bits); bnxt_ulp_cntxt_ptr2_default_act_bits_set(ulp_ctx, diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c index f0d715d369..5dfe72df17 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c +++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c @@ -872,7 +872,7 @@ ulp_mapper_field_src_process(struct bnxt_ulp_mapper_parms *parms, struct bnxt_ulp_mapper_data *m; uint8_t bit; uint32_t port_id, val_size, field_size; - uint16_t idx, size_idx, offset; + uint16_t idx = 0, size_idx = 0, offset = 0; uint32_t bytelen = ULP_BITS_2_BYTE(bitlen); uint8_t *buffer; uint64_t lregval; @@ -1291,7 +1291,7 @@ ulp_mapper_field_opc_next(struct bnxt_ulp_mapper_parms *parms, const char *name) { struct bnxt_ulp_mapper_field_info *field_info; - uint16_t idx; + uint16_t idx = 0; /* read the cond table index and count */ if (unlikely(ulp_operand_read(field_opr, @@ -1594,7 +1594,7 @@ ulp_mapper_key_recipe_field_opc_next(struct bnxt_ulp_mapper_parms *parms, struct bnxt_ulp_mapper_field_info *ofld) { struct bnxt_ulp_mapper_field_info *field_info; - uint16_t idx; + uint16_t idx = 0; /* read the cond table index and count */ if (unlikely(ulp_operand_read(field_opr, @@ -3777,11 +3777,6 @@ ulp_mapper_cond_reject_list_process(struct bnxt_ulp_mapper_parms *parms, /* set the rejection result to accept */ *res = 0; - /* If act rej cond is not enabled then skip reject cond processing */ - if (parms->tmpl_type == BNXT_ULP_TEMPLATE_TYPE_ACTION && - !ULP_COMP_FLD_IDX_RD(parms, BNXT_ULP_CF_IDX_ACT_REJ_COND_EN)) - return rc; - /* get the reject condition list */ reject_info = ulp_mapper_tmpl_reject_list_get(parms, tid); diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c index 72d3514647..dbd8a118df 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c +++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c @@ -1298,6 +1298,7 @@ ulp_rte_l4_proto_type_update(struct ulp_rte_parser_params *params, enum bnxt_ulp_hdr_bit hdr_bit) { uint16_t stat_port = 0; + struct bnxt *bp; switch (hdr_bit) { case BNXT_ULP_HDR_BIT_I_UDP: @@ -1364,10 +1365,21 @@ ulp_rte_l4_proto_type_update(struct ulp_rte_parser_params *params, /* if udp and equal to static vxlan port then set tunnel bits*/ if (stat_port && dst_port == tfp_cpu_to_be_16(stat_port)) { + bp = bnxt_pmd_get_bp(params->port_id); + if (bp == NULL) { + BNXT_DRV_DBG(ERR, "Invalid bp\n"); + return; + } ULP_BITMAP_SET(params->hdr_fp_bit.bits, BNXT_ULP_HDR_BIT_T_VXLAN); ULP_BITMAP_SET(params->cf_bitmap, BNXT_ULP_CF_BIT_IS_TUNNEL); + if (bp->vxlan_ip_upar_in_use & + HWRM_TUNNEL_DST_PORT_QUERY_OUTPUT_UPAR_IN_USE_UPAR0) { + ULP_COMP_FLD_IDX_WR(params, + BNXT_ULP_CF_IDX_VXLAN_IP_UPAR_ID, + ULP_WP_SYM_TUN_HDR_TYPE_UPAR1); + } } } else { /* if dynamic Vxlan is enabled then skip dport checks */ -- 2.39.3