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 64448A0547 for ; Sat, 31 Jul 2021 16:58:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3946840042; Sat, 31 Jul 2021 16:58:58 +0200 (CEST) Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by mails.dpdk.org (Postfix) with ESMTP id 6264940042 for ; Sat, 31 Jul 2021 16:58:57 +0200 (CEST) Received: by mail-qk1-f172.google.com with SMTP id b20so12415008qkj.3 for ; Sat, 31 Jul 2021 07:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=vJHJ9JOToILXTMEHZKT3l8jv5Us84myraXp4pngwVsU=; b=R6i9QqK+aZ/7oWMgSwsAan7MCQ4UlJo6G/ioqUsdKdWW8TAHdxqbXNOqSIZlDpRHcU LmnzlMGE44FWjgUaXzl+rcvESciKIUGDuQdNGrjqrCvgPes0pDwIQ3jeeToIVDaKPRLd GoxI3/eaboNviLpK1DoT5uQUqy0NeOsvy5Ksw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=vJHJ9JOToILXTMEHZKT3l8jv5Us84myraXp4pngwVsU=; b=Wow+5W1BjCC79Wa70mQS+f+LnxblxckQ+JNcqRXn2OGfcJxNurhWHkkQYMR1DZsBQf qB+eUV6zjfz2dYue/1MiVkC75bA3LiJz7MepcM2uFkQVR7Fmc41BpULBZNOv5iFfnDSc XQICF41dJ/bNaRoq9p5OViGlAyfLv/CCNnt9qJyeitC9tCyU9W/q8sG7s+Zo6gFiCZpY ew3RslUMNCKKrlgHMbNBWJ4DL/GWMD3SJwwyuQ11rLj031iJ84BLFaMM64TrAcLVIET3 S13GGLvDd3aYgIqyo+bxXG84GiYtUTd+TPOJNQGvVfsdCe4IDMyFyXEp980Ah77GxdTz h/mQ== X-Gm-Message-State: AOAM533rTlkP/ZTyXBm3mccC7alyj0mDm2SabYFT/qp47gRKebUPTzMg v+I73lmkTTLGHJMui1zx4pwMOnSHBG537NFn1/TyiQ== X-Google-Smtp-Source: ABdhPJxFCQ8jXM5s1VsC29fqSE0ihfqjpNdla/SyfTXGcEUErrQAEYj8FkHYhqxYWDSoQOhOay6TgYl3Qhak0Ilunv4= X-Received: by 2002:a05:620a:120b:: with SMTP id u11mr7168110qkj.455.1627743536702; Sat, 31 Jul 2021 07:58:56 -0700 (PDT) MIME-Version: 1.0 References: <1666615.EP5RLiGz2i@thomas> <20210731144934.53308-1-ajit.khaparde@broadcom.com> In-Reply-To: <20210731144934.53308-1-ajit.khaparde@broadcom.com> From: Ajit Khaparde Date: Sat, 31 Jul 2021 07:58:39 -0700 Message-ID: To: dpdk-dev Cc: dpdk stable , Shuanglin Wang , Thomas Monjalon Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="0000000000004e8b1805c86c9350" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [dpdk-stable] [PATCH] net/bnxt: fix incorrect action record calculation X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" --0000000000004e8b1805c86c9350 Content-Type: text/plain; charset="UTF-8" On Sat, Jul 31, 2021 at 7:49 AM Ajit Khaparde wrote: > > For Thor, the number of action records is being wrongly configured > to 128 because of incorrect definition of divider. This results in > an incorrect number of action records being negotiated with the FW. > Remove the divider from the templates and delete the logic which > uses the field in the resource manager logic. > > Fixes: 3fe124d2536c ("net/bnxt: support Thor platform") > Cc: stable@dpdk.org > > Signed-off-by: Ajit Khaparde > Tested-by: Shuanglin Wang Patch applied to dpdk-next-net-brcm. > --- > drivers/net/bnxt/tf_core/tf_device_p58.h | 14 ------------ > drivers/net/bnxt/tf_core/tf_rm.c | 22 ------------------- > .../generic_templates/ulp_template_db_tbl.c | 2 +- > 3 files changed, 1 insertion(+), 37 deletions(-) > > diff --git a/drivers/net/bnxt/tf_core/tf_device_p58.h b/drivers/net/bnxt/tf_core/tf_device_p58.h > index b5e2598cb6..66b0f4e983 100644 > --- a/drivers/net/bnxt/tf_core/tf_device_p58.h > +++ b/drivers/net/bnxt/tf_core/tf_device_p58.h > @@ -84,42 +84,36 @@ struct tf_rm_element_cfg tf_tbl_p58[TF_TBL_TYPE_MAX] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_PARENT, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_1, > .slices = 1, > - .divider = 8, > }, > [TF_TBL_TYPE_COMPACT_ACT_RECORD] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_CHILD, > .parent_subtype = TF_TBL_TYPE_FULL_ACT_RECORD, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_1, > .slices = 1, > - .divider = 8, > }, > /* Policy - Encaps in bank 2 */ > [TF_TBL_TYPE_ACT_ENCAP_8B] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_PARENT, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_2, > .slices = 1, > - .divider = 8, > }, > [TF_TBL_TYPE_ACT_ENCAP_16B] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_CHILD, > .parent_subtype = TF_TBL_TYPE_ACT_ENCAP_8B, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_2, > .slices = 1, > - .divider = 8, > }, > [TF_TBL_TYPE_ACT_ENCAP_32B] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_CHILD, > .parent_subtype = TF_TBL_TYPE_ACT_ENCAP_8B, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_2, > .slices = 1, > - .divider = 8, > }, > [TF_TBL_TYPE_ACT_ENCAP_64B] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_CHILD, > .parent_subtype = TF_TBL_TYPE_ACT_ENCAP_8B, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_2, > .slices = 1, > - .divider = 8, > }, > /* Policy - Modify in bank 2 with Encaps */ > [TF_TBL_TYPE_ACT_MODIFY_8B] = { > @@ -127,56 +121,48 @@ struct tf_rm_element_cfg tf_tbl_p58[TF_TBL_TYPE_MAX] = { > .parent_subtype = TF_TBL_TYPE_ACT_ENCAP_8B, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_2, > .slices = 1, > - .divider = 8, > }, > [TF_TBL_TYPE_ACT_MODIFY_16B] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_CHILD, > .parent_subtype = TF_TBL_TYPE_ACT_ENCAP_8B, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_2, > .slices = 1, > - .divider = 8, > }, > [TF_TBL_TYPE_ACT_MODIFY_32B] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_CHILD, > .parent_subtype = TF_TBL_TYPE_ACT_ENCAP_8B, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_2, > .slices = 1, > - .divider = 8, > }, > [TF_TBL_TYPE_ACT_MODIFY_64B] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_CHILD, > .parent_subtype = TF_TBL_TYPE_ACT_ENCAP_8B, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_2, > .slices = 1, > - .divider = 8, > }, > /* Policy - SP in bank 0 */ > [TF_TBL_TYPE_ACT_SP_SMAC] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_PARENT, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_0, > .slices = 1, > - .divider = 8, > }, > [TF_TBL_TYPE_ACT_SP_SMAC_IPV4] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_CHILD, > .parent_subtype = TF_TBL_TYPE_ACT_SP_SMAC, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_0, > .slices = 1, > - .divider = 8, > }, > [TF_TBL_TYPE_ACT_SP_SMAC_IPV6] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_CHILD, > .parent_subtype = TF_TBL_TYPE_ACT_SP_SMAC, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_0, > .slices = 1, > - .divider = 8, > }, > /* Policy - Stats in bank 3 */ > [TF_TBL_TYPE_ACT_STATS_64] = { > .cfg_type = TF_RM_ELEM_CFG_HCAPI_BA_PARENT, > .hcapi_type = CFA_RESOURCE_TYPE_P58_SRAM_BANK_3, > .slices = 1, > - .divider = 8, > }, > }; > > diff --git a/drivers/net/bnxt/tf_core/tf_rm.c b/drivers/net/bnxt/tf_core/tf_rm.c > index dcfba24b2c..0a46e2a343 100644 > --- a/drivers/net/bnxt/tf_core/tf_rm.c > +++ b/drivers/net/bnxt/tf_core/tf_rm.c > @@ -624,17 +624,6 @@ tf_rm_create_db(struct tf *tfp, > /* Only allocate BA pool if a BA type not a child */ > if (cfg->cfg_type == TF_RM_ELEM_CFG_HCAPI_BA || > cfg->cfg_type == TF_RM_ELEM_CFG_HCAPI_BA_PARENT) { > - if (cfg->divider) { > - resv[j].stride = > - resv[j].stride / cfg->divider; > - if (resv[j].stride <= 0) { > - TFP_DRV_LOG(ERR, > - "%s:Divide fails:%d:%s\n", > - tf_dir_2_str(parms->dir), > - cfg->hcapi_type, type_str); > - goto fail; > - } > - } > /* Create pool */ > pool_size = (BITALLOC_SIZEOF(resv[j].stride) / > sizeof(struct bitalloc)); > @@ -868,17 +857,6 @@ tf_rm_create_db_no_reservation(struct tf *tfp, > /* Only allocate BA pool if a BA type not a child */ > if (cfg->cfg_type == TF_RM_ELEM_CFG_HCAPI_BA || > cfg->cfg_type == TF_RM_ELEM_CFG_HCAPI_BA_PARENT) { > - if (cfg->divider) { > - resv[j].stride = > - resv[j].stride / cfg->divider; > - if (resv[j].stride <= 0) { > - TFP_DRV_LOG(ERR, > - "%s:Divide fails:%d:%s\n", > - tf_dir_2_str(parms->dir), > - cfg->hcapi_type, type_str); > - goto fail; > - } > - } > /* Create pool */ > pool_size = (BITALLOC_SIZEOF(resv[j].stride) / > sizeof(struct bitalloc)); > diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c > index 7951de8a4e..2debaea0ca 100644 > --- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c > +++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c > @@ -1450,7 +1450,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = { > .direction = TF_DIR_RX, > .resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE, > .resource_type = TF_TBL_TYPE_FULL_ACT_RECORD, > - .count = 1024 > + .count = 2048 > }, > { > .app_id = 0, > -- > 2.21.1 (Apple Git-122.3) > --0000000000004e8b1805c86c9350--