Commit 9647722b authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by David S. Miller
Browse files

r8152: Add macpassthru support for ThinkPad Thunderbolt 3 Dock Gen 2 

ThinkPad Thunderbolt 3 Dock Gen 2 is another docking station that uses
RTL8153 based USB ethernet.

The device supports macpassthru, but it failed to pass the test of -AD,
-BND and -BD. Simply bypass these tests since the device supports this
feature just fine.

Also the ACPI objects have some differences between Dell's and Lenovo's,
so make those ACPI infos no longer hardcoded.

BugLink: https://bugs.launchpad.net/bugs/1827961


Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Acked-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 86e8f298

drivers/net/usb/cdc_ether.c

+7 −0
Original line number Diff line number Diff line
@@ -766,6 +766,13 @@ static const struct usb_device_id products[] = { 
	.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,

drivers/net/usb/r8152.c

+39 −19
Original line number Diff line number Diff line
@@ -670,6 +670,7 @@ enum rtl8152_flags { 
	SCHEDULE_TASKLET,

	GREEN_ETHERNET,

	DELL_TB_RX_AGG_BUG,

	LENOVO_MACPASSTHRU,

};



/* Define these values to match your device */
@@ -1408,7 +1409,15 @@ static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa) 
	int ret = -EINVAL;

	u32 ocp_data;

	unsigned char buf[6];



	char *mac_obj_name;

	acpi_object_type mac_obj_type;

	int mac_strlen;



	if (test_bit(LENOVO_MACPASSTHRU, &tp->flags)) {

		mac_obj_name = "\\MACA";

		mac_obj_type = ACPI_TYPE_STRING;

		mac_strlen = 0x16;

	} else {

		/* test for -AD variant of RTL8153 */

		ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0);

		if ((ocp_data & AD_MASK) == 0x1000) {
@@ -1429,17 +1438,23 @@ static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa) 
			}

		}



		mac_obj_name = "\\_SB.AMAC";

		mac_obj_type = ACPI_TYPE_BUFFER;

		mac_strlen = 0x17;

	}



	/* returns _AUXMAC_#AABBCCDDEEFF# */

	status = acpi_evaluate_object(NULL, "\\_SB.AMAC", NULL, &buffer);

	status = acpi_evaluate_object(NULL, mac_obj_name, NULL, &buffer);

	obj = (union acpi_object *)buffer.pointer;

	if (!ACPI_SUCCESS(status))

		return -ENODEV;

	if (obj->type != ACPI_TYPE_BUFFER || obj->string.length != 0x17) {

	if (obj->type != mac_obj_type || obj->string.length != mac_strlen) {

		netif_warn(tp, probe, tp->netdev,

			   "Invalid buffer for pass-thru MAC addr: (%d, %d)\n",

			   obj->type, obj->string.length);

		goto amacout;

	}



	if (strncmp(obj->string.pointer, "_AUXMAC_#", 9) != 0 ||

	    strncmp(obj->string.pointer + 0x15, "#", 1) != 0) {

		netif_warn(tp, probe, tp->netdev,
@@ -6629,6 +6644,10 @@ static int rtl8152_probe(struct usb_interface *intf, 
		netdev->hw_features &= ~NETIF_F_RXCSUM;

	}



	if (le16_to_cpu(udev->descriptor.idVendor) == VENDOR_ID_LENOVO &&

	    le16_to_cpu(udev->descriptor.idProduct) == 0x3082)

		set_bit(LENOVO_MACPASSTHRU, &tp->flags);



	if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x3011 && udev->serial &&

	    (!strcmp(udev->serial, "000001000000") ||

	     !strcmp(udev->serial, "000002000000"))) {
@@ -6755,6 +6774,7 @@ static const struct usb_device_id rtl8152_table[] = { 
	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x304f)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3062)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3069)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3082)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x7205)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x720c)},

	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x7214)},

CRA Git | Maintained and supported by SUSTech CRA and CCSE