patch 'net/nfp: compose firmware file name with new hwinfo' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/01/22. 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/45ae1b821d35cb4727a11e691a4f486fa2d7b048

Thanks.

Kevin

---
>From 45ae1b821d35cb4727a11e691a4f486fa2d7b048 Mon Sep 17 00:00:00 2001
From: Peng Zhang <peng.zhang at corigine.com>
Date: Tue, 2 Aug 2022 15:55:03 +0800
Subject: [PATCH] net/nfp: compose firmware file name with new hwinfo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 06be30d4763cad78caa156da446f759eac89cd72 ]

During initialization of the NFP driver, a file name for loading
application firmware is composed using the NIC's AMDA information and
port type (count and speed). E.g.: "nic_AMDA0145-1012_2x10.nffw".

In practice there may be many variants for each NIC type, and many of
the variants relate to assembly components which do not concern the
driver and application firmware implementation. Yet the current scheme
leads to a different application firmware file name for each variant,
because they have different AMDA information.

To reduce proliferation of content-duplicated application firmware
images or symlinks, the NIC's management firmware will only expose
differences between variants that need different application firmware
via a newly introduced hwinfo, "nffw.partno".

Use of the existing hwinfo, "assembly.partno", is maintained in order to
support for NICs with management firmware that does not expose
"nffw.partno".

Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file")

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>
---
 drivers/net/nfp/nfp_ethdev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 1a9f7581a7..67a77f0567 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -666,5 +666,7 @@ nfp_fw_setup(struct rte_pci_device *dev, struct nfp_cpp *cpp,
 	int err = 0;
 
-	nfp_fw_model = nfp_hwinfo_lookup(hwinfo, "assembly.partno");
+	nfp_fw_model = nfp_hwinfo_lookup(hwinfo, "nffw.partno");
+	if (nfp_fw_model == NULL)
+		nfp_fw_model = nfp_hwinfo_lookup(hwinfo, "assembly.partno");
 
 	if (nfp_fw_model) {
-- 
2.37.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-10-25 14:18:58.767401387 +0100
+++ 0008-net-nfp-compose-firmware-file-name-with-new-hwinfo.patch	2022-10-25 14:18:58.360797908 +0100
@@ -1 +1 @@
-From 06be30d4763cad78caa156da446f759eac89cd72 Mon Sep 17 00:00:00 2001
+From 45ae1b821d35cb4727a11e691a4f486fa2d7b048 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 06be30d4763cad78caa156da446f759eac89cd72 ]
+
@@ -29 +30,0 @@
-Cc: stable at dpdk.org
@@ -39 +40 @@
-index 47359501bc..dffecc3369 100644
+index 1a9f7581a7..67a77f0567 100644
@@ -42 +43 @@
-@@ -681,5 +681,7 @@ nfp_fw_setup(struct rte_pci_device *dev,
+@@ -666,5 +666,7 @@ nfp_fw_setup(struct rte_pci_device *dev, struct nfp_cpp *cpp,