forked from Openwrt/openwrt
34d2964554
Fixes issues with RTL8156 2.5G USB adapters - # ethtool eth1 Settings for eth1: Supported ports: [ ] Supported link modes: Not reported Supported pause frame use: No Supports auto-negotiation: No Supported FEC modes: Not reported Advertised link modes: Not reported Advertised pause frame use: No Advertised auto-negotiation: No Advertised FEC modes: Not reported Speed: 2500Mb/s Duplex: Half Port: Twisted Pair PHYAD: 0 Transceiver: internal Auto-negotiation: off MDI-X: Unknown Current message level: 0x00000007 (7) drv probe link Link detected: yes - # - r8152: break the loop when the budget is exhausted - r8152: Block future register access if register access fails - r8152: Rename RTL8152_UNPLUG to RTL8152_INACCESSIBLE - r8152: add vendor/device ID pair for D-Link DUB-E250 - r8152: try to use a normal budget - r8152: set bp in bulk - r8152: adjust generic_ocp_write function - r8152: fix the autosuspend doesn't work - r8152: Add __GFP_NOWARN to big allocations - r8152: reduce the control transfer of rtl8152_get_version() - r8152: remove rtl_vendor_mode function - r8152: avoid to change cfg for all devices - r8152: add USB device driver for config selection - r8152: use napi_gro_frags - cdc_ether: no need to blacklist any r8152 devices - cdc_ether: add u-blox 0x1313 composition Build system: x86_64 Build-tested: bcm2711, rockchip, x86/64 Run-tested: bcm2711/RPi4B, rockchip/nanopi r2s, x86/64 Signed-off-by: Marty Jones <mj8263788@gmail.com>
159 lines
4.8 KiB
Diff
159 lines
4.8 KiB
Diff
From 69649ef8405320f81497f4757faac8234f61b167 Mon Sep 17 00:00:00 2001
|
|
From: Bjørn Mork <bjorn@mork.no>
|
|
Date: Fri, 6 Jan 2023 17:07:39 +0100
|
|
Subject: [PATCH] cdc_ether: no need to blacklist any r8152 devices
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The r8152 driver does not need this anymore.
|
|
|
|
Dropping blacklist entries adds optional support for these
|
|
devices in ECM mode.
|
|
|
|
The 8153 devices are handled by the r8153_ecm driver when
|
|
in ECM mode, and must still be blacklisted here.
|
|
|
|
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/usb/cdc_ether.c | 114 ------------------------------------
|
|
1 file changed, 114 deletions(-)
|
|
|
|
--- a/drivers/net/usb/cdc_ether.c
|
|
+++ b/drivers/net/usb/cdc_ether.c
|
|
@@ -767,13 +767,6 @@ static const struct usb_device_id produc
|
|
.driver_info = 0,
|
|
},
|
|
|
|
-/* Realtek RTL8152 Based USB 2.0 Ethernet Adapters */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(REALTEK_VENDOR_ID, 0x8152, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
/* Realtek RTL8153 Based USB 3.0 Ethernet Adapters */
|
|
{
|
|
USB_DEVICE_AND_INTERFACE_INFO(REALTEK_VENDOR_ID, 0x8153, USB_CLASS_COMM,
|
|
@@ -781,119 +774,12 @@ static const struct usb_device_id produc
|
|
.driver_info = 0,
|
|
},
|
|
|
|
-/* Samsung USB Ethernet Adapters */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, 0xa101, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
-#if IS_ENABLED(CONFIG_USB_RTL8152)
|
|
-/* Linksys USB3GIGV1 Ethernet Adapter */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(LINKSYS_VENDOR_ID, 0x0041, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-#endif
|
|
-
|
|
-/* Lenovo ThinkPad OneLink+ Dock (based on Realtek RTL8153) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3054, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
-/* ThinkPad USB-C Dock (based on Realtek RTL8153) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3062, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
-/* ThinkPad Thunderbolt 3 Dock (based on Realtek RTL8153) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3069, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
-/* ThinkPad Thunderbolt 3 Dock Gen 2 (based on Realtek RTL8153) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3082, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
-/* Lenovo Thinkpad USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x7205, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
-/* Lenovo USB C to Ethernet Adapter (based on Realtek RTL8153) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x720c, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
-/* Lenovo USB-C Travel Hub (based on Realtek RTL8153) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x7214, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
/* Lenovo Powered USB-C Travel Hub (4X90S92381, based on Realtek RTL8153) */
|
|
{
|
|
USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x721e, USB_CLASS_COMM,
|
|
USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
.driver_info = 0,
|
|
},
|
|
-
|
|
-/* ThinkPad USB-C Dock Gen 2 (based on Realtek RTL8153) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0xa387, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
-/* NVIDIA Tegra USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(NVIDIA_VENDOR_ID, 0x09ff, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
-/* Microsoft Surface 2 dock (based on Realtek RTL8152) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(MICROSOFT_VENDOR_ID, 0x07ab, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
-/* Microsoft Surface Ethernet Adapter (based on Realtek RTL8153) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(MICROSOFT_VENDOR_ID, 0x07c6, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
-/* Microsoft Surface Ethernet Adapter (based on Realtek RTL8153B) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(MICROSOFT_VENDOR_ID, 0x0927, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
-
|
|
-/* TP-LINK UE300 USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */
|
|
-{
|
|
- USB_DEVICE_AND_INTERFACE_INFO(TPLINK_VENDOR_ID, 0x0601, USB_CLASS_COMM,
|
|
- USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
|
|
- .driver_info = 0,
|
|
-},
|
|
|
|
/* Aquantia AQtion USB to 5GbE Controller (based on AQC111U) */
|
|
{
|