Commit 80da2e0d authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Greg Kroah-Hartman
Browse files

usb: Add quirk detection based on interface information 



When a whole class of devices (possibly from a specific vendor, or
across multiple vendors) require a quirk, explictly listing all devices
in the class make the quirks table unnecessarily large. Fix this by
allowing matching devices based on interface information.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66177cc1

drivers/usb/core/driver.c

+23 −15
Original line number Diff line number Diff line
@@ -607,22 +607,10 @@ int usb_match_device(struct usb_device *dev, const struct usb_device_id *id) 
}



/* returns 0 if no match, 1 if match */

int usb_match_one_id(struct usb_interface *interface,

int usb_match_one_id_intf(struct usb_device *dev,

			  struct usb_host_interface *intf,

			  const struct usb_device_id *id)

{

	struct usb_host_interface *intf;

	struct usb_device *dev;



	/* proc_connectinfo in devio.c may call us with id == NULL. */

	if (id == NULL)

		return 0;



	intf = interface->cur_altsetting;

	dev = interface_to_usbdev(interface);



	if (!usb_match_device(dev, id))

		return 0;



	/* The interface class, subclass, protocol and number should never be

	 * checked for a match if the device class is Vendor Specific,

	 * unless the match record specifies the Vendor ID. */
@@ -652,6 +640,26 @@ int usb_match_one_id(struct usb_interface *interface, 


	return 1;

}



/* returns 0 if no match, 1 if match */

int usb_match_one_id(struct usb_interface *interface,

		     const struct usb_device_id *id)

{

	struct usb_host_interface *intf;

	struct usb_device *dev;



	/* proc_connectinfo in devio.c may call us with id == NULL. */

	if (id == NULL)

		return 0;



	intf = interface->cur_altsetting;

	dev = interface_to_usbdev(interface);



	if (!usb_match_device(dev, id))

		return 0;



	return usb_match_one_id_intf(dev, intf, id);

}

EXPORT_SYMBOL_GPL(usb_match_one_id);



/**

drivers/usb/core/hub.c

+7 −3
Original line number Diff line number Diff line
@@ -2069,7 +2069,7 @@ static int usb_enumerate_device(struct usb_device *udev) 
		if (err < 0) {

			dev_err(&udev->dev, "can't read configurations, error %d\n",

				err);

			goto fail;

			return err;

		}

	}

	if (udev->wusb == 1 && udev->authorized == 0) {
@@ -2085,8 +2085,12 @@ static int usb_enumerate_device(struct usb_device *udev) 
		udev->serial = usb_cache_string(udev, udev->descriptor.iSerialNumber);

	}

	err = usb_enumerate_device_otg(udev);

fail:

	if (err < 0)

		return err;



	usb_detect_interface_quirks(udev);



	return 0;

}



static void set_usb_port_removable(struct usb_device *udev)

drivers/usb/core/quirks.c

+72 −21
Original line number Diff line number Diff line
@@ -15,17 +15,22 @@ 
#include <linux/usb/quirks.h>

#include "usb.h"



/* List of quirky USB devices.  Please keep this list ordered by:

/* Lists of quirky USB devices, split in device quirks and interface quirks.

 * Device quirks are applied at the very beginning of the enumeration process,

 * right after reading the device descriptor. They can thus only match on device

 * information.

 *

 * Interface quirks are applied after reading all the configuration descriptors.

 * They can match on both device and interface information.

 *

 * Note that the DELAY_INIT and HONOR_BNUMINTERFACES quirks do not make sense as

 * interface quirks, as they only influence the enumeration process which is run

 * before processing the interface quirks.

 *

 * Please keep the lists ordered by:

 * 	1) Vendor ID

 * 	2) Product ID

 * 	3) Class ID

 *

 * as we want specific devices to be overridden first, and only after that, any

 * class specific quirks.

 *

 * Right now the logic aborts if it finds a valid device in the table, we might

 * want to change that in the future if it turns out that a whole class of

 * devices is broken...

 */

static const struct usb_device_id usb_quirk_list[] = {

	/* CBM - Flash disk */
@@ -156,16 +161,53 @@ static const struct usb_device_id usb_quirk_list[] = { 
	{ }  /* terminating entry must be last */

};



static const struct usb_device_id *find_id(struct usb_device *udev)

static const struct usb_device_id usb_interface_quirk_list[] = {

	{ }  /* terminating entry must be last */

};



static bool usb_match_any_interface(struct usb_device *udev,

				    const struct usb_device_id *id)

{

	const struct usb_device_id *id = usb_quirk_list;

	unsigned int i;



	for (i = 0; i < udev->descriptor.bNumConfigurations; ++i) {

		struct usb_host_config *cfg = &udev->config[i];

		unsigned int j;



		for (j = 0; j < cfg->desc.bNumInterfaces; ++j) {

			struct usb_interface_cache *cache;

			struct usb_host_interface *intf;



			cache = cfg->intf_cache[j];

			if (cache->num_altsetting == 0)

				continue;



	for (; id->idVendor || id->bDeviceClass || id->bInterfaceClass ||

			id->driver_info; id++) {

		if (usb_match_device(udev, id))

			return id;

			intf = &cache->altsetting[0];

			if (usb_match_one_id_intf(udev, intf, id))

				return true;

		}

	return NULL;

	}



	return false;

}



static u32 __usb_detect_quirks(struct usb_device *udev,

			       const struct usb_device_id *id)

{

	u32 quirks = 0;



	for (; id->match_flags; id++) {

		if (!usb_match_device(udev, id))

			continue;



		if ((id->match_flags & USB_DEVICE_ID_MATCH_INT_INFO) &&

		    !usb_match_any_interface(udev, id))

			continue;



		quirks |= (u32)(id->driver_info);

	}



	return quirks;

}



/*
@@ -173,11 +215,7 @@ static const struct usb_device_id *find_id(struct usb_device *udev) 
 */

void usb_detect_quirks(struct usb_device *udev)

{

	const struct usb_device_id *id = usb_quirk_list;



	id = find_id(udev);

	if (id)

		udev->quirks = (u32)(id->driver_info);

	udev->quirks = __usb_detect_quirks(udev, usb_quirk_list);

	if (udev->quirks)

		dev_dbg(&udev->dev, "USB quirks for this device: %x\n",

			udev->quirks);
@@ -197,3 +235,16 @@ void usb_detect_quirks(struct usb_device *udev) 
		udev->persist_enabled = 1;

#endif	/* CONFIG_PM */

}



void usb_detect_interface_quirks(struct usb_device *udev)

{

	u32 quirks;



	quirks = __usb_detect_quirks(udev, usb_interface_quirk_list);

	if (quirks == 0)

		return;



	dev_dbg(&udev->dev, "USB interface quirks for this device: %x\n",

		quirks);

	udev->quirks |= quirks;

}

drivers/usb/core/usb.h

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ extern void usb_disable_device(struct usb_device *dev, int skip_ep0); 
extern int usb_deauthorize_device(struct usb_device *);

extern int usb_authorize_device(struct usb_device *);

extern void usb_detect_quirks(struct usb_device *udev);

extern void usb_detect_interface_quirks(struct usb_device *udev);

extern int usb_remove_device(struct usb_device *udev);



extern int usb_get_device_descriptor(struct usb_device *dev,
@@ -37,6 +38,9 @@ extern int usb_set_configuration(struct usb_device *dev, int configuration); 
extern int usb_choose_configuration(struct usb_device *udev);



extern void usb_kick_khubd(struct usb_device *dev);

extern int usb_match_one_id_intf(struct usb_device *dev,

				 struct usb_host_interface *intf,

				 const struct usb_device_id *id);

extern int usb_match_device(struct usb_device *dev,

			    const struct usb_device_id *id);

extern void usb_forced_unbind_intf(struct usb_interface *intf);

CRA Git | Maintained and supported by SUSTech CRA and CCSE