Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Subject: Re: Fwd: 3 more broken Zaurii - SL-5600, A300, C700
To:     Dave Jones <davej@codemonkey.org.uk>,
        Thorsten Leemhuis <regressions@leemhuis.info>,
        Bagas Sanjaya <bagasdotme@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Regressions <regressions@lists.linux.dev>,
        Linux Networking <netdev@vger.kernel.org>,
        Linux USB <linux-usb@vger.kernel.org>,
        Oliver Neukum <oneukum@suse.com>
References: <7ea9abd8-c35d-d329-f0d4-c8bd220cf691@gmail.com>
 <50f4c10d-260c-cb98-e7d2-124f5519fa68@gmail.com>
 <e1fdc435-089c-8ce7-d536-ce3780a4ba95@leemhuis.info>
 <ZKbuoRBi50i8OZ9d@codemonkey.org.uk>
From:   Ross Maynard <bids.7405@bigpond.com>
Message-ID: <62a9e058-c853-1fcd-5663-e2e001f881e9@bigpond.com>
Date:   Fri, 7 Jul 2023 22:28:11 +1000
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.4.1
MIME-Version: 1.0
In-Reply-To: <ZKbuoRBi50i8OZ9d@codemonkey.org.uk>
Content-Type: multipart/mixed;
 boundary="------------8628B942F2195D19390C676E"
Content-Language: en-US
Precedence: bulk

This is a multi-part message in MIME format.
--------------8628B942F2195D19390C676E
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

I am not a kernel developer, but I think the attached patch would work.

Ross

On 7/7/23 2:41 am, Dave Jones wrote:
> On Thu, Jul 06, 2023 at 01:45:57PM +0200, Thorsten Leemhuis wrote:
>   > On 06.07.23 05:08, Bagas Sanjaya wrote:
>   > >>
>   > >> I notice a regression report on Bugzilla [1]. Quoting from it:
>   > >>
>   > >>> The following patch broke support of 3 more Zaurus models: SL-5600, A300 and C700
>   > >>>
>   > >>> [16adf5d07987d93675945f3cecf0e33706566005] usbnet: Remove over-broad module alias from zaurus
>   >
>   > ...
>   > He sometimes shows up on Linux kernel lists, but I doubt he cares about
>   > that change after all these years. And I would not blame him at all.
>
> That's about the size of it.  This is pretty near the bottom of my ever-shrinking
> list of kernel drivers I care about.
>
>   > Yes, we have the "no regressions" rule, but contributing a change to the
>   > kernel OTOH should not mean that you are responsible for all regressions
>   > it causes for your whole life. :-)
>
> That said, 12 years later, 16adf5d07987d93675945f3cecf0e33706566005
> is still the right thing to do. Adding actual matches for the devices
> rather than matching by class will prevent this getting loaded where it
> doesn't need to be.
>
> If someone actually cares to get this working, cargo-culting Oliver's
> change to add the extra id is likely the way forward.
>
> 	Dave
>

--------------8628B942F2195D19390C676E
Content-Type: text/x-patch; charset=UTF-8;
 name="3-zaurii-patch.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="3-zaurii-patch.patch"

diff -urpN a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
--- a/drivers/net/usb/cdc_ether.c	2023-07-07 17:48:27.991833366 +1000
+++ b/drivers/net/usb/cdc_ether.c	2023-07-07 21:53:11.556198087 +1000
@@ -616,6 +616,13 @@ static const struct usb_device_id	produc
 }, {
 	.match_flags	=   USB_DEVICE_ID_MATCH_INT_INFO
 			  | USB_DEVICE_ID_MATCH_DEVICE,
+    .idVendor		= 0x04DD,
+    .idProduct		= 0x8005,   /* A-300 */
+    ZAURUS_FAKE_INTERFACE,
+    .driver_info        = 0,
+}, {
+    .match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
+			  | USB_DEVICE_ID_MATCH_DEVICE,
 	.idVendor		= 0x04DD,
 	.idProduct		= 0x8006,	/* B-500/SL-5600 */
 	ZAURUS_MASTER_INTERFACE,
@@ -623,12 +630,26 @@ static const struct usb_device_id	produc
 }, {
 	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
 			  | USB_DEVICE_ID_MATCH_DEVICE,
+    .idVendor		= 0x04DD,
+    .idProduct		= 0x8006,   /* B-500/SL-5600 */
+    ZAURUS_FAKE_INTERFACE,
+    .driver_info        = 0,
+}, {
+    .match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
+			  | USB_DEVICE_ID_MATCH_DEVICE,
 	.idVendor		= 0x04DD,
 	.idProduct		= 0x8007,	/* C-700 */
 	ZAURUS_MASTER_INTERFACE,
 	.driver_info		= 0,
 }, {
 	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
+			  | USB_DEVICE_ID_MATCH_DEVICE,
+    .idVendor		= 0x04DD,
+    .idProduct		= 0x8007,   /* C-700 */
+    ZAURUS_FAKE_INTERFACE,
+    .driver_info        = 0,
+}, {
+    .match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
 		 | USB_DEVICE_ID_MATCH_DEVICE,
 	.idVendor               = 0x04DD,
 	.idProduct              = 0x9031,	/* C-750 C-760 */
Binary files a/drivers/net/usb/.cdc_ether.c.swp and b/drivers/net/usb/.cdc_ether.c.swp differ
diff -urpN a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c
--- a/drivers/net/usb/zaurus.c	2023-07-07 17:48:28.043849110 +1000
+++ b/drivers/net/usb/zaurus.c	2023-07-07 22:06:49.267699853 +1000
@@ -289,11 +289,25 @@ static const struct usb_device_id	produc
 	.match_flags	=   USB_DEVICE_ID_MATCH_INT_INFO
 			  | USB_DEVICE_ID_MATCH_DEVICE,
 	.idVendor		= 0x04DD,
+	.idProduct		= 0x8005,	/* A-300 */
+	ZAURUS_FAKE_INTERFACE,
+	.driver_info = (unsigned long) &bogus_mdlm_info,
+}, {
+	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
+			  | USB_DEVICE_ID_MATCH_DEVICE,
+	.idVendor		= 0x04DD,
 	.idProduct		= 0x8006,	/* B-500/SL-5600 */
 	ZAURUS_MASTER_INTERFACE,
 	.driver_info = ZAURUS_PXA_INFO,
 }, {
 	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
+			  | USB_DEVICE_ID_MATCH_DEVICE,
+	.idVendor		= 0x04DD,
+	.idProduct		= 0x8006,	/* B-500/SL-5600 */
+	ZAURUS_FAKE_INTERFACE,
+	.driver_info = (unsigned long) &bogus_mdlm_info,
+}, {
+	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
 	          | USB_DEVICE_ID_MATCH_DEVICE,
 	.idVendor		= 0x04DD,
 	.idProduct		= 0x8007,	/* C-700 */
@@ -301,6 +315,13 @@ static const struct usb_device_id	produc
 	.driver_info = ZAURUS_PXA_INFO,
 }, {
 	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
+			  | USB_DEVICE_ID_MATCH_DEVICE,
+	.idVendor		= 0x04DD,
+	.idProduct		= 0x8007,	/* C-700 */
+	ZAURUS_FAKE_INTERFACE,
+	.driver_info = (unsigned long) &bogus_mdlm_info,
+}, {
+        .match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
 		 | USB_DEVICE_ID_MATCH_DEVICE,
 	.idVendor               = 0x04DD,
 	.idProduct              = 0x9031,	/* C-750 C-760 */

--------------8628B942F2195D19390C676E--