![Alan Stern](/assets/img/avatar_default.png)
This patch (as1052) enables USB-PERSIST for all devices by default. The user won't have to remember to enable it explicitly for devices containing mounted filesystems. Eventually userspace tools like hal may be able to set the persist attribute automatically when a filesystem is mounted on a USB device. When that time comes this patch can be reverted, if people think it matters. This approach has the advantage of giving the user the ability to turn off USB-PERSIST for devices with mounted filesystems, rather than making the kernel always assume it should be on. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
115 lines
3.3 KiB
C
115 lines
3.3 KiB
C
/*
|
|
* USB device quirk handling logic and table
|
|
*
|
|
* Copyright (c) 2007 Oliver Neukum
|
|
* Copyright (c) 2007 Greg Kroah-Hartman <gregkh@suse.de>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the Free
|
|
* Software Foundation, version 2.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#include <linux/usb.h>
|
|
#include <linux/usb/quirks.h>
|
|
#include "usb.h"
|
|
|
|
/* List of quirky USB devices. Please keep this list 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 */
|
|
{ USB_DEVICE(0x0204, 0x6025), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
|
|
/* HP 5300/5370C scanner */
|
|
{ USB_DEVICE(0x03f0, 0x0701), .driver_info =
|
|
USB_QUIRK_STRING_FETCH_255 },
|
|
|
|
/* Creative SB Audigy 2 NX */
|
|
{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
|
|
/* Philips PSC805 audio device */
|
|
{ USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
|
|
/* Roland SC-8820 */
|
|
{ USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
|
|
/* Edirol SD-20 */
|
|
{ USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
|
|
/* M-Systems Flash Disk Pioneers */
|
|
{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
|
|
/* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */
|
|
{ USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },
|
|
|
|
/* Action Semiconductor flash disk */
|
|
{ USB_DEVICE(0x10d6, 0x2200), .driver_info =
|
|
USB_QUIRK_STRING_FETCH_255 },
|
|
|
|
/* SKYMEDI USB_DRIVE */
|
|
{ USB_DEVICE(0x1516, 0x8628), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
|
|
/* INTEL VALUE SSD */
|
|
{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
|
|
|
|
{ } /* terminating entry must be last */
|
|
};
|
|
|
|
static const struct usb_device_id *find_id(struct usb_device *udev)
|
|
{
|
|
const struct usb_device_id *id = usb_quirk_list;
|
|
|
|
for (; id->idVendor || id->bDeviceClass || id->bInterfaceClass ||
|
|
id->driver_info; id++) {
|
|
if (usb_match_device(udev, id))
|
|
return id;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Detect any quirks the device has, and do any housekeeping for it if needed.
|
|
*/
|
|
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);
|
|
if (udev->quirks)
|
|
dev_dbg(&udev->dev, "USB quirks for this device: %x\n",
|
|
udev->quirks);
|
|
|
|
/* By default, disable autosuspend for all non-hubs */
|
|
#ifdef CONFIG_USB_SUSPEND
|
|
if (udev->descriptor.bDeviceClass != USB_CLASS_HUB)
|
|
udev->autosuspend_disabled = 1;
|
|
#endif
|
|
|
|
/* For the present, all devices default to USB-PERSIST enabled */
|
|
#if 0 /* was: #ifdef CONFIG_PM */
|
|
/* Hubs are automatically enabled for USB-PERSIST */
|
|
if (udev->descriptor.bDeviceClass == USB_CLASS_HUB)
|
|
udev->persist_enabled = 1;
|
|
|
|
#else
|
|
/* In the absence of PM, we can safely enable USB-PERSIST
|
|
* for all devices. It will affect things like hub resets
|
|
* and EMF-related port disables.
|
|
*/
|
|
udev->persist_enabled = 1;
|
|
#endif /* CONFIG_PM */
|
|
}
|