/* Wakes up khubd */
static spinlock_t hub_event_lock = SPIN_LOCK_UNLOCKED;
-static DECLARE_MUTEX(usb_address0_sem);
static LIST_HEAD(hub_event_list); /* List of hubs needing servicing */
static LIST_HEAD(hub_list); /* List of all hubs (for cleanup) */
#endif
/* for dev_info, dev_dbg, etc */
-static inline struct device *hubdev (struct usb_device *dev)
+static inline struct device *hubdev (struct usb_device *hdev)
{
- return &dev->actconfig->interface[0]->dev;
+ return &hdev->actconfig->interface[0]->dev;
}
/* USB 2.0 spec Section 11.24.4.5 */
-static int get_hub_descriptor(struct usb_device *dev, void *data, int size)
+static int get_hub_descriptor(struct usb_device *hdev, void *data, int size)
{
- return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+ return usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
USB_REQ_GET_DESCRIPTOR, USB_DIR_IN | USB_RT_HUB,
USB_DT_HUB << 8, 0, data, size, HZ * USB_CTRL_GET_TIMEOUT);
}
/*
* USB 2.0 spec Section 11.24.2.1
*/
-static int clear_hub_feature(struct usb_device *dev, int feature)
+static int clear_hub_feature(struct usb_device *hdev, int feature)
{
- return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+ return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
USB_REQ_CLEAR_FEATURE, USB_RT_HUB, feature, 0, NULL, 0, HZ);
}
/*
* USB 2.0 spec Section 11.24.2.2
*/
-static int clear_port_feature(struct usb_device *dev, int port, int feature)
+static int clear_port_feature(struct usb_device *hdev, int port, int feature)
{
- return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+ return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
USB_REQ_CLEAR_FEATURE, USB_RT_PORT, feature, port, NULL, 0, HZ);
}
/*
* USB 2.0 spec Section 11.24.2.13
*/
-static int set_port_feature(struct usb_device *dev, int port, int feature)
+static int set_port_feature(struct usb_device *hdev, int port, int feature)
{
- return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+ return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
USB_REQ_SET_FEATURE, USB_RT_PORT, feature, port, NULL, 0, HZ);
}
* for info about using port indicators
*/
static void set_port_led(
- struct usb_device *dev,
- struct usb_hub *hub,
+ struct usb_device *hdev,
int port,
int selector
)
{
- int status = set_port_feature(dev, (selector << 8) | port,
+ int status = set_port_feature(hdev, (selector << 8) | port,
USB_PORT_FEAT_INDICATOR);
if (status < 0)
- dev_dbg (&hub->intf->dev,
+ dev_dbg (hubdev (hdev),
"port %d indicator %s status %d\n",
port,
({ char *s; switch (selector) {
static void led_work (void *__hub)
{
struct usb_hub *hub = __hub;
- struct usb_device *dev = interface_to_usbdev (hub->intf);
+ struct usb_device *hdev = interface_to_usbdev (hub->intf);
unsigned i;
unsigned changed = 0;
int cursor = -1;
- if (dev->state != USB_STATE_CONFIGURED)
+ if (hdev->state != USB_STATE_CONFIGURED)
return;
for (i = 0; i < hub->descriptor->bNbrPorts; i++) {
}
if (selector != HUB_LED_AUTO)
changed = 1;
- set_port_led(dev, hub, i + 1, selector);
+ set_port_led(hdev, i + 1, selector);
hub->indicator[i] = mode;
}
if (!changed && blinkenlights) {
cursor++;
cursor %= hub->descriptor->bNbrPorts;
- set_port_led(dev, hub, cursor + 1, HUB_LED_GREEN);
+ set_port_led(hdev, cursor + 1, HUB_LED_GREEN);
hub->indicator[cursor] = INDICATOR_CYCLE;
changed++;
}
/*
* USB 2.0 spec Section 11.24.2.6
*/
-static int get_hub_status(struct usb_device *dev,
+static int get_hub_status(struct usb_device *hdev,
struct usb_hub_status *data)
{
- return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+ return usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_HUB, 0, 0,
data, sizeof(*data), HZ * USB_CTRL_GET_TIMEOUT);
}
/*
* USB 2.0 spec Section 11.24.2.7
*/
-static int get_port_status(struct usb_device *dev, int port,
+static int get_port_status(struct usb_device *hdev, int port,
struct usb_port_status *data)
{
- return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+ return usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, port,
data, sizeof(*data), HZ * USB_CTRL_GET_TIMEOUT);
}
/* USB 2.0 spec Section 11.24.2.3 */
static inline int
-hub_clear_tt_buffer (struct usb_device *hub, u16 devinfo, u16 tt)
+hub_clear_tt_buffer (struct usb_device *hdev, u16 devinfo, u16 tt)
{
- return usb_control_msg (hub, usb_rcvctrlpipe (hub, 0),
+ return usb_control_msg (hdev, usb_rcvctrlpipe (hdev, 0),
HUB_CLEAR_TT_BUFFER, USB_RT_PORT,
devinfo, tt, 0, 0, HZ);
}
while (!list_empty (&hub->tt.clear_list)) {
struct list_head *temp;
struct usb_tt_clear *clear;
- struct usb_device *dev;
+ struct usb_device *hdev;
int status;
temp = hub->tt.clear_list.next;
/* drop lock so HCD can concurrently report other TT errors */
spin_unlock_irqrestore (&hub->tt.lock, flags);
- dev = interface_to_usbdev (hub->intf);
- status = hub_clear_tt_buffer (dev, clear->devinfo, clear->tt);
+ hdev = interface_to_usbdev (hub->intf);
+ status = hub_clear_tt_buffer (hdev, clear->devinfo, clear->tt);
spin_lock_irqsave (&hub->tt.lock, flags);
if (status)
- dev_err (&dev->dev, "clear tt %d (%04x) error %d\n",
+ dev_err (&hdev->dev,
+ "clear tt %d (%04x) error %d\n",
clear->tt, clear->devinfo, status);
kfree (clear);
}
* It may not be possible for that hub to handle additional full (or low)
* speed transactions until that state is fully cleared out.
*/
-void usb_hub_tt_clear_buffer (struct usb_device *dev, int pipe)
+void usb_hub_tt_clear_buffer (struct usb_device *udev, int pipe)
{
- struct usb_tt *tt = dev->tt;
+ struct usb_tt *tt = udev->tt;
unsigned long flags;
struct usb_tt_clear *clear;
* there can be many TTs per hub). even if they're uncommon.
*/
if ((clear = kmalloc (sizeof *clear, SLAB_ATOMIC)) == 0) {
- dev_err (&dev->dev, "can't save CLEAR_TT_BUFFER state\n");
+ dev_err (&udev->dev, "can't save CLEAR_TT_BUFFER state\n");
/* FIXME recover somehow ... RESET_TT? */
return;
}
/* info that CLEAR_TT_BUFFER needs */
- clear->tt = tt->multi ? dev->ttport : 1;
+ clear->tt = tt->multi ? udev->ttport : 1;
clear->devinfo = usb_pipeendpoint (pipe);
- clear->devinfo |= dev->devnum << 4;
+ clear->devinfo |= udev->devnum << 4;
clear->devinfo |= usb_pipecontrol (pipe)
? (USB_ENDPOINT_XFER_CONTROL << 11)
: (USB_ENDPOINT_XFER_BULK << 11);
static void hub_power_on(struct usb_hub *hub)
{
- struct usb_device *dev;
+ struct usb_device *hdev;
int i;
- /* Enable power to the ports */
- dev_dbg(hubdev(interface_to_usbdev(hub->intf)),
- "enabling power on all ports\n");
- dev = interface_to_usbdev(hub->intf);
- for (i = 0; i < hub->descriptor->bNbrPorts; i++)
- set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
+ /* if hub supports power switching, enable power on each port */
+ if ((hub->descriptor->wHubCharacteristics & HUB_CHAR_LPSM) < 2) {
+ dev_dbg(&hub->intf->dev, "enabling power on all ports\n");
+ hdev = interface_to_usbdev(hub->intf);
+ for (i = 0; i < hub->descriptor->bNbrPorts; i++)
+ set_port_feature(hdev, i + 1, USB_PORT_FEAT_POWER);
+ }
/* Wait for power to be enabled */
- wait_ms(hub->descriptor->bPwrOn2PwrGood * 2);
+ msleep(hub->descriptor->bPwrOn2PwrGood * 2);
}
static int hub_hub_status(struct usb_hub *hub,
u16 *status, u16 *change)
{
- struct usb_device *dev = interface_to_usbdev (hub->intf);
+ struct usb_device *hdev = interface_to_usbdev (hub->intf);
int ret;
- ret = get_hub_status(dev, &hub->status->hub);
+ ret = get_hub_status(hdev, &hub->status->hub);
if (ret < 0)
- dev_err (hubdev (dev),
+ dev_err (&hub->intf->dev,
"%s failed (err = %d)\n", __FUNCTION__, ret);
else {
*status = le16_to_cpu(hub->status->hub.wHubStatus);
static int hub_configure(struct usb_hub *hub,
struct usb_endpoint_descriptor *endpoint)
{
- struct usb_device *dev = interface_to_usbdev (hub->intf);
- struct device *hub_dev;
+ struct usb_device *hdev = interface_to_usbdev (hub->intf);
+ struct device *hub_dev = &hub->intf->dev;
u16 hubstatus, hubchange;
unsigned int pipe;
int maxp, ret;
char *message;
- hub->buffer = usb_buffer_alloc(dev, sizeof(*hub->buffer), GFP_KERNEL,
+ hub->buffer = usb_buffer_alloc(hdev, sizeof(*hub->buffer), GFP_KERNEL,
&hub->buffer_dma);
if (!hub->buffer) {
message = "can't allocate hub irq buffer";
* hub->descriptor can handle USB_MAXCHILDREN ports,
* but the hub can/will return fewer bytes here.
*/
- ret = get_hub_descriptor(dev, hub->descriptor,
+ ret = get_hub_descriptor(hdev, hub->descriptor,
sizeof(*hub->descriptor));
if (ret < 0) {
message = "can't read hub descriptor";
goto fail;
}
- hub_dev = hubdev(dev);
- dev->maxchild = hub->descriptor->bNbrPorts;
- dev_info (hub_dev, "%d port%s detected\n", dev->maxchild,
- (dev->maxchild == 1) ? "" : "s");
+ hdev->maxchild = hub->descriptor->bNbrPorts;
+ dev_info (hub_dev, "%d port%s detected\n", hdev->maxchild,
+ (hdev->maxchild == 1) ? "" : "s");
le16_to_cpus(&hub->descriptor->wHubCharacteristics);
int i;
char portstr [USB_MAXCHILDREN + 1];
- for (i = 0; i < dev->maxchild; i++)
+ for (i = 0; i < hdev->maxchild; i++)
portstr[i] = hub->descriptor->DeviceRemovable
[((i + 1) / 8)] & (1 << ((i + 1) % 8))
? 'F' : 'R';
- portstr[dev->maxchild] = 0;
+ portstr[hdev->maxchild] = 0;
dev_dbg(hub_dev, "compound device; port removable status: %s\n", portstr);
} else
dev_dbg(hub_dev, "standalone hub\n");
spin_lock_init (&hub->tt.lock);
INIT_LIST_HEAD (&hub->tt.clear_list);
INIT_WORK (&hub->tt.kevent, hub_tt_kevent, hub);
- switch (dev->descriptor.bDeviceProtocol) {
+ switch (hdev->descriptor.bDeviceProtocol) {
case 0:
break;
case 1:
dev_dbg(hub_dev, "Single TT\n");
- hub->tt.hub = dev;
+ hub->tt.hub = hdev;
break;
case 2:
- ret = usb_set_interface(dev, 0, 1);
+ ret = usb_set_interface(hdev, 0, 1);
if (ret == 0) {
dev_dbg(hub_dev, "TT per port\n");
hub->tt.multi = 1;
} else
dev_err(hub_dev, "Using single TT (err %d)\n",
ret);
- hub->tt.hub = dev;
+ hub->tt.hub = hdev;
break;
default:
dev_dbg(hub_dev, "Unrecognized hub protocol %d\n",
- dev->descriptor.bDeviceProtocol);
+ hdev->descriptor.bDeviceProtocol);
break;
}
switch (hub->descriptor->wHubCharacteristics & HUB_CHAR_TTTT) {
case 0x00:
- if (dev->descriptor.bDeviceProtocol != 0)
+ if (hdev->descriptor.bDeviceProtocol != 0)
dev_dbg(hub_dev, "TT requires at most 8 FS bit times\n");
break;
case 0x20:
dev_dbg(hub_dev, "power on to power good time: %dms\n",
hub->descriptor->bPwrOn2PwrGood * 2);
- dev_dbg(hub_dev, "hub controller current requirement: %dmA\n",
- hub->descriptor->bHubContrCurrent);
+
+ /* power budgeting mostly matters with bus-powered hubs,
+ * and battery-powered root hubs (may provide just 8 mA).
+ */
+ ret = usb_get_status(hdev, USB_RECIP_DEVICE, 0, &hubstatus);
+ if (ret < 0) {
+ message = "can't get hub status";
+ goto fail;
+ }
+ cpu_to_le16s(&hubstatus);
+ if ((hubstatus & (1 << USB_DEVICE_SELF_POWERED)) == 0) {
+ dev_dbg(hub_dev, "hub controller current requirement: %dmA\n",
+ hub->descriptor->bHubContrCurrent);
+ hub->power_budget = (501 - hub->descriptor->bHubContrCurrent)
+ / 2;
+ dev_dbg(hub_dev, "%dmA bus power budget for children\n",
+ hub->power_budget * 2);
+ }
+
ret = hub_hub_status(hub, &hubstatus, &hubchange);
if (ret < 0) {
goto fail;
}
- /* FIXME implement per-port power budgeting;
- * enable it for bus-powered hubs.
- */
- dev_dbg(hub_dev, "local power source is %s\n",
- (hubstatus & HUB_STATUS_LOCAL_POWER)
- ? "lost (inactive)" : "good");
+ /* local power status reports aren't always correct */
+ if (hdev->actconfig->desc.bmAttributes & USB_CONFIG_ATT_SELFPOWER)
+ dev_dbg(hub_dev, "local power source is %s\n",
+ (hubstatus & HUB_STATUS_LOCAL_POWER)
+ ? "lost (inactive)" : "good");
if ((hub->descriptor->wHubCharacteristics & HUB_CHAR_OCPM) == 0)
dev_dbg(hub_dev, "%sover-current condition exists\n",
(hubstatus & HUB_STATUS_OVERCURRENT) ? "" : "no ");
/* Start the interrupt endpoint */
- pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
- maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
+ pipe = usb_rcvintpipe(hdev, endpoint->bEndpointAddress);
+ maxp = usb_maxpacket(hdev, pipe, usb_pipeout(pipe));
if (maxp > sizeof(*hub->buffer))
maxp = sizeof(*hub->buffer);
goto fail;
}
- usb_fill_int_urb(hub->urb, dev, pipe, *hub->buffer, maxp, hub_irq,
+ usb_fill_int_urb(hub->urb, hdev, pipe, *hub->buffer, maxp, hub_irq,
hub, endpoint->bInterval);
hub->urb->transfer_dma = hub->buffer_dma;
hub->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
/* maybe start cycling the hub leds */
if (hub->has_indicators && blinkenlights) {
- set_port_led(dev, hub, 1, HUB_LED_GREEN);
+ set_port_led(hdev, 1, HUB_LED_GREEN);
hub->indicator [0] = INDICATOR_CYCLE;
schedule_delayed_work(&hub->leds, LED_CYCLE_PERIOD);
}
return 0;
fail:
- dev_err (&hub->intf->dev, "config failed, %s (err %d)\n",
+ dev_err (hub_dev, "config failed, %s (err %d)\n",
message, ret);
/* hub_disconnect() frees urb and descriptor */
return ret;
}
+static unsigned highspeed_hubs;
+
static void hub_disconnect(struct usb_interface *intf)
{
struct usb_hub *hub = usb_get_intfdata (intf);
if (!hub)
return;
+ if (interface_to_usbdev(intf)->speed == USB_SPEED_HIGH)
+ highspeed_hubs--;
+
usb_set_intfdata (intf, NULL);
spin_lock_irqsave(&hub_event_lock, flags);
hub->urb_complete = &urb_complete;
{
struct usb_host_interface *desc;
struct usb_endpoint_descriptor *endpoint;
- struct usb_device *dev;
+ struct usb_device *hdev;
struct usb_hub *hub;
+ struct device *hub_dev;
unsigned long flags;
desc = intf->cur_altsetting;
- dev = interface_to_usbdev(intf);
+ hdev = interface_to_usbdev(intf);
+ hub_dev = &intf->dev;
/* Some hubs have a subclass of 1, which AFAICT according to the */
/* specs is not defined, but it works */
if ((desc->desc.bInterfaceSubClass != 0) &&
(desc->desc.bInterfaceSubClass != 1)) {
descriptor_error:
- dev_err (&intf->dev, "bad descriptor, ignoring hub\n");
+ dev_err (hub_dev, "bad descriptor, ignoring hub\n");
return -EIO;
}
}
/* We found a hub */
- dev_info (hubdev (dev), "USB hub found\n");
+ dev_info (hub_dev, "USB hub found\n");
hub = kmalloc(sizeof(*hub), GFP_KERNEL);
if (!hub) {
- dev_dbg (hubdev(dev), "couldn't kmalloc hub struct\n");
+ dev_dbg (hub_dev, "couldn't kmalloc hub struct\n");
return -ENOMEM;
}
usb_set_intfdata (intf, hub);
+ if (hdev->speed == USB_SPEED_HIGH)
+ highspeed_hubs++;
+
if (hub_configure(hub, endpoint) >= 0)
return 0;
static int
hub_ioctl(struct usb_interface *intf, unsigned int code, void *user_data)
{
- struct usb_device *hub = interface_to_usbdev (intf);
+ struct usb_device *hdev = interface_to_usbdev (intf);
/* assert ifno == 0 (part of hub spec) */
switch (code) {
int i;
spin_lock_irqsave(&hub_event_lock, flags);
- if (hub->devnum <= 0)
+ if (hdev->devnum <= 0)
info->nports = 0;
else {
- info->nports = hub->maxchild;
+ info->nports = hdev->maxchild;
for (i = 0; i < info->nports; i++) {
- if (hub->children[i] == NULL)
+ if (hdev->children[i] == NULL)
info->port[i] = 0;
else
info->port[i] =
- hub->children[i]->devnum;
+ hdev->children[i]->devnum;
}
}
spin_unlock_irqrestore(&hub_event_lock, flags);
static int hub_reset(struct usb_hub *hub)
{
- struct usb_device *dev = interface_to_usbdev(hub->intf);
+ struct usb_device *hdev = interface_to_usbdev(hub->intf);
int i;
/* Disconnect any attached devices */
for (i = 0; i < hub->descriptor->bNbrPorts; i++) {
- if (dev->children[i])
- usb_disconnect(&dev->children[i]);
+ if (hdev->children[i])
+ usb_disconnect(&hdev->children[i]);
}
/* Attempt to reset the hub */
else
return -1;
- if (usb_reset_device(dev))
+ if (usb_reset_device(hdev))
return -1;
- hub->urb->dev = dev;
+ hub->urb->dev = hdev;
if (usb_submit_urb(hub->urb, GFP_KERNEL))
return -1;
return 0;
}
-static void hub_start_disconnect(struct usb_device *dev)
+static void hub_start_disconnect(struct usb_device *hdev)
{
- struct usb_device *parent = dev->parent;
+ struct usb_device *parent = hdev->parent;
int i;
/* Find the device pointer to disconnect */
if (parent) {
for (i = 0; i < parent->maxchild; i++) {
- if (parent->children[i] == dev) {
+ if (parent->children[i] == hdev) {
usb_disconnect(&parent->children[i]);
return;
}
}
}
- dev_err(&dev->dev, "cannot disconnect hub!\n");
+ dev_err(&hdev->dev, "cannot disconnect hub!\n");
}
-static int hub_port_status(struct usb_device *dev, int port,
+static int hub_port_status(struct usb_device *hdev, int port,
u16 *status, u16 *change)
{
- struct usb_hub *hub = usb_get_intfdata(dev->actconfig->interface[0]);
+ struct usb_hub *hub = usb_get_intfdata(hdev->actconfig->interface[0]);
int ret;
if (!hub)
return -ENODEV;
- ret = get_port_status(dev, port + 1, &hub->status->port);
+ ret = get_port_status(hdev, port + 1, &hub->status->port);
if (ret < 0)
- dev_err (hubdev (dev),
+ dev_err (&hub->intf->dev,
"%s failed (err = %d)\n", __FUNCTION__, ret);
else {
*status = le16_to_cpu(hub->status->port.wPortStatus);
return ret;
}
-#define HUB_RESET_TRIES 5
-#define HUB_PROBE_TRIES 2
+#define PORT_RESET_TRIES 5
+#define SET_ADDRESS_TRIES 2
+#define GET_DESCRIPTOR_TRIES 2
+#define SET_CONFIG_TRIES 2
+
#define HUB_ROOT_RESET_TIME 50 /* times are in msec */
#define HUB_SHORT_RESET_TIME 10
#define HUB_LONG_RESET_TIME 200
#define HUB_RESET_TIMEOUT 500
-/* return: -1 on error, 0 on success, 1 on disconnect. */
-static int hub_port_wait_reset(struct usb_device *hub, int port,
- struct usb_device *dev, unsigned int delay)
+static int hub_port_wait_reset(struct usb_device *hdev, int port,
+ struct usb_device *udev, unsigned int delay)
{
int delay_time, ret;
u16 portstatus;
delay_time < HUB_RESET_TIMEOUT;
delay_time += delay) {
/* wait to give the device a chance to reset */
- wait_ms(delay);
+ msleep(delay);
/* read and decode port status */
- ret = hub_port_status(hub, port, &portstatus, &portchange);
- if (ret < 0) {
- return -1;
- }
+ ret = hub_port_status(hdev, port, &portstatus, &portchange);
+ if (ret < 0)
+ return ret;
/* Device went away? */
if (!(portstatus & USB_PORT_STAT_CONNECTION))
- return 1;
+ return -ENOTCONN;
/* bomb out completely if something weird happened */
if ((portchange & USB_PORT_STAT_C_CONNECTION))
- return -1;
+ return -EINVAL;
/* if we`ve finished resetting, then break out of the loop */
if (!(portstatus & USB_PORT_STAT_RESET) &&
(portstatus & USB_PORT_STAT_ENABLE)) {
if (portstatus & USB_PORT_STAT_HIGH_SPEED)
- dev->speed = USB_SPEED_HIGH;
+ udev->speed = USB_SPEED_HIGH;
else if (portstatus & USB_PORT_STAT_LOW_SPEED)
- dev->speed = USB_SPEED_LOW;
+ udev->speed = USB_SPEED_LOW;
else
- dev->speed = USB_SPEED_FULL;
+ udev->speed = USB_SPEED_FULL;
return 0;
}
if (delay_time >= 2 * HUB_SHORT_RESET_TIME)
delay = HUB_LONG_RESET_TIME;
- dev_dbg (hubdev (hub),
+ dev_dbg (hubdev (hdev),
"port %d not reset yet, waiting %dms\n",
port + 1, delay);
}
- return -1;
+ return -EBUSY;
}
-/* return: -1 on error, 0 on success, 1 on disconnect. */
-static int hub_port_reset(struct usb_device *hub, int port,
- struct usb_device *dev, unsigned int delay)
+static int hub_port_reset(struct usb_device *hdev, int port,
+ struct usb_device *udev, unsigned int delay)
{
int i, status;
+ struct device *hub_dev = hubdev (hdev);
/* Reset the port */
- for (i = 0; i < HUB_RESET_TRIES; i++) {
- set_port_feature(hub, port + 1, USB_PORT_FEAT_RESET);
+ for (i = 0; i < PORT_RESET_TRIES; i++) {
+ set_port_feature(hdev, port + 1, USB_PORT_FEAT_RESET);
/* return on disconnect or reset */
- status = hub_port_wait_reset(hub, port, dev, delay);
- if (status != -1) {
- clear_port_feature(hub,
+ status = hub_port_wait_reset(hdev, port, udev, delay);
+ if (status == -ENOTCONN || status == 0) {
+ clear_port_feature(hdev,
port + 1, USB_PORT_FEAT_C_RESET);
- dev->state = status
+ udev->state = status
? USB_STATE_NOTATTACHED
: USB_STATE_DEFAULT;
return status;
}
- dev_dbg (hubdev (hub),
+ dev_dbg (hub_dev,
"port %d not enabled, trying reset again...\n",
port + 1);
delay = HUB_LONG_RESET_TIME;
}
- dev_err (hubdev (hub),
+ dev_err (hub_dev,
"Cannot enable port %i. Maybe the USB cable is bad?\n",
port + 1);
- return -1;
+ return status;
}
-int hub_port_disable(struct usb_device *hub, int port)
+static int hub_port_disable(struct usb_device *hdev, int port)
{
int ret;
- ret = clear_port_feature(hub, port + 1, USB_PORT_FEAT_ENABLE);
+ ret = clear_port_feature(hdev, port + 1, USB_PORT_FEAT_ENABLE);
if (ret)
- dev_err(hubdev(hub), "cannot disable port %d (err = %d)\n",
+ dev_err(hubdev(hdev), "cannot disable port %d (err = %d)\n",
port + 1, ret);
return ret;
#define HUB_DEBOUNCE_STEP 25
#define HUB_DEBOUNCE_STABLE 4
-/* return: -1 on error, 0 on success, 1 on disconnect. */
-static int hub_port_debounce(struct usb_device *hub, int port)
+static int hub_port_debounce(struct usb_device *hdev, int port)
{
int ret;
int delay_time, stable_count;
connection = 0;
stable_count = 0;
for (delay_time = 0; delay_time < HUB_DEBOUNCE_TIMEOUT; delay_time += HUB_DEBOUNCE_STEP) {
- wait_ms(HUB_DEBOUNCE_STEP);
+ msleep(HUB_DEBOUNCE_STEP);
- ret = hub_port_status(hub, port, &portstatus, &portchange);
+ ret = hub_port_status(hdev, port, &portstatus, &portchange);
if (ret < 0)
- return -1;
+ return ret;
if ((portstatus & USB_PORT_STAT_CONNECTION) == connection) {
if (connection) {
connection = portstatus & USB_PORT_STAT_CONNECTION;
if ((portchange & USB_PORT_STAT_C_CONNECTION)) {
- clear_port_feature(hub, port+1, USB_PORT_FEAT_C_CONNECTION);
+ clear_port_feature(hdev, port+1, USB_PORT_FEAT_C_CONNECTION);
}
}
- dev_dbg (hubdev (hub),
+ dev_dbg (hubdev (hdev),
"debounce: port %d: delay %dms stable %d status 0x%x\n",
port + 1, delay_time, stable_count, portstatus);
- return ((portstatus&USB_PORT_STAT_CONNECTION)) ? 0 : 1;
+ return (portstatus & USB_PORT_STAT_CONNECTION) ? 0 : -ENOTCONN;
}
-static void hub_port_connect_change(struct usb_hub *hubstate, int port,
- u16 portstatus, u16 portchange)
+static int hub_set_address(struct usb_device *udev)
{
- struct usb_device *hub = interface_to_usbdev(hubstate->intf);
- struct usb_device *dev;
- unsigned int delay = HUB_SHORT_RESET_TIME;
- int i;
-
- dev_dbg (&hubstate->intf->dev,
- "port %d, status %x, change %x, %s\n",
- port + 1, portstatus, portchange, portspeed (portstatus));
-
- /* Clear the connection change status */
- clear_port_feature(hub, port + 1, USB_PORT_FEAT_C_CONNECTION);
-
- /* Disconnect any existing devices under this port */
- if (hub->children[port])
- usb_disconnect(&hub->children[port]);
+ int retval;
- /* Return now if nothing is connected */
- if (!(portstatus & USB_PORT_STAT_CONNECTION)) {
- if (portstatus & USB_PORT_STAT_ENABLE)
- hub_port_disable(hub, port);
+ if (udev->devnum == 0)
+ return -EINVAL;
+ if (udev->state != USB_STATE_DEFAULT &&
+ udev->state != USB_STATE_ADDRESS)
+ return -EINVAL;
+ retval = usb_control_msg(udev, usb_snddefctrl(udev),
+ USB_REQ_SET_ADDRESS, 0, udev->devnum, 0,
+ NULL, 0, HZ * USB_CTRL_SET_TIMEOUT);
+ if (retval == 0)
+ udev->state = USB_STATE_ADDRESS;
+ return retval;
+}
- return;
- }
+/* reset device, (re)assign address, get device descriptor.
+ * device connection is stable, no more debouncing needed.
+ * returns device in USB_STATE_ADDRESS, except on error.
+ * on error return, device is no longer usable (ref dropped).
+ *
+ * caller owns dev->serialize for the device, guarding against
+ * config changes and disconnect processing.
+ */
+static int
+hub_port_init (struct usb_device *hdev, struct usb_device *udev, int port)
+{
+ static DECLARE_MUTEX(usb_address0_sem);
- if (hub_port_debounce(hub, port)) {
- dev_err (&hubstate->intf->dev,
- "connect-debounce failed, port %d disabled\n",
- port+1);
- hub_port_disable(hub, port);
- return;
- }
+ int i, j, retval;
+ unsigned delay = HUB_SHORT_RESET_TIME;
+ enum usb_device_speed oldspeed = udev->speed;
/* root hub ports have a slightly longer reset period
* (from USB 2.0 spec, section 7.1.7.5)
*/
- if (!hub->parent)
+ if (!hdev->parent)
delay = HUB_ROOT_RESET_TIME;
/* Some low speed devices have problems with the quick delay, so */
/* be a bit pessimistic with those devices. RHbug #23670 */
- if (portstatus & USB_PORT_STAT_LOW_SPEED)
+ if (oldspeed == USB_SPEED_LOW)
delay = HUB_LONG_RESET_TIME;
down(&usb_address0_sem);
- for (i = 0; i < HUB_PROBE_TRIES; i++) {
-
- /* Allocate a new device struct */
- dev = usb_alloc_dev(hub, hub->bus, port);
- if (!dev) {
- dev_err (&hubstate->intf->dev,
- "couldn't allocate usb_device\n");
- break;
- }
-
- dev->state = USB_STATE_POWERED;
-
- /* Reset the device, and detect its speed */
- if (hub_port_reset(hub, port, dev, delay)) {
- usb_put_dev(dev);
- break;
- }
+ /* Reset the device; full speed may morph to high speed */
+ retval = hub_port_reset(hdev, port, udev, delay);
+ if (retval < 0) /* error or disconnect */
+ goto fail;
+ /* success, speed is known */
+ retval = -ENODEV;
- /* Find a new address for it */
- usb_choose_address(dev);
+ if (oldspeed != USB_SPEED_UNKNOWN && oldspeed != udev->speed) {
+ dev_dbg(&udev->dev, "device reset changed speed!\n");
+ goto fail;
+ }
+
+ /* USB 2.0 section 5.5.3 talks about ep0 maxpacket ...
+ * it's fixed size except for full speed devices.
+ */
+ switch (udev->speed) {
+ case USB_SPEED_HIGH: /* fixed at 64 */
+ i = 64;
+ break;
+ case USB_SPEED_FULL: /* 8, 16, 32, or 64 */
+ /* to determine the ep0 maxpacket size, read the first 8
+ * bytes from the device descriptor to get bMaxPacketSize0;
+ * then correct our initial (small) guess.
+ */
+ // FALLTHROUGH
+ case USB_SPEED_LOW: /* fixed at 8 */
+ i = 8;
+ break;
+ default:
+ goto fail;
+ }
+ udev->epmaxpacketin [0] = i;
+ udev->epmaxpacketout[0] = i;
+
+ /* set the address */
+ if (udev->devnum <= 0) {
+ usb_choose_address(udev);
+ if (udev->devnum <= 0)
+ goto fail;
/* Set up TT records, if needed */
- if (hub->tt) {
- dev->tt = hub->tt;
- dev->ttport = hub->ttport;
- } else if (dev->speed != USB_SPEED_HIGH
- && hub->speed == USB_SPEED_HIGH) {
- dev->tt = &hubstate->tt;
- dev->ttport = port + 1;
+ if (hdev->tt) {
+ udev->tt = hdev->tt;
+ udev->ttport = hdev->ttport;
+ } else if (udev->speed != USB_SPEED_HIGH
+ && hdev->speed == USB_SPEED_HIGH) {
+ struct usb_hub *hub;
+
+ hub = usb_get_intfdata (hdev->actconfig
+ ->interface[0]);
+ udev->tt = &hub->tt;
+ udev->ttport = port + 1;
}
- dev_info (&dev->dev,
- "new %s speed USB device using address %d\n",
- ({ char *speed; switch (dev->speed) {
+ /* force the right log message (below) at low speed */
+ oldspeed = USB_SPEED_UNKNOWN;
+ }
+
+ dev_info (&udev->dev,
+ "%s %s speed USB device using address %d\n",
+ (oldspeed == USB_SPEED_UNKNOWN) ? "new" : "reset",
+ ({ char *speed; switch (udev->speed) {
case USB_SPEED_LOW: speed = "low"; break;
case USB_SPEED_FULL: speed = "full"; break;
case USB_SPEED_HIGH: speed = "high"; break;
default: speed = "?"; break;
}; speed;}),
- dev->devnum);
+ udev->devnum);
+
+ /* Why interleave GET_DESCRIPTOR and SET_ADDRESS this way?
+ * Because device hardware and firmware is sometimes buggy in
+ * this area, and this is how Linux has done it for ages.
+ * Change it cautiously.
+ *
+ * NOTE: Windows gets the descriptor first, seemingly to help
+ * work around device bugs like "can't use addresses with bit 3
+ * set in certain configurations". Yes, really.
+ */
+ for (i = 0; i < GET_DESCRIPTOR_TRIES; ++i) {
+ for (j = 0; j < SET_ADDRESS_TRIES; ++j) {
+ retval = hub_set_address(udev);
+ if (retval >= 0)
+ break;
+ msleep(200);
+ }
+ if (retval < 0) {
+ dev_err(&udev->dev,
+ "device not accepting address %d, error %d\n",
+ udev->devnum, retval);
+ fail:
+ hub_port_disable(hdev, port);
+ usb_release_address(udev);
+ usb_put_dev(udev);
+ up(&usb_address0_sem);
+ return retval;
+ }
+
+ /* cope with hardware quirkiness:
+ * - let SET_ADDRESS settle, some device hardware wants it
+ * - read ep0 maxpacket even for high and low speed,
+ */
+ msleep(10);
+ retval = usb_get_device_descriptor(udev, 8);
+ if (retval >= 8)
+ break;
+ msleep(100);
+ }
+ if (retval != 8) {
+ dev_err(&udev->dev, "device descriptor read/%s, error %d\n",
+ "8", retval);
+ if (retval >= 0)
+ retval = -EMSGSIZE;
+ goto fail;
+ }
+ if (udev->speed == USB_SPEED_FULL
+ && (udev->epmaxpacketin [0]
+ != udev->descriptor.bMaxPacketSize0)) {
+ usb_disable_endpoint(udev, 0);
+ usb_endpoint_running(udev, 0, 1);
+ usb_endpoint_running(udev, 0, 0);
+ udev->epmaxpacketin [0] = udev->descriptor.bMaxPacketSize0;
+ udev->epmaxpacketout[0] = udev->descriptor.bMaxPacketSize0;
+ }
+
+ retval = usb_get_device_descriptor(udev, USB_DT_DEVICE_SIZE);
+ if (retval < (signed)sizeof(udev->descriptor)) {
+ dev_err(&udev->dev, "device descriptor read/%s, error %d\n",
+ "all", retval);
+ if (retval >= 0)
+ retval = -ENOMSG;
+ goto fail;
+ }
- /* Run it through the hoops (find a driver, etc) */
- if (usb_new_device(dev) == 0) {
- hub->children[port] = dev;
- goto done;
+ /* now dev is visible to other tasks */
+ hdev->children[port] = udev;
+
+ up(&usb_address0_sem);
+ return 0;
+}
+
+static void
+check_highspeed (struct usb_hub *hub, struct usb_device *udev, int port)
+{
+ struct usb_qualifier_descriptor *qual;
+ int status;
+
+ qual = kmalloc (sizeof *qual, SLAB_KERNEL);
+ if (qual == 0)
+ return;
+
+ status = usb_get_descriptor (udev, USB_DT_DEVICE_QUALIFIER, 0,
+ qual, sizeof *qual);
+ if (status == sizeof *qual) {
+ dev_info(&udev->dev, "not running at top speed; "
+ "connect to a high speed hub\n");
+ /* hub LEDs are probably harder to miss than syslog */
+ if (hub->has_indicators) {
+ hub->indicator[port] = INDICATOR_GREEN_BLINK;
+ schedule_work (&hub->leds);
}
+ }
+ kfree (qual);
+}
- /* Free the configuration if there was an error */
- usb_put_dev(dev);
+static unsigned
+hub_power_remaining (struct usb_hub *hub, struct usb_device *hdev)
+{
+ int remaining;
+ unsigned i;
- /* Switch to a long reset time */
- delay = HUB_LONG_RESET_TIME;
+ remaining = hub->power_budget;
+ if (!remaining) /* self-powered */
+ return 0;
+
+ for (i = 0; i < hdev->maxchild; i++) {
+ struct usb_device *udev = hdev->children[i];
+ int delta;
+
+ if (!udev)
+ continue;
+
+ if (udev->actconfig)
+ delta = udev->actconfig->desc.bMaxPower;
+ else
+ delta = 50;
+ // dev_dbg(&udev->dev, "budgeted %dmA\n", 2 * delta);
+ remaining -= delta;
+ }
+ if (remaining < 0) {
+ dev_warn(&hub->intf->dev,
+ "%dmA over power budget!\n",
+ -2 * remaining);
+ remaining = 0;
+ }
+ return remaining;
+}
+
+static void hub_port_connect_change(struct usb_hub *hub, int port,
+ u16 portstatus, u16 portchange)
+{
+ struct usb_device *hdev = interface_to_usbdev(hub->intf);
+ struct device *hub_dev = &hub->intf->dev;
+ int status, i;
+
+ dev_dbg (hub_dev,
+ "port %d, status %04x, change %04x, %s\n",
+ port + 1, portstatus, portchange, portspeed (portstatus));
+
+ /* Clear the connection change status */
+ clear_port_feature(hdev, port + 1, USB_PORT_FEAT_C_CONNECTION);
+
+ if (hub->has_indicators) {
+ set_port_led(hdev, port + 1, HUB_LED_AUTO);
+ hub->indicator[port] = INDICATOR_AUTO;
+ }
+
+ /* Disconnect any existing devices under this port */
+ if (hdev->children[port])
+ usb_disconnect(&hdev->children[port]);
+
+ /* Return now if nothing is connected */
+ if (!(portstatus & USB_PORT_STAT_CONNECTION)) {
+
+ /* maybe switch power back on (e.g. root hub was reset) */
+ if ((hub->descriptor->wHubCharacteristics
+ & HUB_CHAR_LPSM) < 2
+ && !(portstatus & (1 << USB_PORT_FEAT_POWER)))
+ set_port_feature(hdev, port + 1, USB_PORT_FEAT_POWER);
+
+ if (portstatus & USB_PORT_STAT_ENABLE)
+ goto done;
+ return;
+ }
+
+ if (hub_port_debounce(hdev, port)) {
+ dev_err (hub_dev,
+ "connect-debounce failed, port %d disabled\n",
+ port+1);
+ goto done;
}
- hub_port_disable(hub, port);
+ for (i = 0; i < SET_CONFIG_TRIES; i++) {
+ struct usb_device *udev;
+
+ /* reallocate for each attempt, since references
+ * to the previous one can escape in various ways
+ */
+ udev = usb_alloc_dev(hdev, hdev->bus, port);
+ if (!udev) {
+ dev_err (hub_dev,
+ "couldn't allocate port %d usb_device\n", port+1);
+ goto done;
+ }
+ udev->state = USB_STATE_POWERED;
+
+ /* hub can tell if it's lowspeed already: D- pullup (not D+) */
+ if (portstatus & USB_PORT_STAT_LOW_SPEED)
+ udev->speed = USB_SPEED_LOW;
+ else
+ udev->speed = USB_SPEED_UNKNOWN;
+
+ /* reset, set address, get descriptor, add to hub's children */
+ down (&udev->serialize);
+ status = hub_port_init(hdev, udev, port);
+ if (status == -ENOTCONN)
+ break;
+ if (status < 0)
+ continue;
+
+ /* consecutive bus-powered hubs aren't reliable; they can
+ * violate the voltage drop budget. if the new child has
+ * a "powered" LED, users should notice we didn't enable it
+ * (without reading syslog), even without per-port LEDs
+ * on the parent.
+ */
+ if (udev->descriptor.bDeviceClass == USB_CLASS_HUB
+ && hub->power_budget) {
+ u16 devstat;
+
+ status = usb_get_status(udev, USB_RECIP_DEVICE, 0,
+ &devstat);
+ if (status < 0) {
+ dev_dbg(&udev->dev, "get status %d ?\n", status);
+ continue;
+ }
+ cpu_to_le16s(&devstat);
+ if ((devstat & (1 << USB_DEVICE_SELF_POWERED)) == 0) {
+ dev_err(&udev->dev,
+ "can't connect bus-powered hub "
+ "to this port\n");
+ if (hub->has_indicators) {
+ hub->indicator[port] =
+ INDICATOR_AMBER_BLINK;
+ schedule_work (&hub->leds);
+ }
+ hdev->children[port] = NULL;
+ usb_put_dev(udev);
+ hub_port_disable(hdev, port);
+ return;
+ }
+ }
+
+ /* check for devices running slower than they could */
+ if (udev->descriptor.bcdUSB >= 0x0200
+ && udev->speed == USB_SPEED_FULL
+ && highspeed_hubs != 0)
+ check_highspeed (hub, udev, port);
+
+ /* Run it through the hoops (find a driver, etc) */
+ status = usb_new_device(udev);
+ if (status != 0) {
+ hdev->children[port] = NULL;
+ continue;
+ }
+ up (&udev->serialize);
+
+ status = hub_power_remaining(hub, hdev);
+ if (status)
+ dev_dbg(hub_dev,
+ "%dmA power budget left\n",
+ 2 * status);
+
+ return;
+ }
+
done:
- up(&usb_address0_sem);
+ hub_port_disable(hdev, port);
}
static void hub_events(void)
{
unsigned long flags;
struct list_head *tmp;
- struct usb_device *dev;
+ struct usb_device *hdev;
struct usb_hub *hub;
+ struct device *hub_dev;
u16 hubstatus;
u16 hubchange;
u16 portstatus;
tmp = hub_event_list.next;
hub = list_entry(tmp, struct usb_hub, event_list);
- dev = interface_to_usbdev(hub->intf);
+ hdev = interface_to_usbdev(hub->intf);
+ hub_dev = &hub->intf->dev;
list_del_init(tmp);
spin_unlock_irqrestore(&hub_event_lock, flags);
if (hub->error) {
- dev_dbg (&hub->intf->dev, "resetting for error %d\n",
+ dev_dbg (hub_dev, "resetting for error %d\n",
hub->error);
if (hub_reset(hub)) {
- dev_dbg (&hub->intf->dev,
+ dev_dbg (hub_dev,
"can't reset; disconnecting\n");
up(&hub->khubd_sem);
- hub_start_disconnect(dev);
+ hub_start_disconnect(hdev);
continue;
}
}
for (i = 0; i < hub->descriptor->bNbrPorts; i++) {
- ret = hub_port_status(dev, i, &portstatus, &portchange);
+ ret = hub_port_status(hdev, i, &portstatus, &portchange);
if (ret < 0) {
continue;
}
if (portchange & USB_PORT_STAT_C_CONNECTION) {
hub_port_connect_change(hub, i, portstatus, portchange);
} else if (portchange & USB_PORT_STAT_C_ENABLE) {
- dev_dbg (hubdev (dev),
- "port %d enable change, status %x\n",
+ dev_dbg (hub_dev,
+ "port %d enable change, status %08x\n",
i + 1, portstatus);
- clear_port_feature(dev,
+ clear_port_feature(hdev,
i + 1, USB_PORT_FEAT_C_ENABLE);
/*
*/
if (!(portstatus & USB_PORT_STAT_ENABLE)
&& (portstatus & USB_PORT_STAT_CONNECTION)
- && (dev->children[i])) {
- dev_err (&hub->intf->dev,
+ && (hdev->children[i])) {
+ dev_err (hub_dev,
"port %i "
"disabled by hub (EMI?), "
"re-enabling...",
}
if (portchange & USB_PORT_STAT_C_SUSPEND) {
- dev_dbg (&hub->intf->dev,
+ dev_dbg (hub_dev,
"suspend change on port %d\n",
i + 1);
- clear_port_feature(dev,
+ clear_port_feature(hdev,
i + 1, USB_PORT_FEAT_C_SUSPEND);
}
if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
- dev_err (&hub->intf->dev,
+ dev_err (hub_dev,
"over-current change on port %d\n",
i + 1);
- clear_port_feature(dev,
+ clear_port_feature(hdev,
i + 1, USB_PORT_FEAT_C_OVER_CURRENT);
hub_power_on(hub);
}
if (portchange & USB_PORT_STAT_C_RESET) {
- dev_dbg (&hub->intf->dev,
+ dev_dbg (hub_dev,
"reset change on port %d\n",
i + 1);
- clear_port_feature(dev,
+ clear_port_feature(hdev,
i + 1, USB_PORT_FEAT_C_RESET);
}
} /* end for i */
/* deal with hub status changes */
if (hub_hub_status(hub, &hubstatus, &hubchange) < 0)
- dev_err (&hub->intf->dev, "get_hub_status failed\n");
+ dev_err (hub_dev, "get_hub_status failed\n");
else {
if (hubchange & HUB_CHANGE_LOCAL_POWER) {
- dev_dbg (&hub->intf->dev, "power change\n");
- clear_hub_feature(dev, C_HUB_LOCAL_POWER);
+ dev_dbg (hub_dev, "power change\n");
+ clear_hub_feature(hdev, C_HUB_LOCAL_POWER);
}
if (hubchange & HUB_CHANGE_OVERCURRENT) {
- dev_dbg (&hub->intf->dev, "overcurrent change\n");
- wait_ms(500); /* Cool down */
- clear_hub_feature(dev, C_HUB_OVER_CURRENT);
+ dev_dbg (hub_dev, "overcurrent change\n");
+ msleep(500); /* Cool down */
+ clear_hub_feature(hdev, C_HUB_OVER_CURRENT);
hub_power_on(hub);
}
}
spin_unlock_irqrestore(&hub_event_lock, flags);
}
-static int hub_thread(void *__hub)
+static int hub_thread(void *__unused)
{
/*
* This thread doesn't need any user-level access,
usb_deregister(&hub_driver);
} /* usb_hub_cleanup() */
+
+static int config_descriptors_changed(struct usb_device *udev)
+{
+ unsigned index;
+ unsigned len = 0;
+ struct usb_config_descriptor *buf;
+
+ for (index = 0; index < udev->descriptor.bNumConfigurations; index++) {
+ if (len < udev->config[index].desc.wTotalLength)
+ len = udev->config[index].desc.wTotalLength;
+ }
+ buf = kmalloc (len, SLAB_KERNEL);
+ if (buf == 0) {
+ dev_err(&udev->dev, "no mem to re-read configs after reset\n");
+ /* assume the worst */
+ return 1;
+ }
+ for (index = 0; index < udev->descriptor.bNumConfigurations; index++) {
+ int length;
+ int old_length = udev->config[index].desc.wTotalLength;
+
+ length = usb_get_descriptor(udev, USB_DT_CONFIG, index, buf,
+ old_length);
+ if (length < old_length) {
+ dev_dbg(&udev->dev, "config index %d, error %d\n",
+ index, length);
+ break;
+ }
+ if (memcmp (buf, udev->rawdescriptors[index], old_length)
+ != 0) {
+ dev_dbg(&udev->dev, "config index %d changed (#%d)\n",
+ index, buf->bConfigurationValue);
+/* FIXME enable this when we can re-enumerate after reset;
+ * until then DFU-ish drivers need this and other workarounds
+ */
+// break;
+ }
+ }
+ kfree(buf);
+ return index != udev->descriptor.bNumConfigurations;
+}
+
/*
- * WARNING - If a driver calls usb_reset_device, you should simulate a
- * disconnect() and probe() for other interfaces you doesn't claim. This
- * is left up to the driver writer right now. This insures other drivers
- * have a chance to re-setup their interface.
+ * WARNING - don't reset any device unless drivers for all of its
+ * interfaces are expecting that reset! Maybe some driver->reset()
+ * method should eventually help ensure sufficient cooperation.
*
- * Take a look at proc_resetdevice in devio.c for some sample code to
- * do this.
- * Use this only from within your probe function, otherwise use
- * usb_reset_device() below, which ensure proper locking
+ * This is the same as usb_reset_device() except that the caller
+ * already holds dev->serialize. For example, it's safe to use
+ * this from a driver probe() routine after downloading new firmware.
*/
-int usb_physical_reset_device(struct usb_device *dev)
+int __usb_reset_device(struct usb_device *udev)
{
- struct usb_device *parent = dev->parent;
- struct usb_device_descriptor *descriptor;
+ struct usb_device *parent = udev->parent;
+ struct usb_device_descriptor descriptor = udev->descriptor;
int i, ret, port = -1;
- if (!parent) {
- err("attempting to reset root hub!");
+ if (udev->maxchild) {
+ /* this requires hub- or hcd-specific logic;
+ * see hub_reset() and OHCI hc_restart()
+ */
+ dev_dbg(&udev->dev, "%s for hub!\n", __FUNCTION__);
return -EINVAL;
}
for (i = 0; i < parent->maxchild; i++)
- if (parent->children[i] == dev) {
+ if (parent->children[i] == udev) {
port = i;
break;
}
if (port < 0)
return -ENOENT;
- descriptor = kmalloc(sizeof *descriptor, GFP_NOIO);
- if (!descriptor) {
- return -ENOMEM;
- }
-
- down(&usb_address0_sem);
-
- /* Send a reset to the device */
- if (hub_port_reset(parent, port, dev, HUB_SHORT_RESET_TIME)) {
- hub_port_disable(parent, port);
- up(&usb_address0_sem);
- kfree(descriptor);
- return(-ENODEV);
- }
-
- /* Reprogram the Address */
- ret = usb_set_address(dev);
- if (ret < 0) {
- err("USB device not accepting new address (error=%d)", ret);
- hub_port_disable(parent, port);
- up(&usb_address0_sem);
- kfree(descriptor);
- return ret;
- }
-
- /* Let the SET_ADDRESS settle */
- wait_ms(10);
-
- up(&usb_address0_sem);
-
- /*
- * Now we fetch the configuration descriptors for the device and
- * see if anything has changed. If it has, we dump the current
- * parsed descriptors and reparse from scratch. Then we leave
- * the device alone for the caller to finish setting up.
- *
- * If nothing changed, we reprogram the configuration and then
- * the alternate settings.
- */
-
- ret = usb_get_descriptor(dev, USB_DT_DEVICE, 0, descriptor,
- sizeof(*descriptor));
- if (ret < 0) {
- kfree(descriptor);
- return ret;
- }
-
- le16_to_cpus(&descriptor->bcdUSB);
- le16_to_cpus(&descriptor->idVendor);
- le16_to_cpus(&descriptor->idProduct);
- le16_to_cpus(&descriptor->bcdDevice);
-
- if (memcmp(&dev->descriptor, descriptor, sizeof(*descriptor))) {
- kfree(descriptor);
- usb_destroy_configuration(dev);
-
- /* FIXME Linux doesn't yet handle these "device morphed"
- * paths. DFU variants need this to work ... and they
- * include the "config descriptors changed" case this
- * doesn't yet detect!
- */
- dev->state = USB_STATE_NOTATTACHED;
- dev_err(&dev->dev, "device morphed (DFU?), nyet supported\n");
-
- return -ENODEV;
- }
-
- kfree(descriptor);
+ ret = hub_port_init(parent, udev, port);
+ if (ret < 0)
+ goto re_enumerate;
+
+ /* Device might have changed firmware (DFU or similar) */
+ if (memcmp(&udev->descriptor, &descriptor, sizeof descriptor)
+ || config_descriptors_changed (udev)) {
+ dev_info(&udev->dev, "device firmware changed\n");
+ udev->descriptor = descriptor; /* for disconnect() calls */
+ goto re_enumerate;
+ }
+
+ if (!udev->actconfig)
+ return 0;
- ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+ ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
USB_REQ_SET_CONFIGURATION, 0,
- dev->actconfig->desc.bConfigurationValue, 0,
+ udev->actconfig->desc.bConfigurationValue, 0,
NULL, 0, HZ * USB_CTRL_SET_TIMEOUT);
if (ret < 0) {
- err("failed to set dev %s active configuration (error=%d)",
- dev->devpath, ret);
- return ret;
- }
- dev->state = USB_STATE_CONFIGURED;
-
- for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) {
- struct usb_interface *intf = dev->actconfig->interface[i];
+ dev_err(&udev->dev,
+ "can't restore configuration #%d (error=%d)\n",
+ udev->actconfig->desc.bConfigurationValue, ret);
+ goto re_enumerate;
+ }
+ udev->state = USB_STATE_CONFIGURED;
+
+ for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) {
+ struct usb_interface *intf = udev->actconfig->interface[i];
struct usb_interface_descriptor *desc;
+ /* set_interface resets host side toggle and halt status even
+ * for altsetting zero. the interface may have no driver.
+ */
desc = &intf->cur_altsetting->desc;
- ret = usb_set_interface(dev, desc->bInterfaceNumber,
+ ret = usb_set_interface(udev, desc->bInterfaceNumber,
desc->bAlternateSetting);
if (ret < 0) {
- err("failed to set active alternate setting "
- "for dev %s interface %d (error=%d)",
- dev->devpath, desc->bInterfaceNumber, ret);
- return ret;
+ dev_err(&udev->dev, "failed to restore interface %d "
+ "altsetting %d (error=%d)\n",
+ desc->bInterfaceNumber,
+ desc->bAlternateSetting,
+ ret);
+ goto re_enumerate;
}
}
return 0;
+
+re_enumerate:
+ /* FIXME make some task re-enumerate; don't just mark unusable */
+ udev->state = USB_STATE_NOTATTACHED;
+ return -ENODEV;
}
+EXPORT_SYMBOL(__usb_reset_device);
int usb_reset_device(struct usb_device *udev)
{
- struct device *gdev = &udev->dev;
int r;
- down_read(&gdev->bus->subsys.rwsem);
- r = usb_physical_reset_device(udev);
- up_read(&gdev->bus->subsys.rwsem);
+ down(&udev->serialize);
+ r = __usb_reset_device(udev);
+ up(&udev->serialize);
return r;
}
-
-
git://git.onelab.eu / linux-2.6.git / blobdiff