netdev - Re: [PATCH net-next v11 3/6] net: stmmac: dwmac-loongson: Use PCI_DEVICE

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <y6ea3idgz5i4qhhb4agbizmosgg6yuijgsjhgexwxnioqczwlo@slq7q5ln3twr>
Date: Thu, 18 Apr 2024 15:31:33 +0300
From: Serge Semin <fancer.lancer@...il.com>
To: Yanteng Si <siyanteng@...ngson.cn>
Cc: Jakub Kicinski <kuba@...nel.org>, andrew@...n.ch, hkallweit1@...il.com, 
	peppe.cavallaro@...com, alexandre.torgue@...s.st.com, joabreu@...opsys.com, 
	Jose.Abreu@...opsys.com, chenhuacai@...nel.org, linux@...linux.org.uk, 
	guyinggang@...ngson.cn, netdev@...r.kernel.org, chris.chenfeiyang@...il.com, 
	siyanteng01@...il.com
Subject: Re: [PATCH net-next v11 3/6] net: stmmac: dwmac-loongson: Use
 PCI_DEVICE_DATA() macro for device identification

On Thu, Apr 18, 2024 at 02:14:17PM +0300, Serge Semin wrote:
> On Mon, Apr 15, 2024 at 10:21:39AM +0800, Yanteng Si wrote:
> > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
> > > > index 9e40c28d453a..995c9bd144e0 100644
> > > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
> > > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
> > > > @@ -213,7 +213,7 @@ static SIMPLE_DEV_PM_OPS(loongson_dwmac_pm_ops, loongson_dwmac_suspend,
> > > >   			 loongson_dwmac_resume);
> > > >   static const struct pci_device_id loongson_dwmac_id_table[] = {
> > > > -	{ PCI_VDEVICE(LOONGSON, 0x7a03) },
> > > > +	{ PCI_DEVICE_DATA(LOONGSON, GMAC, &loongson_gmac_pci_info) },
> > > >   	{}
> > > >   };
> > > >   MODULE_DEVICE_TABLE(pci, loongson_dwmac_id_table);
> > > In file included from ../drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c:6:
> > > ../include/linux/pci.h:1061:51: error: ‘PCI_DEVICE_ID_LOONGSON_GMAC’ undeclared here (not in a function); did you mean ‘PCI_DEVICE_ID_LOONGSON_HDA’?
> > >   1061 |         .vendor = PCI_VENDOR_ID_##vend, .device = PCI_DEVICE_ID_##vend##_##dev, \
> > >        |                                                   ^~~~~~~~~~~~~~
> > > ../drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c:216:11: note: in expansion of macro ‘PCI_DEVICE_DATA’
> > >    216 |         { PCI_DEVICE_DATA(LOONGSON, GMAC, &loongson_gmac_pci_info) },
> > >        |           ^~~~~~~~~~~~~~~
> > > ../drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c:216:44: error: ‘loongson_gmac_pci_info’ undeclared here (not in a function)
> > >    216 |         { PCI_DEVICE_DATA(LOONGSON, GMAC, &loongson_gmac_pci_info) },
> > >        |                                            ^~~~~~~~~~~~~~~~~~~~~~
> > > ../include/linux/pci.h:1063:41: note: in definition of macro ‘PCI_DEVICE_DATA’
> > >   1063 |         .driver_data = (kernel_ulong_t)(data)
> > >        |                                         ^~~~
> > 
> 
> > Will be fixed in v12.
> 

> Just move the PCI_DEVICE_ID_LOONGSON_GMAC macro definition from Patch
> 5/6 to this one.

... and of course pass NULL as the data-pointer to PCI_DEVICE_DATA().

-Serge(y)

> 
> -Serge(y)
> 
> > 
> > 
> > Thanks,
> > 
> > Yanteng
> >