From: Ajit Khaparde <ajit.khaparde@broadcom.com>
To: dpdk-dev <dev@dpdk.org>
Cc: dpdk stable <stable@dpdk.org>,
Shuanglin Wang <shuanglin.wang@broadcom.com>,
Thomas Monjalon <thomas@monjalon.net>
Subject: Re: [dpdk-dev] [PATCH] net/bnxt: fix incorrect action record calculation
Date: Sat, 31 Jul 2021 07:58:39 -0700 [thread overview]
Message-ID: <CACZ4nhtmXSB6MjL8fWX7WMe0RgHOEr0zJUwY721Od_6soSvReg@mail.gmail.com> (raw)
In-Reply-To: <20210731144934.53308-1-ajit.khaparde@broadcom.com>
[-- Attachment #1: Type: text/plain, Size: 9295 bytes --]
On Sat, Jul 31, 2021 at 7:49 AM Ajit Khaparde
<ajit.khaparde@broadcom.com> 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 <ajit.khaparde@broadcom.com>
> Tested-by: Shuanglin Wang <shuanglin.wang@broadcom.com>
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)
>
prev parent reply other threads:[~2021-07-31 14:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-31 4:48 [dpdk-dev] [PATCH] net/bnxt: fix incorrect action record calculation Ajit Khaparde
2021-07-31 9:25 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2021-07-31 14:49 ` Ajit Khaparde
2021-07-31 14:49 ` [dpdk-dev] " Ajit Khaparde
2021-07-31 14:58 ` Ajit Khaparde [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACZ4nhtmXSB6MjL8fWX7WMe0RgHOEr0zJUwY721Od_6soSvReg@mail.gmail.com \
--to=ajit.khaparde@broadcom.com \
--cc=dev@dpdk.org \
--cc=shuanglin.wang@broadcom.com \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.