Skip to contentSkip to conversation

net/usb: Add Lenovo ThinkPad OneLink GigaLAN USB ID to ax88179 driver

PATCH In review Keith Packard 4 participants 6 messages Feb 24, 2014 – Feb 25, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/usb: Add Lenovo ThinkPad OneLink GigaLAN USB ID to ax88179 driver

The Lenovo OneLink dock includes a USB ethernet adapter using the AX88179 chip, but with a different USB ID. Add this new USB id to the driver so that it will autodetect the adapter correctly.

---
 drivers/net/usb/ax88179_178a.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
drivers/net/usb/ax88179_178a.c +17 -0
index 8e8d0fc..dcf974f 100644
@@ -1418,6 +1418,19 @@ static const struct driver_info samsung_info = {
 	.tx_fixup = ax88179_tx_fixup,
 };
 
+static const struct driver_info lenovo_info = {
+	.description = "ThinkPad OneLink Dock USB GigaLAN",
+	.bind = ax88179_bind,
+	.unbind = ax88179_unbind,
+	.status = ax88179_status,
+	.link_reset = ax88179_link_reset,
+	.reset = ax88179_reset,
+	.stop = ax88179_stop,
+	.flags = FLAG_ETHER | FLAG_FRAMING_AX,
+	.rx_fixup = ax88179_rx_fixup,
+	.tx_fixup = ax88179_tx_fixup,
+};
+
 static const struct usb_device_id products[] = {
 {
 	/* ASIX AX88179 10/100/1000 */
@@ -1435,6 +1448,10 @@ static const struct usb_device_id products[] = {
 	/* Samsung USB Ethernet Adapter */
 	USB_DEVICE(0x04e8, 0xa100),
 	.driver_info = (unsigned long)&samsung_info,
+}, {
+	/* Lenovo ThinkPad OneLink GigaLAN */
+	USB_DEVICE(0x17ef, 0x304b),
+	.driver_info = (unsigned long)&samsung_info,
 },
 	{ },
 };
Signature · 1 line
1.9.0
#1 lore raw
Quoted 1 line · Keith Packard

+static const struct driver_info lenovo_info = {

<snip>

drivers/net/usb/ax88179_178a.c static const struct usb_device_id products[] = { · line 1454

Quoted 4 lines
drivers/net/usb/ax88179_178a.c +4 -0
+}, {
+	/* Lenovo ThinkPad OneLink GigaLAN */
+	USB_DEVICE(0x17ef, 0x304b),
+	.driver_info = (unsigned long)&samsung_info,

&lenovo_info, surely.

--Kyle

#2 lore raw

PATCH 1/1 net/usb: Add Lenovo ThinkPad OneLink GigaLAN USB ID to ax88179 driver

The Lenovo OneLink dock includes a USB ethernet adapter using the AX88179 chip, but with a different USB ID. Add this new USB id to the driver so that it will autodetect the adapter correctly.

---

Kyle McMartin says:

Quoted 1 line

&lenovo_info, surely.

Yeah, Daniel Stone caught the same bug. Not a big deal; the only difference between any of these elements is the string produced by the kernel. And that's odd because when we tested it, we saw the expected name...

 drivers/net/usb/ax88179_178a.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
drivers/net/usb/ax88179_178a.c +17 -0
index 8e8d0fc..7707b4e 100644
@@ -1418,6 +1418,19 @@ static const struct driver_info samsung_info = {
 	.tx_fixup = ax88179_tx_fixup,
 };
 
+static const struct driver_info lenovo_info = {
+	.description = "ThinkPad OneLink Dock USB GigaLAN",
+	.bind = ax88179_bind,
+	.unbind = ax88179_unbind,
+	.status = ax88179_status,
+	.link_reset = ax88179_link_reset,
+	.reset = ax88179_reset,
+	.stop = ax88179_stop,
+	.flags = FLAG_ETHER | FLAG_FRAMING_AX,
+	.rx_fixup = ax88179_rx_fixup,
+	.tx_fixup = ax88179_tx_fixup,
+};
+
 static const struct usb_device_id products[] = {
 {
 	/* ASIX AX88179 10/100/1000 */
@@ -1435,6 +1448,10 @@ static const struct usb_device_id products[] = {
 	/* Samsung USB Ethernet Adapter */
 	USB_DEVICE(0x04e8, 0xa100),
 	.driver_info = (unsigned long)&samsung_info,
+}, {
+	/* Lenovo ThinkPad OneLink GigaLAN */
+	USB_DEVICE(0x17ef, 0x304b),
+	.driver_info = (unsigned long)&lenovo_info,
 },
 	{ },
 };
Signature · 1 line
1.9.0
#3 lore raw
Quoted 7 lines · Keith Packard

Kyle McMartin says:

Quoted 1 line

&lenovo_info, surely.

Yeah, Daniel Stone caught the same bug. Not a big deal; the only difference between any of these elements is the string produced by the kernel.

Yes, and that mess should really be cleaned up in this driver (and probably others).

The .description field describes the *driver*, not the device. The device is described by the manufacturer, using the iManufacturer, iProduct and iSerialstring descriptors, which the USB core takes care of logging and storing. There is absolutely no reason to add additional, possibly conflicting, product descriptions in these drivers.

Some additional static data does of course not matter much, but the additional code is really an unnecessary source of subtle bugs. I'm pretty sure the entry you copied has bugs in the .flags field (ax88179_rx_fixup clones the skb and returns 1, which means that FLAG_MULTI_PACKET should be set). Keeping numerous copies of the exact same driver definition is just waiting for someone to forget syncronizing any fixups for such bugs.

I propose replacing samsung_info, lenovo_info and the other entries differing only by description with a generic driver entry, and trust the vendors to add the appropriate string descriptors to their devices.

The separate generic entries for USB2 and USB3 versions of the chip is also more confusing than helpful IMHO, given that the driver really is identical. I don't think it helps anyone to see "USB 3.0 Gigabit Ethernet" reported if the adapter is connected to a USB 2.0 host and vice versa. Something lik "ASIX AX88179/178A" would do just fine as description regardless of device ID.

Bjørn

#4 lore raw
In reply to Keith Packard

From: Keith Packard

Quoted 35 lines

The Lenovo OneLink dock includes a USB ethernet adapter using the AX88179 chip, but with a different USB ID. Add this new USB id to the driver so that it will autodetect the adapter correctly.

---
 drivers/net/usb/ax88179_178a.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
drivers/net/usb/ax88179_178a.c +13 -0
index 8e8d0fc..dcf974f 100644
@@ -1418,6 +1418,19 @@ static const struct driver_info samsung_info = {
 	.tx_fixup = ax88179_tx_fixup,
 };
 
+static const struct driver_info lenovo_info = {
+	.description = "ThinkPad OneLink Dock USB GigaLAN",
+	.bind = ax88179_bind,
+	.unbind = ax88179_unbind,
+	.status = ax88179_status,
+	.link_reset = ax88179_link_reset,
+	.reset = ax88179_reset,
+	.stop = ax88179_stop,
+	.flags = FLAG_ETHER | FLAG_FRAMING_AX,
+	.rx_fixup = ax88179_rx_fixup,
+	.tx_fixup = ax88179_tx_fixup,
+};
+
 static const struct usb_device_id products[] = {
 {
 	/* ASIX AX88179 10/100/1000 */

drivers/net/usb/ax88179_178a.c static const struct usb_device_id products[] = { · line 1454

Quoted 7 lines
drivers/net/usb/ax88179_178a.c +4 -0
@@ -1435,6 +1448,10 @@ static const struct usb_device_id products[] = {
 	/* Samsung USB Ethernet Adapter */
 	USB_DEVICE(0x04e8, 0xa100),
 	.driver_info = (unsigned long)&samsung_info,
+}, {
+	/* Lenovo ThinkPad OneLink GigaLAN */
+	USB_DEVICE(0x17ef, 0x304b),
+	.driver_info = (unsigned long)&samsung_info,
                                     ^^^^^^^^^^^^

I think you meant lenovo_info.

Actually it looks like the initialiser should be factored somehow to that the list of functions and flags doesn't need repeating for every clone.

David

#5 lore raw
Quoted 1 line · David Laight

I think you meant lenovo_info.

I posted an updated patch already; nice to know that so many people are looking at this kernel patch :-)

Signature · 1 line
[email protected]