patch 'net/nfp: fix firmware name derived from PCI name' has been queued to stable release 22.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.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/01/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=f029ceb7aaacc5aa941e8b7145fdf64b2bc338a5

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From f029ceb7aaacc5aa941e8b7145fdf64b2bc338a5 Mon Sep 17 00:00:00 2001
From: Peng Zhang <peng.zhang at corigine.com>
Date: Thu, 8 Dec 2022 11:31:16 +0800
Subject: [PATCH] net/nfp: fix firmware name derived from PCI name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 3ddb4cc0914a13d6dd47a497c1f61919b3ed1c20 ]

Driver looks for a firmware file whose name is derived from the PCI
name, the firmware file name format is described in the driver document.

But the firmware name used in the code is slightly different than the
name in documentation,
document has 'pci-0000:04:00.0.nffw' vs code has 'pci-04:00.0.nffw'.

After this commit, driver will look for firmware file consistent with
what is documented (in nfp.rst).

Fixes: 896c265ef954 ("net/nfp: use new CPP interface")

Signed-off-by: Peng Zhang <peng.zhang at corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund at corigine.com>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 drivers/net/nfp/nfp_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 0956ea81df..f22ae24b53 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -724,7 +724,7 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card)
 		goto load_fw;
 	/* Then try the PCI name */
 	snprintf(fw_name, sizeof(fw_name), "%s/pci-%s.nffw", DEFAULT_FW_PATH,
-			dev->device.name);
+			dev->name);

 	PMD_DRV_LOG(DEBUG, "Trying with fw file: %s", fw_name);
 	if (rte_firmware_read(fw_name, &fw_buf, &fsize) == 0)
--
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-27 14:08:41.813833500 +0800
+++ 0027-net-nfp-fix-firmware-name-derived-from-PCI-name.patch	2023-02-27 14:08:40.739237000 +0800
@@ -1 +1 @@
-From 3ddb4cc0914a13d6dd47a497c1f61919b3ed1c20 Mon Sep 17 00:00:00 2001
+From f029ceb7aaacc5aa941e8b7145fdf64b2bc338a5 Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 3ddb4cc0914a13d6dd47a497c1f61919b3ed1c20 ]
@@ -20 +22,0 @@
-Cc: stable at dpdk.org