[PATCH] backport: r8152: PID for the Lenovo OneLink+ Dock

[PATCH] backport: r8152: PID for the Lenovo OneLink+ Dock

[Jean-Francois Le Fillatre]

[ Upstream commit 1bd3a383075c64d638e65d263c9267b08ee7733c ]

The Lenovo OneLink+ Dock contains an RTL8153 controller that behaves as
a broken CDC device by default. Add the custom Lenovo PID to the r8152
driver to support it properly.

This backport removes the PID declaration for MAC address passthrough,
for kernels that don't support the feature.

Applies to v4.14, v4.19, v5.4, v5.10

Signed-off-by: Jean-Francois Le Fillatre <jflf_kernel@gmx.com>
---
 drivers/net/usb/cdc_ether.c | 7 +++++++
 drivers/net/usb/r8152.c     | 1 +
 2 files changed, 8 insertions(+)

diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 778bd9aaba9f..17b932505be0 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -777,6 +777,13 @@ static const struct usb_device_id	products[] = {
 },
 #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,
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 4764e4f54cef..df12af5b87df 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -5325,6 +5325,7 @@ static const struct usb_device_id rtl8152_table[] = {
 	{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)},
 	{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
 	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x304f)},
+	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3054)},
 	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3062)},
 	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3069)},
 	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x7205)},
--
2.34.1

Re: [PATCH] backport: r8152: PID for the Lenovo OneLink+ Dock

[Greg KH]

On Mon, Oct 24, 2022 at 11:42:07PM +0200, Jean-Francois Le Fillatre wrote:
> [ Upstream commit 1bd3a383075c64d638e65d263c9267b08ee7733c ]
> 
> The Lenovo OneLink+ Dock contains an RTL8153 controller that behaves as
> a broken CDC device by default. Add the custom Lenovo PID to the r8152
> driver to support it properly.
> 
> This backport removes the PID declaration for MAC address passthrough,
> for kernels that don't support the feature.
> 
> Applies to v4.14, v4.19, v5.4, v5.10
> 
> Signed-off-by: Jean-Francois Le Fillatre <jflf_kernel@gmx.com>

All now queued up, thanks.

greg k-h

Re: [PATCH] backport: r8152: PID for the Lenovo OneLink+ Dock

[jflf_kernel]

On 26/10/2022 18.52, Greg KH wrote:
> On Mon, Oct 24, 2022 at 11:42:07PM +0200, Jean-Francois Le Fillatre wrote:
>> [ Upstream commit 1bd3a383075c64d638e65d263c9267b08ee7733c ]
>>
>> The Lenovo OneLink+ Dock contains an RTL8153 controller that behaves as
>> a broken CDC device by default. Add the custom Lenovo PID to the r8152
>> driver to support it properly.
>>
>> This backport removes the PID declaration for MAC address passthrough,
>> for kernels that don't support the feature.
>>
>> Applies to v4.14, v4.19, v5.4, v5.10
>>
>> Signed-off-by: Jean-Francois Le Fillatre <jflf_kernel@gmx.com>
> 
> All now queued up, thanks.
> 
> greg k-h

Thank you very much, much appreciated. It's been a learning curve.

JF