* [dpdk-dev] [PATCH] net/bnxt: fix incorrect action record calculation
@ 2021-07-31 4:48 Ajit Khaparde
2021-07-31 9:25 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
0 siblings, 1 reply; 5+ messages in thread
From: Ajit Khaparde @ 2021-07-31 4:48 UTC (permalink / raw)
To: dev; +Cc: stable, Shuanglin Wang
[-- Attachment #1: Type: text/plain, Size: 6647 bytes --]
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
Tested-by: Shuanglin Wang <shuanglin.wang@broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
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)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH] net/bnxt: fix incorrect action record calculation
2021-07-31 4:48 [dpdk-dev] [PATCH] net/bnxt: fix incorrect action record calculation Ajit Khaparde
@ 2021-07-31 9:25 ` Thomas Monjalon
2021-07-31 14:49 ` Ajit Khaparde
2021-07-31 14:49 ` [dpdk-dev] " Ajit Khaparde
0 siblings, 2 replies; 5+ messages in thread
From: Thomas Monjalon @ 2021-07-31 9:25 UTC (permalink / raw)
To: Ajit Khaparde; +Cc: dev, stable, Shuanglin Wang, ferruh.yigit
31/07/2021 06:48, Ajit Khaparde:
> 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
>
> Tested-by: Shuanglin Wang <shuanglin.wang@broadcom.com>
> Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
This block should be in chronological order,
so the test comes after the Sign-off.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH] net/bnxt: fix incorrect action record calculation
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
1 sibling, 0 replies; 5+ messages in thread
From: Ajit Khaparde @ 2021-07-31 14:49 UTC (permalink / raw)
To: Thomas Monjalon; +Cc: dpdk-dev, dpdk stable, Shuanglin Wang, Ferruh Yigit
[-- Attachment #1: Type: text/plain, Size: 868 bytes --]
On Sat, Jul 31, 2021 at 2:25 AM Thomas Monjalon <thomas@monjalon.net> wrote:
>
> 31/07/2021 06:48, Ajit Khaparde:
> > 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
> >
> > Tested-by: Shuanglin Wang <shuanglin.wang@broadcom.com>
> > Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
>
> This block should be in chronological order,
> so the test comes after the Sign-off.
I had cleaned it up. But the automated script put it in the end
and I missed it.
Sending a v2 with that fixed.
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [dpdk-dev] [PATCH] net/bnxt: fix incorrect action record calculation
2021-07-31 9:25 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2021-07-31 14:49 ` Ajit Khaparde
@ 2021-07-31 14:49 ` Ajit Khaparde
2021-07-31 14:58 ` Ajit Khaparde
1 sibling, 1 reply; 5+ messages in thread
From: Ajit Khaparde @ 2021-07-31 14:49 UTC (permalink / raw)
To: dev; +Cc: stable, Shuanglin Wang
[-- Attachment #1: Type: text/plain, Size: 6647 bytes --]
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>
---
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)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-dev] [PATCH] net/bnxt: fix incorrect action record calculation
2021-07-31 14:49 ` [dpdk-dev] " Ajit Khaparde
@ 2021-07-31 14:58 ` Ajit Khaparde
0 siblings, 0 replies; 5+ messages in thread
From: Ajit Khaparde @ 2021-07-31 14:58 UTC (permalink / raw)
To: dpdk-dev; +Cc: dpdk stable, Shuanglin Wang, Thomas Monjalon
[-- 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)
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-07-31 14:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).