patch 'net/nfp: fix init failure handling' has been queued to stable release 24.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/12/25. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/fb93f6ea0b259314ad6b3ed147688a03fd977f43

Thanks.

Kevin

---
>From fb93f6ea0b259314ad6b3ed147688a03fd977f43 Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he at corigine.com>
Date: Wed, 26 Feb 2025 11:06:05 +0800
Subject: [PATCH] net/nfp: fix init failure handling

[ upstream commit 1992e3ffac00c61e41ba13d8c4808ced48c9e8da ]

Fix two bugs of error process logic.

Fixes: 19bd7cce5705 ("net/nfp: support different configuration BAR size")
Fixes: 636e133ec891 ("net/nfp: update Tx and Rx for multiple PF")

Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Peng Zhang <peng.zhang at corigine.com>
---
 drivers/net/nfp/nfp_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index b3d7bc301b..0c59ef82e8 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -2548,5 +2548,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
 	if (ret != 0) {
 		PMD_INIT_LOG(ERR, "Failed to init VF config.");
-		goto vf_cfg_tbl_cleanup;
+		goto mac_stats_cleanup;
 	}
 
@@ -2556,5 +2556,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
 		PMD_INIT_LOG(ERR, "PF register meta check function failed.");
 		ret = -EIO;
-		goto hw_priv_free;
+		goto vf_cfg_tbl_cleanup;
 	}
 
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-03-07 11:02:57.494481480 +0000
+++ 0016-net-nfp-fix-init-failure-handling.patch	2025-03-07 11:02:56.855335634 +0000
@@ -1 +1 @@
-From 1992e3ffac00c61e41ba13d8c4808ced48c9e8da Mon Sep 17 00:00:00 2001
+From fb93f6ea0b259314ad6b3ed147688a03fd977f43 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1992e3ffac00c61e41ba13d8c4808ced48c9e8da ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index b9cb9fc652..cbd1deffb4 100644
+index b3d7bc301b..0c59ef82e8 100644
@@ -22 +23 @@
-@@ -2550,5 +2550,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
+@@ -2548,5 +2548,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
@@ -29 +30 @@
-@@ -2558,5 +2558,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
+@@ -2556,5 +2556,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev)