[PATCH] usb: quirks: Add quirk to prefer vendor-specific configuration

[Ivan Hu]

Some USB devices with multiple configurations expose a vendor-specific
interface class that should be preferred by default. However, the generic
usb_choose_configuration() logic selects the first configuration whose
first interface uses a non-vendor-specific class, which can lead to
incomplete or limited functionality.

Introduce a new quirk, USB_QUIRK_CHOOSE_VENDOR_SPEC_CFG, which
instructs the USB core to prefer a configuration that contains a
vendor-specific interface class when multiple configurations are present.

Apply this quirk to the ASIX AX88179 USB Ethernet adapter
(0x0b95:0x1790), which requires selecting its vendor-specific
configuration for full functionality, instead of falling back to
cdc_ncm.

Signed-off-by: Ivan Hu <ivan.hu@xxxxxxxxxxxxx>
---
 drivers/usb/core/generic.c | 15 +++++++++++++++
 drivers/usb/core/quirks.c  |  3 +++
 include/linux/usb/quirks.h |  3 +++
 3 files changed, 21 insertions(+)

diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index 9c6ae5e1198b..19bf35ede5a0 100644
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -23,6 +23,7 @@
 #include <linux/usb/hcd.h>
 #include <linux/string_choices.h>
 #include <uapi/linux/usb/audio.h>
+#include <linux/usb/quirks.h>
 #include "usb.h"
 
 static int is_rndis(struct usb_interface_descriptor *desc)
@@ -155,6 +156,20 @@ int usb_choose_configuration(struct usb_device *udev)
 			continue;
 		}
 
+		/* This quirk forces the selection of a vendor-specific
+		 * interface class configuration when multiple configurations
+		 * are present.
+		 */
+		if (num_configs > 1 &&
+			udev->descriptor.bDeviceClass ==
+						USB_CLASS_PER_INTERFACE &&
+				udev->quirks & USB_QUIRK_CHOOSE_VENDOR_SPEC_CFG
+				&& (desc && desc->bInterfaceClass ==
+						USB_CLASS_VENDOR_SPEC)) {
+			best = c;
+			break;
+		}
+
 		/* When the first config's first interface is one of Microsoft's
 		 * pet nonstandard Ethernet-over-USB protocols, ignore it unless
 		 * this kernel has enabled the necessary host side driver.
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 8efbacc5bc34..1e0e05cb29df 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -565,6 +565,9 @@ static const struct usb_device_id usb_quirk_list[] = {
 	/* INTEL VALUE SSD */
 	{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
 
+	/* ASIX AS88179 */
+	{ USB_DEVICE(0x0b95, 0x1790), .driver_info = USB_QUIRK_CHOOSE_VENDOR_SPEC_CFG },
+
 	{ }  /* terminating entry must be last */
 };
 
diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h
index 59409c1fc3de..1f73bfc191f0 100644
--- a/include/linux/usb/quirks.h
+++ b/include/linux/usb/quirks.h
@@ -75,4 +75,7 @@
 /* short SET_ADDRESS request timeout */
 #define USB_QUIRK_SHORT_SET_ADDRESS_REQ_TIMEOUT	BIT(16)
 
+/* force selection of vendor-specific configuration*/
+#define USB_QUIRK_CHOOSE_VENDOR_SPEC_CFG	BIT(17)
+
 #endif /* __LINUX_USB_QUIRKS_H */
-- 
2.34.1