[PATCH] net/nfp: using the correct PCI name to look for the firmware

[PATCH] net/nfp: using the correct PCI name to look for the firmware

[Chaoyong He]

From: Peng Zhang <peng.zhang@corigine.com>

In the description of nfp document, DPDK PMD supports that the PF
looks for a firmware file by the PCI name.

After this commit, it will looks for the PCI name format such as
pci-0000:04:00.0.nffw rather than pci-04:00.0.nffw, which will
keep consistent with what is written in the nfp.rst.

Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.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.29.3

Re: [PATCH] net/nfp: using the correct PCI name to look for the firmware

[Ferruh Yigit]

On 11/28/2022 2:37 AM, Chaoyong He wrote:
> From: Peng Zhang <peng.zhang@corigine.com>
> 
> In the description of nfp document, DPDK PMD supports that the PF
> looks for a firmware file by the PCI name.
> 
> After this commit, it will looks for the PCI name format such as
> pci-0000:04:00.0.nffw rather than pci-04:00.0.nffw, which will
> keep consistent with what is written in the nfp.rst.
> 

Hi Chaoyong,

The commit log mentions change is to be consistent with document, but I
assume code is wrong, oterwise it would be easier to update the document.
So, can you please update commit log as a fix to [1]?


[1]
896c265ef954 ("net/nfp: use new CPP interface")

> Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
> Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
> Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.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)

[PATCH v2] net/nfp: using the correct PCI name to look for the firmware

[Chaoyong He]

From: Peng Zhang <peng.zhang@corigine.com>

In the description of nfp document, DPDK PMD supports that the PF
looks for a firmware file by the PCI name.

After this commit, it will looks for the PCI name format such as
pci-0000:04:00.0.nffw rather than pci-04:00.0.nffw, which will
keep consistent with what is written in the nfp.rst.

Fixes: 896c265ef954 ("net/nfp: use new CPP interface")
Cc: stable@dpdk.org

Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---

v2:
* add fixline.

---

 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.27.0

Re: [PATCH v2] net/nfp: using the correct PCI name to look for the firmware

[Ferruh Yigit]

On 12/8/2022 3:31 AM, Chaoyong He wrote:
> From: Peng Zhang <peng.zhang@corigine.com>
> 
> In the description of nfp document, DPDK PMD supports that the PF
> looks for a firmware file by the PCI name.
> 
> After this commit, it will looks for the PCI name format such as
> pci-0000:04:00.0.nffw rather than pci-04:00.0.nffw, which will
> keep consistent with what is written in the nfp.rst.
> 
> Fixes: 896c265ef954 ("net/nfp: use new CPP interface")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
> Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
> Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
> ---
> 
> v2:
> * add fixline.
> 

Updated commit log a little while merging, please check.


Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>

Applied to dpdk-next-net/main, thanks.

Re: [PATCH v2] net/nfp: using the correct PCI name to look for the firmware

[Niklas Söderlund]

Hi Ferruh,

On 2022-12-08 18:06:56 +0000, Ferruh Yigit wrote:
> On 12/8/2022 3:31 AM, Chaoyong He wrote:
> > From: Peng Zhang <peng.zhang@corigine.com>
> > 
> > In the description of nfp document, DPDK PMD supports that the PF
> > looks for a firmware file by the PCI name.
> > 
> > After this commit, it will looks for the PCI name format such as
> > pci-0000:04:00.0.nffw rather than pci-04:00.0.nffw, which will
> > keep consistent with what is written in the nfp.rst.
> > 
> > Fixes: 896c265ef954 ("net/nfp: use new CPP interface")
> > Cc: stable@dpdk.org
> > 
> > Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
> > Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
> > Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
> > ---
> > 
> > v2:
> > * add fixline.
> > 
> 
> Updated commit log a little while merging, please check.

Thanks for improving the commit message, looks good!

> 
> 
> Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
> 
> Applied to dpdk-next-net/main, thanks.
> 

-- 
Kind Regards,
Niklas Söderlund