summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-10 15:12:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-07-18 14:50:21 +0200
commit9d5b3cbe511ec68c92b38307603490ef303ec4f8 (patch)
tree1e3e600b570bcf4dc349c22b47bb7a385718c0f2
parent87b9bea20e922a46f661d69f7b5ae900159914f1 (diff)
downloadbarebox-9d5b3cbe511ec68c92b38307603490ef303ec4f8.tar.gz
USB: host: factor out port configuration to separate function
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/usb/core/hub.c125
1 files changed, 74 insertions, 51 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 9c87037..689a79c 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -227,6 +227,65 @@ static void usb_hub_port_connect_change(struct usb_device *dev, int port)
}
}
+static int usb_hub_configure_port(struct usb_device *dev, int port)
+{
+ struct usb_port_status portsts;
+ unsigned short portstatus, portchange;
+
+ if (usb_get_port_status(dev, port + 1, &portsts) < 0) {
+ dev_dbg(&dev->dev, "get_port_status failed\n");
+ return -EIO;
+ }
+
+ portstatus = le16_to_cpu(portsts.wPortStatus);
+ portchange = le16_to_cpu(portsts.wPortChange);
+ dev_dbg(&dev->dev, "Port %d Status %X Change %X\n",
+ port + 1, portstatus, portchange);
+
+ if (portchange & USB_PORT_STAT_C_CONNECTION) {
+ dev_dbg(&dev->dev, "port %d connection change\n", port + 1);
+ usb_hub_port_connect_change(dev, port);
+ }
+ if (portchange & USB_PORT_STAT_C_ENABLE) {
+ dev_dbg(&dev->dev, "port %d enable change, status %x\n",
+ port + 1, portstatus);
+ usb_clear_port_feature(dev, port + 1,
+ USB_PORT_FEAT_C_ENABLE);
+
+ /* EM interference sometimes causes bad shielded USB
+ * devices to be shutdown by the hub, this hack enables
+ * them again. Works at least with mouse driver */
+ if (!(portstatus & USB_PORT_STAT_ENABLE) &&
+ (portstatus & USB_PORT_STAT_CONNECTION) &&
+ ((dev->children[port]))) {
+ dev_dbg(&dev->dev, "already running port %i " \
+ "disabled by hub (EMI?), " \
+ "re-enabling...\n", port + 1);
+ usb_hub_port_connect_change(dev, port);
+ }
+ }
+ if (portstatus & USB_PORT_STAT_SUSPEND) {
+ dev_dbg(&dev->dev, "port %d suspend change\n", port + 1);
+ usb_clear_port_feature(dev, port + 1,
+ USB_PORT_FEAT_SUSPEND);
+ }
+
+ if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
+ dev_dbg(&dev->dev, "port %d over-current change\n", port + 1);
+ usb_clear_port_feature(dev, port + 1,
+ USB_PORT_FEAT_C_OVER_CURRENT);
+ usb_hub_power_on(dev->hub);
+ }
+
+ if (portchange & USB_PORT_STAT_C_RESET) {
+ dev_dbg(&dev->dev, "port %d reset change\n", port + 1);
+ usb_clear_port_feature(dev, port + 1,
+ USB_PORT_FEAT_C_RESET);
+ }
+
+ return 0;
+}
+
static int usb_hub_configure(struct usb_device *dev)
{
unsigned char buffer[USB_BUFSIZ], *bitmap;
@@ -346,61 +405,23 @@ static int usb_hub_configure(struct usb_device *dev)
"" : "no ");
usb_hub_power_on(hub);
- for (i = 0; i < dev->maxchild; i++) {
- struct usb_port_status portsts;
- unsigned short portstatus, portchange;
-
- if (usb_get_port_status(dev, i + 1, &portsts) < 0) {
- dev_dbg(&dev->dev, "get_port_status failed\n");
- continue;
- }
+ for (i = 0; i < dev->maxchild; i++)
+ usb_hub_configure_port(dev, i);
- portstatus = le16_to_cpu(portsts.wPortStatus);
- portchange = le16_to_cpu(portsts.wPortChange);
- dev_dbg(&dev->dev, "Port %d Status %X Change %X\n",
- i + 1, portstatus, portchange);
+ return 0;
+}
- if (portchange & USB_PORT_STAT_C_CONNECTION) {
- dev_dbg(&dev->dev, "port %d connection change\n", i + 1);
- usb_hub_port_connect_change(dev, i);
- }
- if (portchange & USB_PORT_STAT_C_ENABLE) {
- dev_dbg(&dev->dev, "port %d enable change, status %x\n",
- i + 1, portstatus);
- usb_clear_port_feature(dev, i + 1,
- USB_PORT_FEAT_C_ENABLE);
-
- /* EM interference sometimes causes bad shielded USB
- * devices to be shutdown by the hub, this hack enables
- * them again. Works at least with mouse driver */
- if (!(portstatus & USB_PORT_STAT_ENABLE) &&
- (portstatus & USB_PORT_STAT_CONNECTION) &&
- ((dev->children[i]))) {
- dev_dbg(&dev->dev, "already running port %i " \
- "disabled by hub (EMI?), " \
- "re-enabling...\n", i + 1);
- usb_hub_port_connect_change(dev, i);
- }
- }
- if (portstatus & USB_PORT_STAT_SUSPEND) {
- dev_dbg(&dev->dev, "port %d suspend change\n", i + 1);
- usb_clear_port_feature(dev, i + 1,
- USB_PORT_FEAT_SUSPEND);
- }
+static int usb_hub_detect(struct device_d *dev)
+{
+ struct usb_device *usbdev = container_of(dev, struct usb_device, dev);
+ int i;
- if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
- dev_dbg(&dev->dev, "port %d over-current change\n", i + 1);
- usb_clear_port_feature(dev, i + 1,
- USB_PORT_FEAT_C_OVER_CURRENT);
- usb_hub_power_on(hub);
- }
+ usb_hub_configure(usbdev);
- if (portchange & USB_PORT_STAT_C_RESET) {
- dev_dbg(&dev->dev, "port %d reset change\n", i + 1);
- usb_clear_port_feature(dev, i + 1,
- USB_PORT_FEAT_C_RESET);
- }
- } /* end for i all ports */
+ for (i = 0; i < usbdev->maxchild; i++) {
+ if (usbdev->children[i])
+ device_detect(&usbdev->children[i]->dev);
+ }
return 0;
}
@@ -408,6 +429,8 @@ static int usb_hub_configure(struct usb_device *dev)
static int usb_hub_probe(struct usb_device *usbdev,
const struct usb_device_id *id)
{
+ usbdev->dev.detect = usb_hub_detect;
+
return usb_hub_configure(usbdev);
}