* [PATCH net-next 1/2] PCI: add USR vendor id
2018-11-10 23:43 [PATCH net-next 0/2] r8169: add USR PCI vendor id Heiner Kallweit
@ 2018-11-10 23:45 ` Heiner Kallweit
2018-11-11 10:08 ` kbuild test robot
2018-11-10 23:47 ` [PATCH net-next 2/2] r8169: use proper constant for PCI vendor USR instead of numerical id Heiner Kallweit
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Heiner Kallweit @ 2018-11-10 23:45 UTC (permalink / raw)
To: Bjorn Helgaas, David Miller
Cc: netdev@vger.kernel.org, linux-pci@vger.kernel.org
Add U.S. Robotics (USR) PCI vendor id.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
include/linux/pci_ids.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 69f0abe1b..144de2e89 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2359,6 +2359,8 @@
#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
+#define PCI_VENDOR_ID_USR 0x16ec
+
#define PCI_VENDOR_ID_VITESSE 0x1725
#define PCI_DEVICE_ID_VITESSE_VSC7174 0x7174
--
2.19.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH net-next 1/2] PCI: add USR vendor id
2018-11-10 23:45 ` [PATCH net-next 1/2] PCI: add USR " Heiner Kallweit
@ 2018-11-11 10:08 ` kbuild test robot
0 siblings, 0 replies; 9+ messages in thread
From: kbuild test robot @ 2018-11-11 10:08 UTC (permalink / raw)
To: Heiner Kallweit
Cc: kbuild-all, Bjorn Helgaas, David Miller, netdev@vger.kernel.org,
linux-pci@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 2329 bytes --]
Hi Heiner,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on net-next/master]
url: https://github.com/0day-ci/linux/commits/Heiner-Kallweit/r8169-add-USR-PCI-vendor-id/20181111-155553
config: ia64-allmodconfig (attached as .config)
compiler: ia64-linux-gcc (GCC) 8.1.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=8.1.0 make.cross ARCH=ia64
All errors (new ones prefixed by >>):
>> drivers/isdn//hardware/mISDN/w6692.c:1404:23: error: 'PCI_DEVICE_ID_USR_6692' undeclared here (not in a function); did you mean 'PCI_DEVICE_ID_SI_6202'?
PCI_VENDOR_ID_USR, PCI_DEVICE_ID_USR_6692, 0, 0,
^~~~~~~~~~~~~~~~~~~~~~
PCI_DEVICE_ID_SI_6202
vim +1404 drivers/isdn//hardware/mISDN/w6692.c
707b2ce6 Karsten Keil 2009-07-22 1399
e8336ed0 Arvind Yadav 2017-07-15 1400 static const struct pci_device_id w6692_ids[] = {
707b2ce6 Karsten Keil 2009-07-22 1401 { PCI_VENDOR_ID_DYNALINK, PCI_DEVICE_ID_DYNALINK_IS64PH,
707b2ce6 Karsten Keil 2009-07-22 1402 PCI_ANY_ID, PCI_ANY_ID, 0, 0, (ulong)&w6692_map[0]},
707b2ce6 Karsten Keil 2009-07-22 1403 { PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692,
707b2ce6 Karsten Keil 2009-07-22 @1404 PCI_VENDOR_ID_USR, PCI_DEVICE_ID_USR_6692, 0, 0,
707b2ce6 Karsten Keil 2009-07-22 1405 (ulong)&w6692_map[2]},
707b2ce6 Karsten Keil 2009-07-22 1406 { PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692,
707b2ce6 Karsten Keil 2009-07-22 1407 PCI_ANY_ID, PCI_ANY_ID, 0, 0, (ulong)&w6692_map[1]},
707b2ce6 Karsten Keil 2009-07-22 1408 { }
707b2ce6 Karsten Keil 2009-07-22 1409 };
707b2ce6 Karsten Keil 2009-07-22 1410 MODULE_DEVICE_TABLE(pci, w6692_ids);
707b2ce6 Karsten Keil 2009-07-22 1411
:::::: The code at line 1404 was first introduced by commit
:::::: 707b2ce6c1f4f1261788f2ff09ad82c35e0e6240 mISDN: Add driver for Winbond cards
:::::: TO: Karsten Keil <keil@b1-systems.de>
:::::: CC: Karsten Keil <keil@b1-systems.de>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 52329 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH net-next 2/2] r8169: use proper constant for PCI vendor USR instead of numerical id
2018-11-10 23:43 [PATCH net-next 0/2] r8169: add USR PCI vendor id Heiner Kallweit
2018-11-10 23:45 ` [PATCH net-next 1/2] PCI: add USR " Heiner Kallweit
@ 2018-11-10 23:47 ` Heiner Kallweit
2018-11-13 5:44 ` kbuild test robot
2018-11-11 10:50 ` [PATCH net-next v2] PCI: add USR vendor id and use it in r8169 and w6692 driver Heiner Kallweit
2018-11-11 19:31 ` [PATCH net-next v3] " Heiner Kallweit
3 siblings, 1 reply; 9+ messages in thread
From: Heiner Kallweit @ 2018-11-10 23:47 UTC (permalink / raw)
To: Bjorn Helgaas, David Miller
Cc: netdev@vger.kernel.org, linux-pci@vger.kernel.org
Use proper constant for PCI vendor USR instead of numerical id.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 1fd01688d..366a690eb 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -224,7 +224,7 @@ static const struct pci_device_id rtl8169_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4302), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_AT, 0xc107), 0, 0, RTL_CFG_0 },
- { PCI_DEVICE(0x16ec, 0x0116), 0, 0, RTL_CFG_0 },
+ { PCI_DEVICE(PCI_VENDOR_ID_USR, 0x0116), 0, 0, RTL_CFG_0 },
{ PCI_VENDOR_ID_LINKSYS, 0x1032,
PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 },
{ 0x0001, 0x8168,
--
2.19.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH net-next 2/2] r8169: use proper constant for PCI vendor USR instead of numerical id
2018-11-10 23:47 ` [PATCH net-next 2/2] r8169: use proper constant for PCI vendor USR instead of numerical id Heiner Kallweit
@ 2018-11-13 5:44 ` kbuild test robot
0 siblings, 0 replies; 9+ messages in thread
From: kbuild test robot @ 2018-11-13 5:44 UTC (permalink / raw)
To: Heiner Kallweit
Cc: kbuild-all, Bjorn Helgaas, David Miller, netdev@vger.kernel.org,
linux-pci@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 2352 bytes --]
Hi Heiner,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on net-next/master]
url: https://github.com/0day-ci/linux/commits/Heiner-Kallweit/r8169-add-USR-PCI-vendor-id/20181111-155553
config: x86_64-allmodconfig (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All errors (new ones prefixed by >>):
include/linux/slab.h:332:43: warning: dubious: x & !y
>> drivers/isdn/hardware/mISDN/w6692.c:1404:30: error: undefined identifier 'PCI_DEVICE_ID_USR_6692'
drivers/isdn/hardware/mISDN/w6692.c:1404:23: error: 'PCI_DEVICE_ID_USR_6692' undeclared here (not in a function); did you mean 'PCI_DEVICE_ID_SI_6202'?
PCI_VENDOR_ID_USR, PCI_DEVICE_ID_USR_6692, 0, 0,
^~~~~~~~~~~~~~~~~~~~~~
PCI_DEVICE_ID_SI_6202
vim +/PCI_DEVICE_ID_USR_6692 +1404 drivers/isdn/hardware/mISDN/w6692.c
707b2ce6 Karsten Keil 2009-07-22 1399
e8336ed0 Arvind Yadav 2017-07-15 1400 static const struct pci_device_id w6692_ids[] = {
707b2ce6 Karsten Keil 2009-07-22 1401 { PCI_VENDOR_ID_DYNALINK, PCI_DEVICE_ID_DYNALINK_IS64PH,
707b2ce6 Karsten Keil 2009-07-22 1402 PCI_ANY_ID, PCI_ANY_ID, 0, 0, (ulong)&w6692_map[0]},
707b2ce6 Karsten Keil 2009-07-22 1403 { PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692,
707b2ce6 Karsten Keil 2009-07-22 @1404 PCI_VENDOR_ID_USR, PCI_DEVICE_ID_USR_6692, 0, 0,
707b2ce6 Karsten Keil 2009-07-22 1405 (ulong)&w6692_map[2]},
707b2ce6 Karsten Keil 2009-07-22 1406 { PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692,
707b2ce6 Karsten Keil 2009-07-22 1407 PCI_ANY_ID, PCI_ANY_ID, 0, 0, (ulong)&w6692_map[1]},
707b2ce6 Karsten Keil 2009-07-22 1408 { }
707b2ce6 Karsten Keil 2009-07-22 1409 };
707b2ce6 Karsten Keil 2009-07-22 1410 MODULE_DEVICE_TABLE(pci, w6692_ids);
707b2ce6 Karsten Keil 2009-07-22 1411
:::::: The code at line 1404 was first introduced by commit
:::::: 707b2ce6c1f4f1261788f2ff09ad82c35e0e6240 mISDN: Add driver for Winbond cards
:::::: TO: Karsten Keil <keil@b1-systems.de>
:::::: CC: Karsten Keil <keil@b1-systems.de>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 66569 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH net-next v2] PCI: add USR vendor id and use it in r8169 and w6692 driver
2018-11-10 23:43 [PATCH net-next 0/2] r8169: add USR PCI vendor id Heiner Kallweit
2018-11-10 23:45 ` [PATCH net-next 1/2] PCI: add USR " Heiner Kallweit
2018-11-10 23:47 ` [PATCH net-next 2/2] r8169: use proper constant for PCI vendor USR instead of numerical id Heiner Kallweit
@ 2018-11-11 10:50 ` Heiner Kallweit
2018-11-11 18:23 ` David Miller
2018-11-11 19:31 ` [PATCH net-next v3] " Heiner Kallweit
3 siblings, 1 reply; 9+ messages in thread
From: Heiner Kallweit @ 2018-11-11 10:50 UTC (permalink / raw)
To: Bjorn Helgaas, David Miller, Karsten Keil
Cc: netdev@vger.kernel.org, linux-pci@vger.kernel.org
The PCI vendor id of U.S. Robotics isn't defined in pci_ids.h so far,
only ISDN driver w6692 has a private definition. Move the definition
to pci_ids.h and use it also in the r8169 driver.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
v2:
- The original patch caused a build failure in w6692 driver because
it broke the private PCI device id definition.
I hope it's ok to submit this through the netdev tree.
---
drivers/isdn/hardware/mISDN/w6692.c | 5 -----
drivers/net/ethernet/realtek/r8169.c | 2 +-
include/linux/pci_ids.h | 4 ++++
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index 5acf6ab67..f6b4f4f11 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -52,11 +52,6 @@ static const struct w6692map w6692_map[] =
{W6692_USR, "USR W6692"}
};
-#ifndef PCI_VENDOR_ID_USR
-#define PCI_VENDOR_ID_USR 0x16ec
-#define PCI_DEVICE_ID_USR_6692 0x3409
-#endif
-
struct w6692_ch {
struct bchannel bch;
u32 addr;
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 1fd01688d..366a690eb 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -224,7 +224,7 @@ static const struct pci_device_id rtl8169_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4302), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_AT, 0xc107), 0, 0, RTL_CFG_0 },
- { PCI_DEVICE(0x16ec, 0x0116), 0, 0, RTL_CFG_0 },
+ { PCI_DEVICE(PCI_VENDOR_ID_USR, 0x0116), 0, 0, RTL_CFG_0 },
{ PCI_VENDOR_ID_LINKSYS, 0x1032,
PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 },
{ 0x0001, 0x8168,
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 69f0abe1b..1fac231fe 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2359,6 +2359,10 @@
#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
+#define PCI_VENDOR_ID_USR 0x16ec
+#define PCI_DEVICE_ID_USR_997902 0x0116
+#define PCI_DEVICE_ID_USR_6692 0x3409
+
#define PCI_VENDOR_ID_VITESSE 0x1725
#define PCI_DEVICE_ID_VITESSE_VSC7174 0x7174
--
2.19.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH net-next v2] PCI: add USR vendor id and use it in r8169 and w6692 driver
2018-11-11 10:50 ` [PATCH net-next v2] PCI: add USR vendor id and use it in r8169 and w6692 driver Heiner Kallweit
@ 2018-11-11 18:23 ` David Miller
0 siblings, 0 replies; 9+ messages in thread
From: David Miller @ 2018-11-11 18:23 UTC (permalink / raw)
To: hkallweit1; +Cc: bhelgaas, isdn, netdev, linux-pci
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sun, 11 Nov 2018 11:50:08 +0100
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 69f0abe1b..1fac231fe 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2359,6 +2359,10 @@
>
> #define PCI_VENDOR_ID_SYNOPSYS 0x16c3
>
> +#define PCI_VENDOR_ID_USR 0x16ec
> +#define PCI_DEVICE_ID_USR_997902 0x0116
> +#define PCI_DEVICE_ID_USR_6692 0x3409
> +
> #define PCI_VENDOR_ID_VITESSE 0x1725
> #define PCI_DEVICE_ID_VITESSE_VSC7174 0x7174
Generally, as I understand the policy for linux/pci_ids.h, we only add
things used in multiple locations.
So PCI_VENDOR_ID_USR is OK, since it is used in both r8169 and w6692.
But the device IDs are not, since only w6692 uses them.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH net-next v3] PCI: add USR vendor id and use it in r8169 and w6692 driver
2018-11-10 23:43 [PATCH net-next 0/2] r8169: add USR PCI vendor id Heiner Kallweit
` (2 preceding siblings ...)
2018-11-11 10:50 ` [PATCH net-next v2] PCI: add USR vendor id and use it in r8169 and w6692 driver Heiner Kallweit
@ 2018-11-11 19:31 ` Heiner Kallweit
2018-11-11 22:00 ` David Miller
3 siblings, 1 reply; 9+ messages in thread
From: Heiner Kallweit @ 2018-11-11 19:31 UTC (permalink / raw)
To: Bjorn Helgaas, David Miller, Karsten Keil
Cc: netdev@vger.kernel.org, linux-pci@vger.kernel.org
The PCI vendor id of U.S. Robotics isn't defined in pci_ids.h so far,
only ISDN driver w6692 has a private definition. Move the definition
to pci_ids.h and use it in the r8169 driver too.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
v2:
- The original patch caused a build failure in w6692 driver because
it broke the private PCI device id definition.
v3:
- Don't move device id's to pci_ids.h because they are used in
one module only respectively.
---
drivers/isdn/hardware/mISDN/w6692.c | 3 ---
drivers/net/ethernet/realtek/r8169.c | 2 +-
include/linux/pci_ids.h | 2 ++
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index 5acf6ab67..6f60aced1 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -52,10 +52,7 @@ static const struct w6692map w6692_map[] =
{W6692_USR, "USR W6692"}
};
-#ifndef PCI_VENDOR_ID_USR
-#define PCI_VENDOR_ID_USR 0x16ec
#define PCI_DEVICE_ID_USR_6692 0x3409
-#endif
struct w6692_ch {
struct bchannel bch;
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 1fd01688d..366a690eb 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -224,7 +224,7 @@ static const struct pci_device_id rtl8169_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4302), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_AT, 0xc107), 0, 0, RTL_CFG_0 },
- { PCI_DEVICE(0x16ec, 0x0116), 0, 0, RTL_CFG_0 },
+ { PCI_DEVICE(PCI_VENDOR_ID_USR, 0x0116), 0, 0, RTL_CFG_0 },
{ PCI_VENDOR_ID_LINKSYS, 0x1032,
PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 },
{ 0x0001, 0x8168,
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 69f0abe1b..144de2e89 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2359,6 +2359,8 @@
#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
+#define PCI_VENDOR_ID_USR 0x16ec
+
#define PCI_VENDOR_ID_VITESSE 0x1725
#define PCI_DEVICE_ID_VITESSE_VSC7174 0x7174
--
2.19.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH net-next v3] PCI: add USR vendor id and use it in r8169 and w6692 driver
2018-11-11 19:31 ` [PATCH net-next v3] " Heiner Kallweit
@ 2018-11-11 22:00 ` David Miller
0 siblings, 0 replies; 9+ messages in thread
From: David Miller @ 2018-11-11 22:00 UTC (permalink / raw)
To: hkallweit1; +Cc: bhelgaas, isdn, netdev, linux-pci
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sun, 11 Nov 2018 20:31:21 +0100
> The PCI vendor id of U.S. Robotics isn't defined in pci_ids.h so far,
> only ISDN driver w6692 has a private definition. Move the definition
> to pci_ids.h and use it in the r8169 driver too.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
> v2:
> - The original patch caused a build failure in w6692 driver because
> it broke the private PCI device id definition.
> v3:
> - Don't move device id's to pci_ids.h because they are used in
> one module only respectively.
Yep, that's better.
Applied, thanks!
^ permalink raw reply [flat|nested] 9+ messages in thread