[PATCH net-next v4 1/4] stmmac: loongson: Pass correct arg to PCI function

[PATCH net-next v4 1/4] stmmac: loongson: Pass correct arg to PCI function

[Philipp Stanner]

pcim_iomap_regions() should receive the driver's name as its third
parameter, not the PCI device's name.

Define the driver name with a macro and use it at the appropriate
places, including pcim_iomap_regions().

Cc: stable@vger.kernel.org # v5.14+
Fixes: 30bba69d7db4 ("stmmac: pci: Add dwmac support for Loongson")
Signed-off-by: Philipp Stanner <phasta@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Yanteng Si <si.yanteng@linux.dev>
Tested-by: Henry Chen <chenx97@aosc.io>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index bfe6e2d631bd..73a6715a93e6 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -11,6 +11,8 @@
 #include "dwmac_dma.h"
 #include "dwmac1000.h"
 
+#define DRIVER_NAME "dwmac-loongson-pci"
+
 /* Normal Loongson Tx Summary */
 #define DMA_INTR_ENA_NIE_TX_LOONGSON	0x00040000
 /* Normal Loongson Rx Summary */
@@ -555,7 +557,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
 	for (i = 0; i < PCI_STD_NUM_BARS; i++) {
 		if (pci_resource_len(pdev, i) == 0)
 			continue;
-		ret = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev));
+		ret = pcim_iomap_regions(pdev, BIT(0), DRIVER_NAME);
 		if (ret)
 			goto err_disable_device;
 		break;
@@ -673,7 +675,7 @@ static const struct pci_device_id loongson_dwmac_id_table[] = {
 MODULE_DEVICE_TABLE(pci, loongson_dwmac_id_table);
 
 static struct pci_driver loongson_dwmac_driver = {
-	.name = "dwmac-loongson-pci",
+	.name = DRIVER_NAME,
 	.id_table = loongson_dwmac_id_table,
 	.probe = loongson_dwmac_probe,
 	.remove = loongson_dwmac_remove,
-- 
2.48.1

Re: [PATCH net-next v4 1/4] stmmac: loongson: Pass correct arg to PCI function

[Jakub Kicinski]

On Wed, 26 Feb 2025 09:52:05 +0100 Philipp Stanner wrote:
> pcim_iomap_regions() should receive the driver's name as its third
> parameter, not the PCI device's name.
> 
> Define the driver name with a macro and use it at the appropriate
> places, including pcim_iomap_regions().
> 
> Cc: stable@vger.kernel.org # v5.14+
> Fixes: 30bba69d7db4 ("stmmac: pci: Add dwmac support for Loongson")

Since you sent this as a fix (which.. yea.. I guess.. why not..)
I'll apply it to the fixes tree. But then the other patches have 
to wait and be reposted next Thu. The fixes are merged with net-next
every Thu, but since this series was tagged as net-next I missed
it in today's cross merge :(

Re: [PATCH net-next v4 1/4] stmmac: loongson: Pass correct arg to PCI function

[Philipp Stanner]

On Thu, 2025-02-27 at 18:35 -0800, Jakub Kicinski wrote:
> On Wed, 26 Feb 2025 09:52:05 +0100 Philipp Stanner wrote:
> > pcim_iomap_regions() should receive the driver's name as its third
> > parameter, not the PCI device's name.
> > 
> > Define the driver name with a macro and use it at the appropriate
> > places, including pcim_iomap_regions().
> > 
> > Cc: stable@vger.kernel.org # v5.14+
> > Fixes: 30bba69d7db4 ("stmmac: pci: Add dwmac support for Loongson")
> 
> Since you sent this as a fix (which.. yea.. I guess.. why not..)
> I'll apply it to the fixes tree. But then the other patches have 
> to wait and be reposted next Thu. The fixes are merged with net-next
> every Thu, but since this series was tagged as net-next I missed
> it in today's cross merge :(
> 

Oh OK, I see – I'm not very familiar with the net subsystem process. So
far I always had it like this: fire everything into Linus's master and
Greg & Sasha then pick those with Fixes tags into the stable trees
automatically :)

Anyways, I interpret your message so that this series is done and I
don't have to do anything about it anymore. Correct me if I'm wrong.


Thanks
P.

Re: [PATCH net-next v4 1/4] stmmac: loongson: Pass correct arg to PCI function

[Jakub Kicinski]

On Fri, 28 Feb 2025 10:26:24 +0100 Philipp Stanner wrote:
> > Since you sent this as a fix (which.. yea.. I guess.. why not..)
> > I'll apply it to the fixes tree. But then the other patches have 
> > to wait and be reposted next Thu. The fixes are merged with net-next
> > every Thu, but since this series was tagged as net-next I missed
> > it in today's cross merge :(
> 
> Oh OK, I see – I'm not very familiar with the net subsystem process. So
> far I always had it like this: fire everything into Linus's master and
> Greg & Sasha then pick those with Fixes tags into the stable trees
> automatically :)

Admittedly the fixes vs linux-next material routing is a little tricky.

> Anyways, I interpret your message so that this series is done and I
> don't have to do anything about it anymore. Correct me if I'm wrong.

You need to repost patches 2,3,4 once the first patch appears in:
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/