forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/drivers/net/usb/cdc_ether.c
....@@ -1,20 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23  * CDC Ethernet based networking peripherals
34  * Copyright (C) 2003-2005 by David Brownell
45  * Copyright (C) 2006 by Ole Andre Vadla Ravnas (ActiveSync)
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation; either version 2 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
186  */
197 
208 // #define	DEBUG			// error path messages, extra info
....@@ -75,10 +63,8 @@
7563 	0xa6, 0x07, 0xc0, 0xff, 0xcb, 0x7e, 0x39, 0x2a,
7664 };
7765 
78
-static void usbnet_cdc_update_filter(struct usbnet *dev)
66
+void usbnet_cdc_update_filter(struct usbnet *dev)
7967 {
80
-	struct cdc_state	*info = (void *) &dev->data;
81
-	struct usb_interface	*intf = info->control;
8268 	struct net_device	*net = dev->net;
8369 
8470 	u16 cdc_filter = USB_CDC_PACKET_TYPE_DIRECTED
....@@ -98,12 +84,13 @@
9884 			USB_CDC_SET_ETHERNET_PACKET_FILTER,
9985 			USB_TYPE_CLASS | USB_RECIP_INTERFACE,
10086 			cdc_filter,
101
-			intf->cur_altsetting->desc.bInterfaceNumber,
87
+			dev->intf->cur_altsetting->desc.bInterfaceNumber,
10288 			NULL,
10389 			0,
10490 			USB_CTRL_SET_TIMEOUT
10591 		);
10692 }
93
+EXPORT_SYMBOL_GPL(usbnet_cdc_update_filter);
10794 
10895 /* probes control interface, claims data interface, collects the bulk
10996  * endpoints, activates data interface (if needed), maybe sets MTU.
....@@ -179,10 +166,8 @@
179166 	 * probed with) and a slave/data interface; union
180167 	 * descriptors sort this all out.
181168 	 */
182
-	info->control = usb_ifnum_to_if(dev->udev,
183
-	info->u->bMasterInterface0);
184
-	info->data = usb_ifnum_to_if(dev->udev,
185
-		info->u->bSlaveInterface0);
169
+	info->control = usb_ifnum_to_if(dev->udev, info->u->bMasterInterface0);
170
+	info->data = usb_ifnum_to_if(dev->udev, info->u->bSlaveInterface0);
186171 	if (!info->control || !info->data) {
187172 		dev_dbg(&intf->dev,
188173 			"master #%u/%p slave #%u/%p\n",
....@@ -216,8 +201,7 @@
216201 	/* a data interface altsetting does the real i/o */
217202 	d = &info->data->cur_altsetting->desc;
218203 	if (d->bInterfaceClass != USB_CLASS_CDC_DATA) {
219
-		dev_dbg(&intf->dev, "slave class %u\n",
220
-			d->bInterfaceClass);
204
+		dev_dbg(&intf->dev, "slave class %u\n", d->bInterfaceClass);
221205 		goto bad_desc;
222206 	}
223207 skip:
....@@ -231,10 +215,10 @@
231215 	if (rndis && is_rndis(&intf->cur_altsetting->desc) &&
232216 	    header.usb_cdc_acm_descriptor &&
233217 	    header.usb_cdc_acm_descriptor->bmCapabilities) {
234
-			dev_dbg(&intf->dev,
235
-				"ACM capabilities %02x, not really RNDIS?\n",
236
-				header.usb_cdc_acm_descriptor->bmCapabilities);
237
-			goto bad_desc;
218
+		dev_dbg(&intf->dev,
219
+			"ACM capabilities %02x, not really RNDIS?\n",
220
+			header.usb_cdc_acm_descriptor->bmCapabilities);
221
+		goto bad_desc;
238222 	}
239223 
240224 	if (header.usb_cdc_ether_desc && info->ether->wMaxSegmentSize) {
....@@ -245,7 +229,7 @@
245229 	}
246230 
247231 	if (header.usb_cdc_mdlm_desc &&
248
-		memcmp(header.usb_cdc_mdlm_desc->bGUID, mbm_guid, 16)) {
232
+	    memcmp(header.usb_cdc_mdlm_desc->bGUID, mbm_guid, 16)) {
249233 		dev_dbg(&intf->dev, "GUID doesn't match\n");
250234 		goto bad_desc;
251235 	}
....@@ -309,7 +293,7 @@
309293 	if (info->control->cur_altsetting->desc.bNumEndpoints == 1) {
310294 		struct usb_endpoint_descriptor	*desc;
311295 
312
-		dev->status = &info->control->cur_altsetting->endpoint [0];
296
+		dev->status = &info->control->cur_altsetting->endpoint[0];
313297 		desc = &dev->status->desc;
314298 		if (!usb_endpoint_is_int_in(desc) ||
315299 		    (le16_to_cpu(desc->wMaxPacketSize)
....@@ -554,16 +538,6 @@
554538 	.manage_power =	usbnet_manage_power,
555539 };
556540 
557
-static const struct driver_info lte_info = {
558
-	.description =  "CDC Ethernet Device(lte)",
559
-	.flags =	FLAG_ETHER | FLAG_POINTTOPOINT | FLAG_LTE,
560
-	.bind =		usbnet_cdc_bind,
561
-	.unbind =	usbnet_cdc_unbind,
562
-	.status =	usbnet_cdc_status,
563
-	.set_rx_mode =	usbnet_cdc_update_filter,
564
-	.manage_power =	usbnet_manage_power,
565
-};
566
-
567541 /*-------------------------------------------------------------------------*/
568542 
569543 #define HUAWEI_VENDOR_ID	0x12D1
....@@ -579,6 +553,8 @@
579553 #define MICROSOFT_VENDOR_ID	0x045e
580554 #define UBLOX_VENDOR_ID		0x1546
581555 #define TPLINK_VENDOR_ID	0x2357
556
+#define AQUANTIA_VENDOR_ID	0x2eca
557
+#define ASIX_VENDOR_ID		0x0b95
582558 
583559 static const struct usb_device_id	products[] = {
584560 /* BLACKLIST !!
....@@ -787,6 +763,13 @@
787763 },
788764 #endif
789765 
766
+/* Lenovo ThinkPad OneLink+ Dock (based on Realtek RTL8153) */
767
+{
768
+	USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3054, USB_CLASS_COMM,
769
+			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
770
+	.driver_info = 0,
771
+},
772
+
790773 /* ThinkPad USB-C Dock (based on Realtek RTL8153) */
791774 {
792775 	USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3062, USB_CLASS_COMM,
....@@ -797,6 +780,13 @@
797780 /* ThinkPad Thunderbolt 3 Dock (based on Realtek RTL8153) */
798781 {
799782 	USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3069, USB_CLASS_COMM,
783
+			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
784
+	.driver_info = 0,
785
+},
786
+
787
+/* ThinkPad Thunderbolt 3 Dock Gen 2 (based on Realtek RTL8153) */
788
+{
789
+	USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3082, USB_CLASS_COMM,
800790 			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
801791 	.driver_info = 0,
802792 },
....@@ -868,6 +858,46 @@
868858 {
869859 	USB_DEVICE_AND_INTERFACE_INFO(TPLINK_VENDOR_ID, 0x0601, USB_CLASS_COMM,
870860 			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
861
+	.driver_info = 0,
862
+},
863
+
864
+/* Aquantia AQtion USB to 5GbE Controller (based on AQC111U) */
865
+{
866
+	USB_DEVICE_AND_INTERFACE_INFO(AQUANTIA_VENDOR_ID, 0xc101,
867
+				      USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET,
868
+				      USB_CDC_PROTO_NONE),
869
+	.driver_info = 0,
870
+},
871
+
872
+/* ASIX USB 3.1 Gen1 to 5G Multi-Gigabit Ethernet Adapter(based on AQC111U) */
873
+{
874
+	USB_DEVICE_AND_INTERFACE_INFO(ASIX_VENDOR_ID, 0x2790, USB_CLASS_COMM,
875
+				      USB_CDC_SUBCLASS_ETHERNET,
876
+				      USB_CDC_PROTO_NONE),
877
+	.driver_info = 0,
878
+},
879
+
880
+/* ASIX USB 3.1 Gen1 to 2.5G Multi-Gigabit Ethernet Adapter(based on AQC112U) */
881
+{
882
+	USB_DEVICE_AND_INTERFACE_INFO(ASIX_VENDOR_ID, 0x2791, USB_CLASS_COMM,
883
+				      USB_CDC_SUBCLASS_ETHERNET,
884
+				      USB_CDC_PROTO_NONE),
885
+	.driver_info = 0,
886
+},
887
+
888
+/* USB-C 3.1 to 5GBASE-T Ethernet Adapter (based on AQC111U) */
889
+{
890
+	USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0xe05a, USB_CLASS_COMM,
891
+				      USB_CDC_SUBCLASS_ETHERNET,
892
+				      USB_CDC_PROTO_NONE),
893
+	.driver_info = 0,
894
+},
895
+
896
+/* QNAP QNA-UC5G1T USB to 5GbE Adapter (based on AQC111U) */
897
+{
898
+	USB_DEVICE_AND_INTERFACE_INFO(0x1c04, 0x0015, USB_CLASS_COMM,
899
+				      USB_CDC_SUBCLASS_ETHERNET,
900
+				      USB_CDC_PROTO_NONE),
871901 	.driver_info = 0,
872902 },
873903 
....@@ -957,12 +987,6 @@
957987 				      USB_CDC_SUBCLASS_ETHERNET,
958988 				      USB_CDC_PROTO_NONE),
959989 	.driver_info = (unsigned long)&wwan_info,
960
-}, {
961
-	/* RM310 modules*/
962
-	USB_DEVICE_AND_INTERFACE_INFO(0x1286, 0x4E3C, USB_CLASS_COMM,
963
-				      USB_CDC_SUBCLASS_ETHERNET,
964
-				      USB_CDC_PROTO_NONE),
965
-	.driver_info = (unsigned long)&lte_info,
966990 }, {
967991 	USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET,
968992 			USB_CDC_PROTO_NONE),