[2/2] net/cnxk: use ROC errata API

Message ID 20220330084356.3614662-2-rbhansali@marvell.com (mailing list archive)
State Accepted, archived
Delegated to: Jerin Jacob
Headers
Series [1/2] common/cnxk: add ROC errata list |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/github-robot: build success github build: passed
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-abi-testing success Testing PASS
ci/intel-Testing success Testing PASS

Commit Message

Rahul Bhansali March 30, 2022, 8:43 a.m. UTC
  Used errata APIs roc_errata_nix_has_no_drop_re() and
roc_errata_nix_has_cq_min_size_4k() instead of direct
ROC model check.

Signed-off-by: Rahul Bhansali <rbhansali@marvell.com>
---
 drivers/net/cnxk/cn10k_ethdev.c | 4 +---
 drivers/net/cnxk/cn9k_ethdev.c  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
  

Comments

Jerin Jacob May 2, 2022, 6:33 p.m. UTC | #1
On Wed, Mar 30, 2022 at 2:14 PM Rahul Bhansali <rbhansali@marvell.com> wrote:
>
> Used errata APIs roc_errata_nix_has_no_drop_re() and
> roc_errata_nix_has_cq_min_size_4k() instead of direct
> ROC model check.
>
> Signed-off-by: Rahul Bhansali <rbhansali@marvell.com>


Series Acked-by: Jerin Jacob <jerinj@marvell.com>
Series applied to dpdk-next-net-mrvl/for-next-net. Thanks
> ---
>  drivers/net/cnxk/cn10k_ethdev.c | 4 +---
>  drivers/net/cnxk/cn9k_ethdev.c  | 2 +-
>  2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c
> index 15dbea2180..6f37bf5a4b 100644
> --- a/drivers/net/cnxk/cn10k_ethdev.c
> +++ b/drivers/net/cnxk/cn10k_ethdev.c
> @@ -778,9 +778,7 @@ cn10k_nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
>         /* DROP_RE is not supported with inline IPSec for CN10K A0 and
>          * when vector mode is enabled.
>          */
> -       if ((roc_model_is_cn10ka_a0() || roc_model_is_cnf10ka_a0() ||
> -            roc_model_is_cnf10kb_a0()) &&
> -           !roc_env_is_asim()) {
> +       if (roc_errata_nix_has_no_drop_re() && !roc_env_is_asim()) {
>                 dev->ipsecd_drop_re_dis = 1;
>                 dev->vec_drop_re_dis = 1;
>         }
> diff --git a/drivers/net/cnxk/cn9k_ethdev.c b/drivers/net/cnxk/cn9k_ethdev.c
> index eda33dc8c5..be1276180c 100644
> --- a/drivers/net/cnxk/cn9k_ethdev.c
> +++ b/drivers/net/cnxk/cn9k_ethdev.c
> @@ -737,7 +737,7 @@ cn9k_nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
>         roc_nix_ptp_info_cb_register(&dev->nix, cn9k_nix_ptp_info_update_cb);
>
>         /* Update HW erratas */
> -       if (roc_model_is_cn96_a0() || roc_model_is_cn95_a0())
> +       if (roc_errata_nix_has_cq_min_size_4k())
>                 dev->cq_min_4k = 1;
>         return 0;
>  }
> --
> 2.25.1
>
  

Patch

diff --git a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c
index 15dbea2180..6f37bf5a4b 100644
--- a/drivers/net/cnxk/cn10k_ethdev.c
+++ b/drivers/net/cnxk/cn10k_ethdev.c
@@ -778,9 +778,7 @@  cn10k_nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 	/* DROP_RE is not supported with inline IPSec for CN10K A0 and
 	 * when vector mode is enabled.
 	 */
-	if ((roc_model_is_cn10ka_a0() || roc_model_is_cnf10ka_a0() ||
-	     roc_model_is_cnf10kb_a0()) &&
-	    !roc_env_is_asim()) {
+	if (roc_errata_nix_has_no_drop_re() && !roc_env_is_asim()) {
 		dev->ipsecd_drop_re_dis = 1;
 		dev->vec_drop_re_dis = 1;
 	}
diff --git a/drivers/net/cnxk/cn9k_ethdev.c b/drivers/net/cnxk/cn9k_ethdev.c
index eda33dc8c5..be1276180c 100644
--- a/drivers/net/cnxk/cn9k_ethdev.c
+++ b/drivers/net/cnxk/cn9k_ethdev.c
@@ -737,7 +737,7 @@  cn9k_nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 	roc_nix_ptp_info_cb_register(&dev->nix, cn9k_nix_ptp_info_update_cb);
 
 	/* Update HW erratas */
-	if (roc_model_is_cn96_a0() || roc_model_is_cn95_a0())
+	if (roc_errata_nix_has_cq_min_size_4k())
 		dev->cq_min_4k = 1;
 	return 0;
 }