#include <linux/ioctl.h>
#include <linux/usb.h>
#include <linux/usbdevice_fs.h>
+#include <linux/suspend.h>
#include <asm/semaphore.h>
#include <asm/uaccess.h>
/* Protect struct usb_device->state and ->children members
* Note: Both are also protected by ->serialize, except that ->state can
* change to USB_STATE_NOTATTACHED even when the semaphore isn't held. */
-static DEFINE_SPINLOCK(device_state_lock);
+static spinlock_t device_state_lock = SPIN_LOCK_UNLOCKED;
/* khubd's worklist and its lock */
-static DEFINE_SPINLOCK(hub_event_lock);
+static spinlock_t hub_event_lock = SPIN_LOCK_UNLOCKED;
static LIST_HEAD(hub_event_list); /* List of hubs needing servicing */
/* Wakes up khubd */
* otherwise the new scheme is used. If that fails and "use_both_schemes"
* is set, then the driver will make another attempt, using the other scheme.
*/
-static int old_scheme_first = 0;
+static int old_scheme_first = 1;
module_param(old_scheme_first, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(old_scheme_first,
"start with the old device initialization scheme");
}
#endif
-/* Note that hdev or one of its children must be locked! */
-static inline struct usb_hub *hdev_to_hub(struct usb_device *hdev)
+/* for dev_info, dev_dbg, etc */
+static inline struct device *hubdev (struct usb_device *hdev)
{
- return usb_get_intfdata(hdev->actconfig->interface[0]);
+ return &hdev->actconfig->interface[0]->dev;
}
/* USB 2.0 spec Section 11.24.4.5 */
ret = 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,
- USB_CTRL_GET_TIMEOUT);
+ HZ * USB_CTRL_GET_TIMEOUT);
if (ret >= (USB_DT_HUB_NONVAR_SIZE + 2))
return ret;
}
static int clear_hub_feature(struct usb_device *hdev, int feature)
{
return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
- USB_REQ_CLEAR_FEATURE, USB_RT_HUB, feature, 0, NULL, 0, 1000);
+ 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 *hdev, int port1, int feature)
+static int clear_port_feature(struct usb_device *hdev, int port, int feature)
{
return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
- USB_REQ_CLEAR_FEATURE, USB_RT_PORT, feature, port1,
- NULL, 0, 1000);
+ 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 *hdev, int port1, int feature)
+static int set_port_feature(struct usb_device *hdev, int port, int feature)
{
return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
- USB_REQ_SET_FEATURE, USB_RT_PORT, feature, port1,
- NULL, 0, 1000);
+ 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_hub *hub,
- int port1,
+ struct usb_device *hdev,
+ int port,
int selector
)
{
- int status = set_port_feature(hub->hdev, (selector << 8) | port1,
+ int status = set_port_feature(hdev, (selector << 8) | port,
USB_PORT_FEAT_INDICATOR);
if (status < 0)
- dev_dbg (hub->intfdev,
+ dev_dbg (hubdev (hdev),
"port %d indicator %s status %d\n",
- port1,
+ port,
({ char *s; switch (selector) {
case HUB_LED_AMBER: s = "amber"; break;
case HUB_LED_GREEN: s = "green"; break;
}
if (selector != HUB_LED_AUTO)
changed = 1;
- set_port_led(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(hub, cursor + 1, HUB_LED_GREEN);
+ set_port_led(hdev, cursor + 1, HUB_LED_GREEN);
hub->indicator[cursor] = INDICATOR_CYCLE;
changed++;
}
schedule_delayed_work(&hub->leds, LED_CYCLE_PERIOD);
}
-/* use a short timeout for hub/port status fetches */
-#define USB_STS_TIMEOUT 1000
-#define USB_STS_RETRIES 5
-
/*
* USB 2.0 spec Section 11.24.2.6
*/
static int get_hub_status(struct usb_device *hdev,
struct usb_hub_status *data)
{
- int i, status = -ETIMEDOUT;
-
- for (i = 0; i < USB_STS_RETRIES && status == -ETIMEDOUT; i++) {
- status = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
- USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_HUB, 0, 0,
- data, sizeof(*data), USB_STS_TIMEOUT);
- }
- return status;
+ 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 *hdev, int port1,
+static int get_port_status(struct usb_device *hdev, int port,
struct usb_port_status *data)
{
- int i, status = -ETIMEDOUT;
-
- for (i = 0; i < USB_STS_RETRIES && status == -ETIMEDOUT; i++) {
- status = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
- USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, port1,
- data, sizeof(*data), USB_STS_TIMEOUT);
- }
- return status;
+ 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);
}
static void kick_khubd(struct usb_hub *hub)
spin_unlock_irqrestore(&hub_event_lock, flags);
}
-void usb_kick_khubd(struct usb_device *hdev)
-{
- kick_khubd(hdev_to_hub(hdev));
-}
-
/* completion function, fires on port status changes and various faults */
static void hub_irq(struct urb *urb, struct pt_regs *regs)
default: /* presumably an error */
/* Cause a hub reset after 10 consecutive errors */
- dev_dbg (hub->intfdev, "transfer --> %d\n", urb->status);
+ dev_dbg (&hub->intf->dev, "transfer --> %d\n", urb->status);
if ((++hub->nerrors < 10) || hub->error)
goto resubmit;
hub->error = urb->status;
if ((status = usb_submit_urb (hub->urb, GFP_ATOMIC)) != 0
&& status != -ENODEV && status != -EPERM)
- dev_err (hub->intfdev, "resubmit --> %d\n", status);
+ dev_err (&hub->intf->dev, "resubmit --> %d\n", status);
}
/* USB 2.0 spec Section 11.24.2.3 */
{
return usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
HUB_CLEAR_TT_BUFFER, USB_RT_PORT, devinfo,
- tt, NULL, 0, 1000);
+ tt, NULL, 0, HZ);
}
/*
dev_err (&hdev->dev,
"clear tt %d (%04x) error %d\n",
clear->tt, clear->devinfo, status);
- kfree(clear);
+ kfree (clear);
}
spin_unlock_irqrestore (&hub->tt.lock, flags);
}
/**
* usb_hub_tt_clear_buffer - clear control/bulk TT state in high speed hub
- * @udev: the device whose split transaction failed
+ * @dev: the device whose split transaction failed
* @pipe: identifies the endpoint of the failed transaction
*
* High speed HCDs use this to tell the hub driver that some split control or
* since each TT has "at least two" buffers that can need it (and
* there can be many TTs per hub). even if they're uncommon.
*/
- if ((clear = kmalloc (sizeof *clear, SLAB_ATOMIC)) == NULL) {
+ if ((clear = kmalloc (sizeof *clear, SLAB_ATOMIC)) == 0) {
dev_err (&udev->dev, "can't save CLEAR_TT_BUFFER state\n");
/* FIXME recover somehow ... RESET_TT? */
return;
static void hub_power_on(struct usb_hub *hub)
{
- int port1;
+ int i;
/* if hub supports power switching, enable power on each port */
if ((hub->descriptor->wHubCharacteristics & HUB_CHAR_LPSM) < 2) {
- dev_dbg(hub->intfdev, "enabling power on all ports\n");
- for (port1 = 1; port1 <= hub->descriptor->bNbrPorts; port1++)
- set_port_feature(hub->hdev, port1,
+ dev_dbg(&hub->intf->dev, "enabling power on all ports\n");
+ for (i = 0; i < hub->descriptor->bNbrPorts; i++)
+ set_port_feature(hub->hdev, i + 1,
USB_PORT_FEAT_POWER);
}
int status;
hub->quiescing = 0;
- hub->activating = 1;
status = usb_submit_urb(hub->urb, GFP_NOIO);
if (status < 0)
- dev_err(hub->intfdev, "activate --> %d\n", status);
+ dev_err(&hub->intf->dev, "activate --> %d\n", status);
if (hub->has_indicators && blinkenlights)
schedule_delayed_work(&hub->leds, LED_CYCLE_PERIOD);
/* scan all ports ASAP */
+ hub->event_bits[0] = ~0;
kick_khubd(hub);
}
ret = get_hub_status(hub->hdev, &hub->status->hub);
if (ret < 0)
- dev_err (hub->intfdev,
+ dev_err (&hub->intf->dev,
"%s failed (err = %d)\n", __FUNCTION__, ret);
else {
*status = le16_to_cpu(hub->status->hub.wHubStatus);
struct usb_endpoint_descriptor *endpoint)
{
struct usb_device *hdev = hub->hdev;
- struct device *hub_dev = hub->intfdev;
+ struct device *hub_dev = &hub->intf->dev;
u16 hubstatus, hubchange;
unsigned int pipe;
int maxp, ret;
hub->indicator [0] = INDICATOR_CYCLE;
hub_power_on(hub);
+ hub->change_bits[0] = ~0;
hub_activate(hub);
return 0;
list_del_init(&hub->event_list);
spin_unlock_irq(&hub_event_lock);
- kfree(hub->descriptor);
- hub->descriptor = NULL;
+ if (hub->descriptor) {
+ kfree(hub->descriptor);
+ hub->descriptor = NULL;
+ }
- kfree(hub->status);
- hub->status = NULL;
+ if (hub->status) {
+ kfree(hub->status);
+ hub->status = NULL;
+ }
if (hub->buffer) {
usb_buffer_free(hdev, sizeof(*hub->buffer), hub->buffer,
struct usb_endpoint_descriptor *endpoint;
struct usb_device *hdev;
struct usb_hub *hub;
+ struct device *hub_dev;
desc = intf->cur_altsetting;
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;
}
goto descriptor_error;
/* We found a hub */
- dev_info (&intf->dev, "USB hub found\n");
+ dev_info (hub_dev, "USB hub found\n");
hub = kmalloc(sizeof(*hub), GFP_KERNEL);
if (!hub) {
- dev_dbg (&intf->dev, "couldn't kmalloc hub struct\n");
+ dev_dbg (hub_dev, "couldn't kmalloc hub struct\n");
return -ENOMEM;
}
memset(hub, 0, sizeof(*hub));
INIT_LIST_HEAD(&hub->event_list);
- hub->intfdev = &intf->dev;
+ hub->intf = intf;
hub->hdev = hdev;
INIT_WORK(&hub->leds, led_work, hub);
switch (code) {
case USBDEVFS_HUB_PORTINFO: {
struct usbdevfs_hub_portinfo *info = user_data;
+ unsigned long flags;
int i;
- spin_lock_irq(&device_state_lock);
+ spin_lock_irqsave(&hub_event_lock, flags);
if (hdev->devnum <= 0)
info->nports = 0;
else {
hdev->children[i]->devnum;
}
}
- spin_unlock_irq(&device_state_lock);
+ spin_unlock_irqrestore(&hub_event_lock, flags);
return info->nports + 1;
}
}
/* caller has locked the hub device */
-static void hub_pre_reset(struct usb_hub *hub)
+static void hub_pre_reset(struct usb_device *hdev)
{
- struct usb_device *hdev = hub->hdev;
+ struct usb_hub *hub = usb_get_intfdata(hdev->actconfig->interface[0]);
int i;
for (i = 0; i < hdev->maxchild; ++i) {
}
/* caller has locked the hub device */
-static void hub_post_reset(struct usb_hub *hub)
+static void hub_post_reset(struct usb_device *hdev)
{
+ struct usb_hub *hub = usb_get_intfdata(hdev->actconfig->interface[0]);
+
hub_activate(hub);
hub_power_on(hub);
}
*/
down(&udev->serialize);
up(&hdev->serialize);
- return t + 1;
+ return t;
}
}
usb_unlock_device(hdev);
}
#ifdef DEBUG
-static void show_string(struct usb_device *udev, char *id, char *string)
-{
- if (!string)
- return;
- dev_printk(KERN_INFO, &udev->dev, "%s: %s\n", id, string);
-}
-
-#else
-static inline void show_string(struct usb_device *udev, char *id, char *string)
-{}
-#endif
-
-static void get_string(struct usb_device *udev, char **string, int index)
+static void show_string(struct usb_device *udev, char *id, int index)
{
char *buf;
if (!index)
return;
- buf = kmalloc(256, GFP_KERNEL);
- if (!buf)
+ if (!(buf = kmalloc(256, GFP_KERNEL)))
return;
if (usb_string(udev, index, buf, 256) > 0)
- *string = buf;
- else
- kfree(buf);
+ dev_printk(KERN_INFO, &udev->dev, "%s: %s\n", id, buf);
+ kfree(buf);
}
+#else
+static inline void show_string(struct usb_device *udev, char *id, int index)
+{}
+#endif
#ifdef CONFIG_USB_OTG
#include "otg_whitelist.h"
goto fail;
}
- /* read the standard strings and cache them if present */
- get_string(udev, &udev->product, udev->descriptor.iProduct);
- get_string(udev, &udev->manufacturer, udev->descriptor.iManufacturer);
- get_string(udev, &udev->serial, udev->descriptor.iSerialNumber);
-
/* Tell the world! */
dev_dbg(&udev->dev, "new device strings: Mfr=%d, Product=%d, "
"SerialNumber=%d\n",
udev->descriptor.iManufacturer,
udev->descriptor.iProduct,
udev->descriptor.iSerialNumber);
- show_string(udev, "Product", udev->product);
- show_string(udev, "Manufacturer", udev->manufacturer);
- show_string(udev, "SerialNumber", udev->serial);
+
+ if (udev->descriptor.iProduct)
+ show_string(udev, "Product",
+ udev->descriptor.iProduct);
+ if (udev->descriptor.iManufacturer)
+ show_string(udev, "Manufacturer",
+ udev->descriptor.iManufacturer);
+ if (udev->descriptor.iSerialNumber)
+ show_string(udev, "SerialNumber",
+ udev->descriptor.iSerialNumber);
#ifdef CONFIG_USB_OTG
/*
/* descriptor may appear anywhere in config */
if (__usb_get_extra_descriptor (udev->rawdescriptors[0],
- le16_to_cpu(udev->config[0].desc.wTotalLength),
+ udev->config[0].desc.wTotalLength,
USB_DT_OTG, (void **) &desc) == 0) {
if (desc->bmAttributes & USB_OTG_HNP) {
- unsigned port1;
+ unsigned port;
struct usb_device *root = udev->parent;
- for (port1 = 1; port1 <= root->maxchild;
- port1++) {
- if (root->children[port1-1] == udev)
+ for (port = 0; port < root->maxchild; port++) {
+ if (root->children[port] == udev)
break;
}
+ port++;
dev_info(&udev->dev,
"Dual-Role OTG device on %sHNP port\n",
- (port1 == bus->otg_port)
+ (port == bus->otg_port)
? "" : "non-");
/* enable HNP before suspend, it's simpler */
- if (port1 == bus->otg_port)
+ if (port == bus->otg_port)
bus->b_hnp_enable = 1;
err = usb_control_msg(udev,
usb_sndctrlpipe(udev, 0),
bus->b_hnp_enable
? USB_DEVICE_B_HNP_ENABLE
: USB_DEVICE_A_ALT_HNP_SUPPORT,
- 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
+ 0, NULL, 0, HZ * USB_CTRL_SET_TIMEOUT);
if (err < 0) {
/* OTG MESSAGE: report errors here,
* customize to match your product.
*/
if (udev->bus->b_hnp_enable || udev->bus->is_b_host) {
static int __usb_suspend_device (struct usb_device *,
- int port1, pm_message_t state);
+ int port, u32 state);
err = __usb_suspend_device(udev,
- udev->bus->otg_port,
- PMSG_SUSPEND);
+ udev->bus->otg_port - 1,
+ PM_SUSPEND_MEM);
if (err < 0)
dev_dbg(&udev->dev, "HNP fail, %d\n", err);
}
}
-static int hub_port_status(struct usb_hub *hub, int port1,
+static int hub_port_status(struct usb_device *hdev, int port,
u16 *status, u16 *change)
{
+ struct usb_hub *hub = usb_get_intfdata(hdev->actconfig->interface[0]);
int ret;
- ret = get_port_status(hub->hdev, port1, &hub->status->port);
+ if (!hub)
+ return -ENODEV;
+
+ ret = get_port_status(hdev, port + 1, &hub->status->port);
if (ret < 0)
- dev_err (hub->intfdev,
+ dev_err (&hub->intf->dev,
"%s failed (err = %d)\n", __FUNCTION__, ret);
else {
*status = le16_to_cpu(hub->status->port.wPortStatus);
#define HUB_LONG_RESET_TIME 200
#define HUB_RESET_TIMEOUT 500
-static int hub_port_wait_reset(struct usb_hub *hub, int port1,
+static int hub_port_wait_reset(struct usb_device *hdev, int port,
struct usb_device *udev, unsigned int delay)
{
int delay_time, ret;
msleep(delay);
/* read and decode port status */
- ret = hub_port_status(hub, port1, &portstatus, &portchange);
+ ret = hub_port_status(hdev, port, &portstatus, &portchange);
if (ret < 0)
return ret;
if (delay_time >= 2 * HUB_SHORT_RESET_TIME)
delay = HUB_LONG_RESET_TIME;
- dev_dbg (hub->intfdev,
+ dev_dbg (hubdev (hdev),
"port %d not reset yet, waiting %dms\n",
- port1, delay);
+ port + 1, delay);
}
return -EBUSY;
}
-static int hub_port_reset(struct usb_hub *hub, int port1,
+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 < PORT_RESET_TRIES; i++) {
- status = set_port_feature(hub->hdev,
- port1, USB_PORT_FEAT_RESET);
+ status = set_port_feature(hdev, port + 1, USB_PORT_FEAT_RESET);
if (status)
- dev_err(hub->intfdev,
- "cannot reset port %d (err = %d)\n",
- port1, status);
- else {
- status = hub_port_wait_reset(hub, port1, udev, delay);
- if (status)
- dev_dbg(hub->intfdev,
- "port_wait_reset: err = %d\n",
- status);
- }
+ dev_err(hub_dev, "cannot reset port %d (err = %d)\n",
+ port + 1, status);
+ else
+ status = hub_port_wait_reset(hdev, port, udev, delay);
/* return on disconnect or reset */
switch (status) {
case 0:
- /* TRSTRCY = 10 ms */
- msleep(10);
- /* FALL THROUGH */
case -ENOTCONN:
case -ENODEV:
- clear_port_feature(hub->hdev,
- port1, USB_PORT_FEAT_C_RESET);
+ clear_port_feature(hdev,
+ port + 1, USB_PORT_FEAT_C_RESET);
/* FIXME need disconnect() for NOTATTACHED device */
usb_set_device_state(udev, status
? USB_STATE_NOTATTACHED
return status;
}
- dev_dbg (hub->intfdev,
+ dev_dbg (hub_dev,
"port %d not enabled, trying reset again...\n",
- port1);
+ port + 1);
delay = HUB_LONG_RESET_TIME;
}
- dev_err (hub->intfdev,
+ dev_err (hub_dev,
"Cannot enable port %i. Maybe the USB cable is bad?\n",
- port1);
+ port + 1);
return status;
}
-static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
+static int hub_port_disable(struct usb_device *hdev, int port)
{
- struct usb_device *hdev = hub->hdev;
int ret;
- if (hdev->children[port1-1] && set_state) {
- usb_set_device_state(hdev->children[port1-1],
+ if (hdev->children[port]) {
+ usb_set_device_state(hdev->children[port],
USB_STATE_NOTATTACHED);
}
- ret = clear_port_feature(hdev, port1, USB_PORT_FEAT_ENABLE);
+ ret = clear_port_feature(hdev, port + 1, USB_PORT_FEAT_ENABLE);
if (ret)
- dev_err(hub->intfdev, "cannot disable port %d (err = %d)\n",
- port1, ret);
+ dev_err(hubdev(hdev), "cannot disable port %d (err = %d)\n",
+ port + 1, ret);
return ret;
}
* time later khubd will disconnect() any existing usb_device on the port
* and will re-enumerate if there actually is a device attached.
*/
-static void hub_port_logical_disconnect(struct usb_hub *hub, int port1)
+static void hub_port_logical_disconnect(struct usb_device *hdev, int port)
{
- dev_dbg(hub->intfdev, "logical disconnect on port %d\n", port1);
- hub_port_disable(hub, port1, 1);
+ struct usb_hub *hub;
+
+ dev_dbg(hubdev(hdev), "logical disconnect on port %d\n", port + 1);
+ hub_port_disable(hdev, port);
/* FIXME let caller ask to power down the port:
* - some devices won't enumerate without a VBUS power cycle
* - SRP saves power that way
- * - usb_suspend_device(dev, PMSG_SUSPEND)
+ * - usb_suspend_device(dev,PM_SUSPEND_DISK)
* That's easy if this hub can switch power per-port, and
* khubd reactivates the port later (timer, SRP, etc).
* Powerdown must be optional, because of reset/DFU.
*/
- set_bit(port1, hub->change_bits);
+ hub = usb_get_intfdata(hdev->actconfig->interface[0]);
+ set_bit(port, hub->change_bits);
kick_khubd(hub);
}
* tree above them to deliver data, such as a keypress or packet. In
* some cases, this wakes the USB host.
*/
-static int hub_port_suspend(struct usb_hub *hub, int port1,
- struct usb_device *udev)
+static int hub_port_suspend(struct usb_device *hdev, int port)
{
- int status;
+ int status;
+ struct usb_device *udev;
- // dev_dbg(hub->intfdev, "suspend port %d\n", port1);
+ udev = hdev->children[port];
+ // dev_dbg(hubdev(hdev), "suspend port %d\n", port + 1);
/* enable remote wakeup when appropriate; this lets the device
* wake up the upstream hub (including maybe the root hub).
}
/* see 7.1.7.6 */
- status = set_port_feature(hub->hdev, port1, USB_PORT_FEAT_SUSPEND);
+ status = set_port_feature(hdev, port + 1, USB_PORT_FEAT_SUSPEND);
if (status) {
- dev_dbg(hub->intfdev,
+ dev_dbg(hubdev(hdev),
"can't suspend port %d, status %d\n",
- port1, status);
+ port + 1, status);
/* paranoia: "should not happen" */
(void) usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE,
} else {
/* device has up to 10 msec to fully suspend */
dev_dbg(&udev->dev, "usb suspend\n");
- usb_set_device_state(udev, USB_STATE_SUSPENDED);
+ udev->state = USB_STATE_SUSPENDED;
msleep(10);
}
return status;
/*
* Devices on USB hub ports have only one "suspend" state, corresponding
- * to ACPI D2, "may cause the device to lose some context".
+ * to ACPI D2 (PM_SUSPEND_MEM), "may cause the device to lose some context".
* State transitions include:
*
* - suspend, resume ... when the VBUS power link stays live
* Linux (2.6) currently has NO mechanisms to initiate that: no khubd
* timer, no SRP, no requests through sysfs.
*/
-static int __usb_suspend_device (struct usb_device *udev, int port1,
- pm_message_t state)
+int __usb_suspend_device (struct usb_device *udev, int port, u32 state)
{
int status;
/* caller owns the udev device lock */
- if (port1 < 0)
- return port1;
+ if (port < 0)
+ return port;
if (udev->state == USB_STATE_SUSPENDED
|| udev->state == USB_STATE_NOTATTACHED) {
struct usb_bus *bus = udev->bus;
if (bus && bus->op->hub_suspend) {
status = bus->op->hub_suspend (bus);
- if (status == 0) {
- dev_dbg(&udev->dev, "usb suspend\n");
+ if (status == 0)
usb_set_device_state(udev,
USB_STATE_SUSPENDED);
- }
} else
status = -EOPNOTSUPP;
} else
- status = hub_port_suspend(hdev_to_hub(udev->parent), port1,
- udev);
+ status = hub_port_suspend(udev->parent, port);
- if (status == 0)
- udev->dev.power.power_state = state;
return status;
}
+EXPORT_SYMBOL(__usb_suspend_device);
/**
* usb_suspend_device - suspend a usb device
* @udev: device that's no longer in active use
- * @state: PMSG_SUSPEND to suspend
+ * @state: PM_SUSPEND_MEM to suspend
* Context: must be able to sleep; device not locked
*
* Suspends a USB device that isn't in active use, conserving power.
*
* Returns 0 on success, else negative errno.
*/
-int usb_suspend_device(struct usb_device *udev, pm_message_t state)
+int usb_suspend_device(struct usb_device *udev, u32 state)
{
- int port1, status;
+ int port, status;
- port1 = locktree(udev);
- if (port1 < 0)
- return port1;
+ port = locktree(udev);
+ if (port < 0)
+ return port;
- status = __usb_suspend_device(udev, port1, state);
+ status = __usb_suspend_device(udev, port, state);
usb_unlock_device(udev);
return status;
}
* first two on the host side; they'd be inside hub_port_init()
* during many timeouts, but khubd can't suspend until later.
*/
- usb_set_device_state(udev, udev->actconfig
- ? USB_STATE_CONFIGURED
- : USB_STATE_ADDRESS);
- udev->dev.power.power_state = PMSG_ON;
+ udev->state = udev->actconfig
+ ? USB_STATE_CONFIGURED
+ : USB_STATE_ADDRESS;
/* 10.5.4.5 says be sure devices in the tree are still there.
* For now let's assume the device didn't go crazy on resume,
struct usb_driver *driver;
intf = udev->actconfig->interface[i];
- if (intf->dev.power.power_state == PMSG_SUSPEND)
+ if (intf->dev.power.power_state == PM_SUSPEND_ON)
continue;
if (!intf->dev.driver) {
/* FIXME maybe force to alt 0 */
/* can we do better than just logging errors? */
status = driver->resume(intf);
- if (intf->dev.power.power_state != PMSG_ON
+ if (intf->dev.power.power_state != PM_SUSPEND_ON
|| status)
dev_dbg(&intf->dev,
"resume fail, state %d code %d\n",
}
static int
-hub_port_resume(struct usb_hub *hub, int port1, struct usb_device *udev)
+hub_port_resume(struct usb_device *hdev, int port)
{
- int status;
+ int status;
+ struct usb_device *udev;
- // dev_dbg(hub->intfdev, "resume port %d\n", port1);
+ udev = hdev->children[port];
+ // dev_dbg(hubdev(hdev), "resume port %d\n", port + 1);
/* see 7.1.7.7; affects power usage, but not budgeting */
- status = clear_port_feature(hub->hdev,
- port1, USB_PORT_FEAT_SUSPEND);
+ status = clear_port_feature(hdev, port + 1, USB_PORT_FEAT_SUSPEND);
if (status) {
- dev_dbg(hub->intfdev,
+ dev_dbg(&hdev->actconfig->interface[0]->dev,
"can't resume port %d, status %d\n",
- port1, status);
+ port + 1, status);
} else {
u16 devstatus;
u16 portchange;
/* drive resume for at least 20 msec */
- if (udev)
- dev_dbg(&udev->dev, "RESUME\n");
+ dev_dbg(&udev->dev, "RESUME\n");
msleep(25);
#define LIVE_FLAGS ( USB_PORT_STAT_POWER \
* sequence.
*/
devstatus = portchange = 0;
- status = hub_port_status(hub, port1,
+ status = hub_port_status(hdev, port,
&devstatus, &portchange);
if (status < 0
|| (devstatus & LIVE_FLAGS) != LIVE_FLAGS
|| (devstatus & USB_PORT_STAT_SUSPEND) != 0
) {
- dev_dbg(hub->intfdev,
+ dev_dbg(&hdev->actconfig->interface[0]->dev,
"port %d status %04x.%04x after resume, %d\n",
- port1, portchange, devstatus, status);
+ port + 1, portchange, devstatus, status);
} else {
/* TRSMRCY = 10 msec */
msleep(10);
- if (udev)
- status = finish_port_resume(udev);
+ status = finish_port_resume(udev);
}
}
if (status < 0)
- hub_port_logical_disconnect(hub, port1);
+ hub_port_logical_disconnect(hdev, port);
return status;
}
*/
int usb_resume_device(struct usb_device *udev)
{
- int port1, status;
+ int port, status;
- port1 = locktree(udev);
- if (port1 < 0)
- return port1;
+ port = locktree(udev);
+ if (port < 0)
+ return port;
/* "global resume" of the HC-to-USB interface (root hub), or
* selective resume of one hub-to-device port
} else
status = -EOPNOTSUPP;
if (status == 0) {
- dev_dbg(&udev->dev, "usb resume\n");
/* TRSMRCY = 10 msec */
msleep(10);
usb_set_device_state (udev, USB_STATE_CONFIGURED);
- udev->dev.power.power_state = PMSG_ON;
status = hub_resume (udev
->actconfig->interface[0]);
}
} else if (udev->state == USB_STATE_SUSPENDED) {
// NOTE this fails if parent is also suspended...
- status = hub_port_resume(hdev_to_hub(udev->parent),
- port1, udev);
+ status = hub_port_resume(udev->parent, port);
} else {
status = 0;
}
return status;
}
-static int hub_suspend(struct usb_interface *intf, pm_message_t state)
+static int hub_suspend(struct usb_interface *intf, u32 state)
{
struct usb_hub *hub = usb_get_intfdata (intf);
struct usb_device *hdev = hub->hdev;
- unsigned port1;
+ unsigned port;
int status;
/* stop khubd and related activity */
hub_quiesce(hub);
/* then suspend every port */
- for (port1 = 1; port1 <= hdev->maxchild; port1++) {
+ for (port = 0; port < hdev->maxchild; port++) {
struct usb_device *udev;
- udev = hdev->children [port1-1];
+ udev = hdev->children [port];
if (!udev)
continue;
down(&udev->serialize);
- status = __usb_suspend_device(udev, port1, state);
+ status = __usb_suspend_device(udev, port, state);
up(&udev->serialize);
if (status < 0)
dev_dbg(&intf->dev, "suspend port %d --> %d\n",
- port1, status);
+ port, status);
}
intf->dev.power.power_state = state;
{
struct usb_device *hdev = interface_to_usbdev(intf);
struct usb_hub *hub = usb_get_intfdata (intf);
- unsigned port1;
+ unsigned port;
int status;
if (intf->dev.power.power_state == PM_SUSPEND_ON)
return 0;
- for (port1 = 1; port1 <= hdev->maxchild; port1++) {
+ for (port = 0; port < hdev->maxchild; port++) {
struct usb_device *udev;
u16 portstat, portchange;
- udev = hdev->children [port1-1];
- status = hub_port_status(hub, port1, &portstat, &portchange);
+ udev = hdev->children [port];
+ status = hub_port_status(hdev, port, &portstat, &portchange);
if (status == 0) {
if (portchange & USB_PORT_STAT_C_SUSPEND) {
- clear_port_feature(hdev, port1,
+ clear_port_feature(hdev, port + 1,
USB_PORT_FEAT_C_SUSPEND);
portchange &= ~USB_PORT_STAT_C_SUSPEND;
}
continue;
down (&udev->serialize);
if (portstat & USB_PORT_STAT_SUSPEND)
- status = hub_port_resume(hub, port1, udev);
+ status = hub_port_resume(hdev, port);
else {
status = finish_port_resume(udev);
if (status < 0) {
dev_dbg(&intf->dev, "resume port %d --> %d\n",
- port1, status);
- hub_port_logical_disconnect(hub, port1);
+ port + 1, status);
+ hub_port_logical_disconnect(hdev, port);
}
}
up(&udev->serialize);
}
- intf->dev.power.power_state = PMSG_ON;
+ intf->dev.power.power_state = PM_SUSPEND_ON;
- hub->resume_root_hub = 0;
hub_activate(hub);
return 0;
}
-void usb_resume_root_hub(struct usb_device *hdev)
-{
- struct usb_hub *hub = hdev_to_hub(hdev);
-
- hub->resume_root_hub = 1;
- kick_khubd(hub);
-}
-
#else /* !CONFIG_USB_SUSPEND */
-int usb_suspend_device(struct usb_device *udev, pm_message_t state)
+int usb_suspend_device(struct usb_device *udev, u32 state)
{
return 0;
}
#define HUB_DEBOUNCE_STEP 25
#define HUB_DEBOUNCE_STABLE 100
-static int hub_port_debounce(struct usb_hub *hub, int port1)
+static int hub_port_debounce(struct usb_device *hdev, int port)
{
int ret;
int total_time, stable_time = 0;
unsigned connection = 0xffff;
for (total_time = 0; ; total_time += HUB_DEBOUNCE_STEP) {
- ret = hub_port_status(hub, port1, &portstatus, &portchange);
+ ret = hub_port_status(hdev, port, &portstatus, &portchange);
if (ret < 0)
return ret;
}
if (portchange & USB_PORT_STAT_C_CONNECTION) {
- clear_port_feature(hub->hdev, port1,
+ clear_port_feature(hdev, port+1,
USB_PORT_FEAT_C_CONNECTION);
}
msleep(HUB_DEBOUNCE_STEP);
}
- dev_dbg (hub->intfdev,
+ dev_dbg (hubdev (hdev),
"debounce: port %d: total %dms stable %dms status 0x%x\n",
- port1, total_time, stable_time, portstatus);
+ port + 1, total_time, stable_time, portstatus);
if (stable_time < HUB_DEBOUNCE_STABLE)
return -ETIMEDOUT;
return portstatus;
}
-static void ep0_reinit(struct usb_device *udev)
-{
- usb_disable_endpoint(udev, 0 + USB_DIR_IN);
- usb_disable_endpoint(udev, 0 + USB_DIR_OUT);
- udev->ep_in[0] = udev->ep_out[0] = &udev->ep0;
-}
-
#define usb_sndaddr0pipe() (PIPE_CONTROL << 30)
#define usb_rcvaddr0pipe() ((PIPE_CONTROL << 30) | USB_DIR_IN)
return -EINVAL;
retval = usb_control_msg(udev, usb_sndaddr0pipe(),
USB_REQ_SET_ADDRESS, 0, udev->devnum, 0,
- NULL, 0, USB_CTRL_SET_TIMEOUT);
+ NULL, 0, HZ * USB_CTRL_SET_TIMEOUT);
if (retval == 0) {
+ int m = udev->epmaxpacketin[0];
+
usb_set_device_state(udev, USB_STATE_ADDRESS);
- ep0_reinit(udev);
+ usb_disable_endpoint(udev, 0 + USB_DIR_IN);
+ usb_disable_endpoint(udev, 0 + USB_DIR_OUT);
+ udev->epmaxpacketin[0] = udev->epmaxpacketout[0] = m;
}
return retval;
}
* pointers, it's not necessary to lock the device.
*/
static int
-hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
+hub_port_init (struct usb_device *hdev, struct usb_device *udev, int port,
int retry_counter)
{
static DECLARE_MUTEX(usb_address0_sem);
- struct usb_device *hdev = hub->hdev;
int i, j, retval;
unsigned delay = HUB_SHORT_RESET_TIME;
enum usb_device_speed oldspeed = udev->speed;
*/
if (!hdev->parent) {
delay = HUB_ROOT_RESET_TIME;
- if (port1 == hdev->bus->otg_port)
+ if (port + 1 == hdev->bus->otg_port)
hdev->bus->b_hnp_enable = 0;
}
down(&usb_address0_sem);
/* Reset the device; full speed may morph to high speed */
- retval = hub_port_reset(hub, port1, udev, delay);
+ retval = hub_port_reset(hdev, port, udev, delay);
if (retval < 0) /* error or disconnect */
goto fail;
/* success, speed is known */
*/
switch (udev->speed) {
case USB_SPEED_HIGH: /* fixed at 64 */
- udev->ep0.desc.wMaxPacketSize = __constant_cpu_to_le16(64);
+ i = 64;
break;
case USB_SPEED_FULL: /* 8, 16, 32, or 64 */
/* to determine the ep0 maxpacket size, try to read
* the device descriptor to get bMaxPacketSize0 and
* then correct our initial guess.
*/
- udev->ep0.desc.wMaxPacketSize = __constant_cpu_to_le16(64);
+ i = 64;
break;
case USB_SPEED_LOW: /* fixed at 8 */
- udev->ep0.desc.wMaxPacketSize = __constant_cpu_to_le16(8);
+ i = 8;
break;
default:
goto fail;
}
+ udev->epmaxpacketin[0] = udev->epmaxpacketout[0] = i;
dev_info (&udev->dev,
"%s %s speed USB device using %s and address %d\n",
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 = port1;
+ udev->ttport = port + 1;
}
/* Why interleave GET_DESCRIPTOR and SET_ADDRESS this way?
for (i = 0; i < GET_DESCRIPTOR_TRIES; (++i, msleep(100))) {
if (USE_NEW_SCHEME(retry_counter)) {
struct usb_device_descriptor *buf;
- int r = 0;
#define GET_DESCRIPTOR_BUFSIZE 64
buf = kmalloc(GET_DESCRIPTOR_BUFSIZE, GFP_NOIO);
retval = -ENOMEM;
continue;
}
+ buf->bMaxPacketSize0 = 0;
/* Use a short timeout the first time through,
* so that recalcitrant full-speed devices with
* 8- or 16-byte ep0-maxpackets won't slow things
* down tremendously by NAKing the unexpectedly
- * early status stage. Also, retry on all errors;
- * some devices are flakey.
+ * early status stage.
*/
- for (j = 0; j < 3; ++j) {
- buf->bMaxPacketSize0 = 0;
- r = usb_control_msg(udev, usb_rcvaddr0pipe(),
+ j = usb_control_msg(udev, usb_rcvaddr0pipe(),
USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,
USB_DT_DEVICE << 8, 0,
buf, GET_DESCRIPTOR_BUFSIZE,
- (i ? USB_CTRL_GET_TIMEOUT : 1000));
- switch (buf->bMaxPacketSize0) {
- case 8: case 16: case 32: case 64:
- if (buf->bDescriptorType ==
- USB_DT_DEVICE) {
- r = 0;
- break;
- }
- /* FALL THROUGH */
- default:
- if (r == 0)
- r = -EPROTO;
- break;
- }
- if (r == 0)
- break;
- }
+ (i ? HZ * USB_CTRL_GET_TIMEOUT : HZ));
udev->descriptor.bMaxPacketSize0 =
buf->bMaxPacketSize0;
kfree(buf);
- retval = hub_port_reset(hub, port1, udev, delay);
+ retval = hub_port_reset(hdev, port, udev, delay);
if (retval < 0) /* error or disconnect */
goto fail;
if (oldspeed != udev->speed) {
retval = -ENODEV;
goto fail;
}
- if (r) {
+ if (udev->descriptor.bMaxPacketSize0 == 0) {
dev_err(&udev->dev, "device descriptor "
"read/%s, error %d\n",
- "64", r);
+ "64", j);
retval = -EMSGSIZE;
continue;
}
if (retval)
goto fail;
+ /* Should we verify that the value is valid? */
i = udev->descriptor.bMaxPacketSize0;
- if (le16_to_cpu(udev->ep0.desc.wMaxPacketSize) != i) {
- if (udev->speed != USB_SPEED_FULL ||
- !(i == 8 || i == 16 || i == 32 || i == 64)) {
- dev_err(&udev->dev, "ep0 maxpacket = %d\n", i);
- retval = -EMSGSIZE;
- goto fail;
- }
+ if (udev->epmaxpacketin[0] != i) {
dev_dbg(&udev->dev, "ep0 maxpacket = %d\n", i);
- udev->ep0.desc.wMaxPacketSize = cpu_to_le16(i);
- ep0_reinit(udev);
+ usb_disable_endpoint(udev, 0 + USB_DIR_IN);
+ usb_disable_endpoint(udev, 0 + USB_DIR_OUT);
+ udev->epmaxpacketin[0] = udev->epmaxpacketout[0] = i;
}
retval = usb_get_device_descriptor(udev, USB_DT_DEVICE_SIZE);
retval = 0;
fail:
- if (retval)
- hub_port_disable(hub, port1, 0);
up(&usb_address0_sem);
return retval;
}
static void
-check_highspeed (struct usb_hub *hub, struct usb_device *udev, int port1)
+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 == NULL)
+ if (qual == 0)
return;
status = usb_get_descriptor (udev, USB_DT_DEVICE_QUALIFIER, 0,
"connect to a high speed hub\n");
/* hub LEDs are probably harder to miss than syslog */
if (hub->has_indicators) {
- hub->indicator[port1-1] = INDICATOR_GREEN_BLINK;
+ hub->indicator[port] = INDICATOR_GREEN_BLINK;
schedule_work (&hub->leds);
}
}
- kfree(qual);
+ kfree (qual);
}
static unsigned
remaining -= delta;
}
if (remaining < 0) {
- dev_warn(hub->intfdev,
+ dev_warn(&hub->intf->dev,
"%dmA over power budget!\n",
-2 * remaining);
remaining = 0;
* a firmware download)
* caller already locked the hub
*/
-static void hub_port_connect_change(struct usb_hub *hub, int port1,
+static void hub_port_connect_change(struct usb_hub *hub, int port,
u16 portstatus, u16 portchange)
{
struct usb_device *hdev = hub->hdev;
- struct device *hub_dev = hub->intfdev;
+ struct device *hub_dev = &hub->intf->dev;
int status, i;
dev_dbg (hub_dev,
"port %d, status %04x, change %04x, %s\n",
- port1, portstatus, portchange, portspeed (portstatus));
+ port + 1, portstatus, portchange, portspeed (portstatus));
if (hub->has_indicators) {
- set_port_led(hub, port1, HUB_LED_AUTO);
- hub->indicator[port1-1] = INDICATOR_AUTO;
+ set_port_led(hdev, port + 1, HUB_LED_AUTO);
+ hub->indicator[port] = INDICATOR_AUTO;
}
/* Disconnect any existing devices under this port */
- if (hdev->children[port1-1])
- usb_disconnect(&hdev->children[port1-1]);
- clear_bit(port1, hub->change_bits);
+ if (hdev->children[port])
+ usb_disconnect(&hdev->children[port]);
+ clear_bit(port, hub->change_bits);
#ifdef CONFIG_USB_OTG
/* during HNP, don't repeat the debounce */
#endif
if (portchange & USB_PORT_STAT_C_CONNECTION) {
- status = hub_port_debounce(hub, port1);
+ status = hub_port_debounce(hdev, port);
if (status < 0) {
dev_err (hub_dev,
"connect-debounce failed, port %d disabled\n",
- port1);
+ port+1);
goto done;
}
portstatus = status;
if ((hub->descriptor->wHubCharacteristics
& HUB_CHAR_LPSM) < 2
&& !(portstatus & (1 << USB_PORT_FEAT_POWER)))
- set_port_feature(hdev, port1, USB_PORT_FEAT_POWER);
+ set_port_feature(hdev, port + 1, USB_PORT_FEAT_POWER);
if (portstatus & USB_PORT_STAT_ENABLE)
goto done;
}
#ifdef CONFIG_USB_SUSPEND
- /* If something is connected, but the port is suspended, wake it up. */
+ /* If something is connected, but the port is suspended, wake it up.. */
if (portstatus & USB_PORT_STAT_SUSPEND) {
- status = hub_port_resume(hub, port1, NULL);
- if (status < 0) {
- dev_dbg(hub_dev,
- "can't clear suspend on port %d; %d\n",
- port1, status);
- goto done;
- }
+ status = hub_port_resume(hdev, port);
+ if (status < 0)
+ dev_dbg(hub_dev, "can't clear suspend on port %d; %d\n", port+1, status);
}
#endif
/* reallocate for each attempt, since references
* to the previous one can escape in various ways
*/
- udev = usb_alloc_dev(hdev, hdev->bus, port1);
+ udev = usb_alloc_dev(hdev, hdev->bus, port);
if (!udev) {
dev_err (hub_dev,
- "couldn't allocate port %d usb_device\n",
- port1);
+ "couldn't allocate port %d usb_device\n", port+1);
goto done;
}
}
/* reset and get descriptor */
- status = hub_port_init(hub, udev, port1, i);
+ status = hub_port_init(hdev, udev, port, i);
if (status < 0)
goto loop;
&devstat);
if (status < 0) {
dev_dbg(&udev->dev, "get status %d ?\n", status);
- goto loop_disable;
+ goto loop;
}
cpu_to_le16s(&devstat);
if ((devstat & (1 << USB_DEVICE_SELF_POWERED)) == 0) {
"can't connect bus-powered hub "
"to this port\n");
if (hub->has_indicators) {
- hub->indicator[port1-1] =
+ hub->indicator[port] =
INDICATOR_AMBER_BLINK;
schedule_work (&hub->leds);
}
status = -ENOTCONN; /* Don't retry */
- goto loop_disable;
+ goto loop;
}
}
/* check for devices running slower than they could */
- if (le16_to_cpu(udev->descriptor.bcdUSB) >= 0x0200
+ if (udev->descriptor.bcdUSB >= 0x0200
&& udev->speed == USB_SPEED_FULL
&& highspeed_hubs != 0)
- check_highspeed (hub, udev, port1);
+ check_highspeed (hub, udev, port);
/* Store the parent's children[] pointer. At this point
* udev becomes globally accessible, although presumably
if (hdev->state == USB_STATE_NOTATTACHED)
status = -ENOTCONN;
else
- hdev->children[port1-1] = udev;
+ hdev->children[port] = udev;
spin_unlock_irq(&device_state_lock);
/* Run it through the hoops (find a driver, etc) */
status = usb_new_device(udev);
if (status) {
spin_lock_irq(&device_state_lock);
- hdev->children[port1-1] = NULL;
+ hdev->children[port] = NULL;
spin_unlock_irq(&device_state_lock);
}
}
up (&udev->serialize);
if (status)
- goto loop_disable;
+ goto loop;
status = hub_power_remaining(hub);
if (status)
return;
-loop_disable:
- hub_port_disable(hub, port1, 1);
loop:
- ep0_reinit(udev);
+ hub_port_disable(hdev, port);
+ usb_disable_endpoint(udev, 0 + USB_DIR_IN);
+ usb_disable_endpoint(udev, 0 + USB_DIR_OUT);
release_address(udev);
usb_put_dev(udev);
if (status == -ENOTCONN)
}
done:
- hub_port_disable(hub, port1, 1);
+ hub_port_disable(hdev, port);
}
static void hub_events(void)
{
struct list_head *tmp;
struct usb_device *hdev;
- struct usb_interface *intf;
struct usb_hub *hub;
struct device *hub_dev;
u16 hubstatus;
hub = list_entry(tmp, struct usb_hub, event_list);
hdev = hub->hdev;
- intf = to_usb_interface(hub->intfdev);
- hub_dev = &intf->dev;
+ hub_dev = &hub->intf->dev;
+
+ usb_get_dev(hdev);
+ spin_unlock_irq(&hub_event_lock);
dev_dbg(hub_dev, "state %d ports %d chg %04x evt %04x\n",
hdev->state, hub->descriptor
(u16) hub->change_bits[0],
(u16) hub->event_bits[0]);
- usb_get_intf(intf);
- i = hub->resume_root_hub;
- spin_unlock_irq(&hub_event_lock);
-
- /* Is this is a root hub wanting to be resumed? */
- if (i)
- usb_resume_device(hdev);
-
/* Lock the device, then check to see if we were
* disconnected while waiting for the lock to succeed. */
- if (locktree(hdev) < 0) {
- usb_put_intf(intf);
- continue;
- }
- if (hub != usb_get_intfdata(intf))
- goto loop;
-
- /* If the hub has died, clean up after it */
- if (hdev->state == USB_STATE_NOTATTACHED) {
- hub_pre_reset(hub);
- goto loop;
- }
-
- /* If this is an inactive or suspended hub, do nothing */
- if (hub->quiescing)
+ if (locktree(hdev) < 0)
+ break;
+ if (hdev->state != USB_STATE_CONFIGURED ||
+ !hdev->actconfig ||
+ hub != usb_get_intfdata(
+ hdev->actconfig->interface[0]))
goto loop;
if (hub->error) {
}
/* deal with port status changes */
- for (i = 1; i <= hub->descriptor->bNbrPorts; i++) {
- if (test_bit(i, hub->busy_bits))
- continue;
+ for (i = 0; i < hub->descriptor->bNbrPorts; i++) {
connect_change = test_bit(i, hub->change_bits);
- if (!test_and_clear_bit(i, hub->event_bits) &&
- !connect_change && !hub->activating)
+ if (!test_and_clear_bit(i+1, hub->event_bits) &&
+ !connect_change)
continue;
- ret = hub_port_status(hub, i,
+ ret = hub_port_status(hdev, i,
&portstatus, &portchange);
if (ret < 0)
continue;
- if (hub->activating && !hdev->children[i-1] &&
- (portstatus &
- USB_PORT_STAT_CONNECTION))
- connect_change = 1;
-
if (portchange & USB_PORT_STAT_C_CONNECTION) {
- clear_port_feature(hdev, i,
- USB_PORT_FEAT_C_CONNECTION);
+ clear_port_feature(hdev,
+ i + 1, USB_PORT_FEAT_C_CONNECTION);
connect_change = 1;
}
dev_dbg (hub_dev,
"port %d enable change, "
"status %08x\n",
- i, portstatus);
- clear_port_feature(hdev, i,
- USB_PORT_FEAT_C_ENABLE);
+ i + 1, portstatus);
+ clear_port_feature(hdev,
+ i + 1, USB_PORT_FEAT_C_ENABLE);
/*
* EM interference sometimes causes badly
*/
if (!(portstatus & USB_PORT_STAT_ENABLE)
&& !connect_change
- && hdev->children[i-1]) {
+ && hdev->children[i]) {
dev_err (hub_dev,
"port %i "
"disabled by hub (EMI?), "
"re-enabling...\n",
- i);
+ i + 1);
connect_change = 1;
}
}
if (portchange & USB_PORT_STAT_C_SUSPEND) {
- clear_port_feature(hdev, i,
+ clear_port_feature(hdev, i + 1,
USB_PORT_FEAT_C_SUSPEND);
- if (hdev->children[i-1]) {
- ret = remote_wakeup(hdev->
- children[i-1]);
+ if (hdev->children[i]) {
+ ret = remote_wakeup(hdev->children[i]);
if (ret < 0)
connect_change = 1;
} else {
ret = -ENODEV;
- hub_port_disable(hub, i, 1);
+ hub_port_disable(hdev, i);
}
dev_dbg (hub_dev,
"resume on port %d, status %d\n",
- i, ret);
+ i + 1, ret);
}
if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
dev_err (hub_dev,
"over-current change on port %d\n",
- i);
- clear_port_feature(hdev, i,
- USB_PORT_FEAT_C_OVER_CURRENT);
+ i + 1);
+ 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_dev,
"reset change on port %d\n",
- i);
- clear_port_feature(hdev, i,
- USB_PORT_FEAT_C_RESET);
+ i + 1);
+ clear_port_feature(hdev,
+ i + 1, USB_PORT_FEAT_C_RESET);
}
if (connect_change)
}
}
- hub->activating = 0;
-
loop:
usb_unlock_device(hdev);
- usb_put_intf(intf);
+ usb_put_dev(hdev);
} /* end while (1) */
}
do {
hub_events();
wait_event_interruptible(khubd_wait, !list_empty(&hub_event_list));
- try_to_freeze(PF_FREEZE);
+ if (current->flags & PF_FREEZE)
+ refrigerator(PF_FREEZE);
} while (!signal_pending(current));
pr_debug ("%s: khubd exiting\n", usbcore_name);
struct usb_config_descriptor *buf;
for (index = 0; index < udev->descriptor.bNumConfigurations; index++) {
- if (len < le16_to_cpu(udev->config[index].desc.wTotalLength))
- len = le16_to_cpu(udev->config[index].desc.wTotalLength);
+ if (len < udev->config[index].desc.wTotalLength)
+ len = udev->config[index].desc.wTotalLength;
}
buf = kmalloc (len, SLAB_KERNEL);
- if (buf == NULL) {
+ 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 = le16_to_cpu(udev->config[index].desc.wTotalLength);
+ int old_length = udev->config[index].desc.wTotalLength;
length = usb_get_descriptor(udev, USB_DT_CONFIG, index, buf,
old_length);
*/
int usb_reset_device(struct usb_device *udev)
{
- struct usb_device *parent_hdev = udev->parent;
- struct usb_hub *parent_hub;
- struct usb_device_descriptor descriptor = udev->descriptor;
- struct usb_hub *hub = NULL;
- int i, ret = 0, port1 = -1;
+ struct usb_device *parent = udev->parent;
+ struct usb_device_descriptor descriptor = udev->descriptor;
+ int i, ret = 0, port = -1;
+ int udev_is_a_hub = 0;
if (udev->state == USB_STATE_NOTATTACHED ||
udev->state == USB_STATE_SUSPENDED) {
return -EINVAL;
}
- if (!parent_hdev) {
+ if (!parent) {
/* this requires hcd-specific logic; see OHCI hc_restart() */
dev_dbg(&udev->dev, "%s for root hub!\n", __FUNCTION__);
return -EISDIR;
}
- for (i = 0; i < parent_hdev->maxchild; i++)
- if (parent_hdev->children[i] == udev) {
- port1 = i + 1;
+ for (i = 0; i < parent->maxchild; i++)
+ if (parent->children[i] == udev) {
+ port = i;
break;
}
- if (port1 < 0) {
+ if (port < 0) {
/* If this ever happens, it's very bad */
dev_err(&udev->dev, "Can't locate device's port!\n");
return -ENOENT;
}
- parent_hub = hdev_to_hub(parent_hdev);
/* If we're resetting an active hub, take some special actions */
if (udev->actconfig &&
udev->actconfig->interface[0]->dev.driver ==
- &hub_driver.driver &&
- (hub = hdev_to_hub(udev)) != NULL) {
- hub_pre_reset(hub);
+ &hub_driver.driver) {
+ udev_is_a_hub = 1;
+ hub_pre_reset(udev);
}
- set_bit(port1, parent_hub->busy_bits);
for (i = 0; i < SET_CONFIG_TRIES; ++i) {
/* ep0 maxpacket size may change; let the HCD know about it.
* Other endpoints will be handled by re-enumeration. */
- ep0_reinit(udev);
- ret = hub_port_init(parent_hub, udev, port1, i);
+ usb_disable_endpoint(udev, 0 + USB_DIR_IN);
+ usb_disable_endpoint(udev, 0 + USB_DIR_OUT);
+ ret = hub_port_init(parent, udev, port, i);
if (ret >= 0)
break;
}
- clear_bit(port1, parent_hub->busy_bits);
if (ret < 0)
goto re_enumerate;
ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
USB_REQ_SET_CONFIGURATION, 0,
udev->actconfig->desc.bConfigurationValue, 0,
- NULL, 0, USB_CTRL_SET_TIMEOUT);
+ NULL, 0, HZ * USB_CTRL_SET_TIMEOUT);
if (ret < 0) {
dev_err(&udev->dev,
"can't restore configuration #%d (error=%d)\n",
}
done:
- if (hub)
- hub_post_reset(hub);
+ if (udev_is_a_hub)
+ hub_post_reset(udev);
return 0;
re_enumerate:
- hub_port_logical_disconnect(parent_hub, port1);
+ hub_port_logical_disconnect(parent, port);
return -ENODEV;
}
git://git.onelab.eu / linux-2.6.git / blobdiff