]> git.sur5r.net Git - u-boot/commitdiff
USB: Separate out USB hub driver
authorMarek Vasut <marek.vasut@gmail.com>
Mon, 13 Feb 2012 18:58:17 +0000 (18:58 +0000)
committerWolfgang Denk <wd@denx.de>
Sat, 3 Mar 2012 15:55:24 +0000 (16:55 +0100)
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Remy Bohmer <linux@bohmer.net>
Acked-by: Mike Frysinger <vapier@gentoo.org>
common/Makefile
common/usb.c
common/usb_hub.c [new file with mode: 0644]
include/usb.h

index 2d9ae8c5c92319f666edd859b28903b179e54eec..2a31c6285b5e948156d63ab8efc1d3139c71b22d 100644 (file)
@@ -157,7 +157,7 @@ COBJS-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o
 COBJS-$(CONFIG_CMD_UNZIP) += cmd_unzip.o
 ifdef CONFIG_CMD_USB
 COBJS-y += cmd_usb.o
-COBJS-y += usb.o
+COBJS-y += usb.o usb_hub.o
 COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o
 endif
 COBJS-$(CONFIG_CMD_XIMG) += cmd_ximg.o
index de312124bce84cabfde7d0eb860db46b8f4b4ca9..81dcbe28113ae8e09f2320cdacec3402739b6862 100644 (file)
@@ -82,11 +82,6 @@ char usb_started; /* flag for the started/stopped USB status */
  */
 static void usb_scan_devices(void);
 
-static int usb_hub_probe(struct usb_device *dev, int ifnum);
-static void usb_hub_reset(void);
-static int hub_port_reset(struct usb_device *dev, int port,
-                         unsigned short *portstat);
-
 /***********************************************************************
  * wait_ms
  */
@@ -765,7 +760,7 @@ struct usb_device *usb_get_dev_index(int index)
 /* returns a pointer of a new device structure or NULL, if
  * no device struct is available
  */
-static struct usb_device *usb_alloc_new_device(void)
+struct usb_device *usb_alloc_new_device(void)
 {
        int i;
        USB_PRINTF("New Device %d\n", dev_index);
@@ -791,7 +786,7 @@ static struct usb_device *usb_alloc_new_device(void)
  *
  * Returns 0 for success, != 0 for error.
  */
-static int usb_new_device(struct usb_device *dev)
+int usb_new_device(struct usb_device *dev)
 {
        int addr, err;
        int tmp;
@@ -979,427 +974,4 @@ static void usb_scan_devices(void)
        USB_PRINTF("scan end\n");
 }
 
-
-/****************************************************************************
- * HUB "Driver"
- * Probes device for being a hub and configurate it
- */
-
-static struct usb_hub_device hub_dev[USB_MAX_HUB];
-static int usb_hub_index;
-
-
-static int usb_get_hub_descriptor(struct usb_device *dev, void *data, int size)
-{
-       return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
-               USB_REQ_GET_DESCRIPTOR, USB_DIR_IN | USB_RT_HUB,
-               USB_DT_HUB << 8, 0, data, size, USB_CNTL_TIMEOUT);
-}
-
-static int usb_clear_hub_feature(struct usb_device *dev, int feature)
-{
-       return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-                               USB_REQ_CLEAR_FEATURE, USB_RT_HUB, feature,
-                               0, NULL, 0, USB_CNTL_TIMEOUT);
-}
-
-static int usb_clear_port_feature(struct usb_device *dev, int port, int feature)
-{
-       return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-                               USB_REQ_CLEAR_FEATURE, USB_RT_PORT, feature,
-                               port, NULL, 0, USB_CNTL_TIMEOUT);
-}
-
-static int usb_set_port_feature(struct usb_device *dev, int port, int feature)
-{
-       return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-                               USB_REQ_SET_FEATURE, USB_RT_PORT, feature,
-                               port, NULL, 0, USB_CNTL_TIMEOUT);
-}
-
-static int usb_get_hub_status(struct usb_device *dev, void *data)
-{
-       return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
-                       USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_HUB, 0, 0,
-                       data, sizeof(struct usb_hub_status), USB_CNTL_TIMEOUT);
-}
-
-static int usb_get_port_status(struct usb_device *dev, int port, void *data)
-{
-       return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
-                       USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, port,
-                       data, sizeof(struct usb_hub_status), USB_CNTL_TIMEOUT);
-}
-
-
-static void usb_hub_power_on(struct usb_hub_device *hub)
-{
-       int i;
-       struct usb_device *dev;
-
-       dev = hub->pusb_dev;
-       /* Enable power to the ports */
-       USB_HUB_PRINTF("enabling power on all ports\n");
-       for (i = 0; i < dev->maxchild; i++) {
-               usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
-               USB_HUB_PRINTF("port %d returns %lX\n", i + 1, dev->status);
-               wait_ms(hub->desc.bPwrOn2PwrGood * 2);
-       }
-}
-
-static void usb_hub_reset(void)
-{
-       usb_hub_index = 0;
-}
-
-static struct usb_hub_device *usb_hub_allocate(void)
-{
-       if (usb_hub_index < USB_MAX_HUB)
-               return &hub_dev[usb_hub_index++];
-
-       printf("ERROR: USB_MAX_HUB (%d) reached\n", USB_MAX_HUB);
-       return NULL;
-}
-
-#define MAX_TRIES 5
-
-static inline char *portspeed(int portstatus)
-{
-       if (portstatus & (1 << USB_PORT_FEAT_HIGHSPEED))
-               return "480 Mb/s";
-       else if (portstatus & (1 << USB_PORT_FEAT_LOWSPEED))
-               return "1.5 Mb/s";
-       else
-               return "12 Mb/s";
-}
-
-static int hub_port_reset(struct usb_device *dev, int port,
-                       unsigned short *portstat)
-{
-       int tries;
-       struct usb_port_status portsts;
-       unsigned short portstatus, portchange;
-
-       USB_HUB_PRINTF("hub_port_reset: resetting port %d...\n", port);
-       for (tries = 0; tries < MAX_TRIES; tries++) {
-
-               usb_set_port_feature(dev, port + 1, USB_PORT_FEAT_RESET);
-               wait_ms(200);
-
-               if (usb_get_port_status(dev, port + 1, &portsts) < 0) {
-                       USB_HUB_PRINTF("get_port_status failed status %lX\n",
-                                       dev->status);
-                       return -1;
-               }
-               portstatus = le16_to_cpu(portsts.wPortStatus);
-               portchange = le16_to_cpu(portsts.wPortChange);
-
-               USB_HUB_PRINTF("portstatus %x, change %x, %s\n",
-                               portstatus, portchange,
-                               portspeed(portstatus));
-
-               USB_HUB_PRINTF("STAT_C_CONNECTION = %d STAT_CONNECTION = %d" \
-                              "  USB_PORT_STAT_ENABLE %d\n",
-                       (portchange & USB_PORT_STAT_C_CONNECTION) ? 1 : 0,
-                       (portstatus & USB_PORT_STAT_CONNECTION) ? 1 : 0,
-                       (portstatus & USB_PORT_STAT_ENABLE) ? 1 : 0);
-
-               if ((portchange & USB_PORT_STAT_C_CONNECTION) ||
-                   !(portstatus & USB_PORT_STAT_CONNECTION))
-                       return -1;
-
-               if (portstatus & USB_PORT_STAT_ENABLE)
-                       break;
-
-               wait_ms(200);
-       }
-
-       if (tries == MAX_TRIES) {
-               USB_HUB_PRINTF("Cannot enable port %i after %i retries, " \
-                               "disabling port.\n", port + 1, MAX_TRIES);
-               USB_HUB_PRINTF("Maybe the USB cable is bad?\n");
-               return -1;
-       }
-
-       usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_C_RESET);
-       *portstat = portstatus;
-       return 0;
-}
-
-
-void usb_hub_port_connect_change(struct usb_device *dev, int port)
-{
-       struct usb_device *usb;
-       struct usb_port_status portsts;
-       unsigned short portstatus;
-
-       /* Check status */
-       if (usb_get_port_status(dev, port + 1, &portsts) < 0) {
-               USB_HUB_PRINTF("get_port_status failed\n");
-               return;
-       }
-
-       portstatus = le16_to_cpu(portsts.wPortStatus);
-       USB_HUB_PRINTF("portstatus %x, change %x, %s\n",
-                       portstatus,
-                       le16_to_cpu(portsts.wPortChange),
-                       portspeed(portstatus));
-
-       /* Clear the connection change status */
-       usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_C_CONNECTION);
-
-       /* Disconnect any existing devices under this port */
-       if (((!(portstatus & USB_PORT_STAT_CONNECTION)) &&
-            (!(portstatus & USB_PORT_STAT_ENABLE))) || (dev->children[port])) {
-               USB_HUB_PRINTF("usb_disconnect(&hub->children[port]);\n");
-               /* Return now if nothing is connected */
-               if (!(portstatus & USB_PORT_STAT_CONNECTION))
-                       return;
-       }
-       wait_ms(200);
-
-       /* Reset the port */
-       if (hub_port_reset(dev, port, &portstatus) < 0) {
-               printf("cannot reset port %i!?\n", port + 1);
-               return;
-       }
-
-       wait_ms(200);
-
-       /* Allocate a new device struct for it */
-       usb = usb_alloc_new_device();
-
-       if (portstatus & USB_PORT_STAT_HIGH_SPEED)
-               usb->speed = USB_SPEED_HIGH;
-       else if (portstatus & USB_PORT_STAT_LOW_SPEED)
-               usb->speed = USB_SPEED_LOW;
-       else
-               usb->speed = USB_SPEED_FULL;
-
-       dev->children[port] = usb;
-       usb->parent = dev;
-       usb->portnr = port + 1;
-       /* Run it through the hoops (find a driver, etc) */
-       if (usb_new_device(usb)) {
-               /* Woops, disable the port */
-               USB_HUB_PRINTF("hub: disabling port %d\n", port + 1);
-               usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_ENABLE);
-       }
-}
-
-
-static int usb_hub_configure(struct usb_device *dev)
-{
-       int i;
-       unsigned char buffer[USB_BUFSIZ], *bitmap;
-       struct usb_hub_descriptor *descriptor;
-       struct usb_hub_device *hub;
-#ifdef USB_HUB_DEBUG
-       struct usb_hub_status *hubsts;
-#endif
-
-       /* "allocate" Hub device */
-       hub = usb_hub_allocate();
-       if (hub == NULL)
-               return -1;
-       hub->pusb_dev = dev;
-       /* Get the the hub descriptor */
-       if (usb_get_hub_descriptor(dev, buffer, 4) < 0) {
-               USB_HUB_PRINTF("usb_hub_configure: failed to get hub " \
-                                  "descriptor, giving up %lX\n", dev->status);
-               return -1;
-       }
-       descriptor = (struct usb_hub_descriptor *)buffer;
-
-       /* silence compiler warning if USB_BUFSIZ is > 256 [= sizeof(char)] */
-       i = descriptor->bLength;
-       if (i > USB_BUFSIZ) {
-               USB_HUB_PRINTF("usb_hub_configure: failed to get hub " \
-                               "descriptor - too long: %d\n",
-                               descriptor->bLength);
-               return -1;
-       }
-
-       if (usb_get_hub_descriptor(dev, buffer, descriptor->bLength) < 0) {
-               USB_HUB_PRINTF("usb_hub_configure: failed to get hub " \
-                               "descriptor 2nd giving up %lX\n", dev->status);
-               return -1;
-       }
-       memcpy((unsigned char *)&hub->desc, buffer, descriptor->bLength);
-       /* adjust 16bit values */
-       hub->desc.wHubCharacteristics =
-                               le16_to_cpu(descriptor->wHubCharacteristics);
-       /* set the bitmap */
-       bitmap = (unsigned char *)&hub->desc.DeviceRemovable[0];
-       /* devices not removable by default */
-       memset(bitmap, 0xff, (USB_MAXCHILDREN+1+7)/8);
-       bitmap = (unsigned char *)&hub->desc.PortPowerCtrlMask[0];
-       memset(bitmap, 0xff, (USB_MAXCHILDREN+1+7)/8); /* PowerMask = 1B */
-
-       for (i = 0; i < ((hub->desc.bNbrPorts + 1 + 7)/8); i++)
-               hub->desc.DeviceRemovable[i] = descriptor->DeviceRemovable[i];
-
-       for (i = 0; i < ((hub->desc.bNbrPorts + 1 + 7)/8); i++)
-               hub->desc.PortPowerCtrlMask[i] = descriptor->PortPowerCtrlMask[i];
-
-       dev->maxchild = descriptor->bNbrPorts;
-       USB_HUB_PRINTF("%d ports detected\n", dev->maxchild);
-
-       switch (hub->desc.wHubCharacteristics & HUB_CHAR_LPSM) {
-       case 0x00:
-               USB_HUB_PRINTF("ganged power switching\n");
-               break;
-       case 0x01:
-               USB_HUB_PRINTF("individual port power switching\n");
-               break;
-       case 0x02:
-       case 0x03:
-               USB_HUB_PRINTF("unknown reserved power switching mode\n");
-               break;
-       }
-
-       if (hub->desc.wHubCharacteristics & HUB_CHAR_COMPOUND)
-               USB_HUB_PRINTF("part of a compound device\n");
-       else
-               USB_HUB_PRINTF("standalone hub\n");
-
-       switch (hub->desc.wHubCharacteristics & HUB_CHAR_OCPM) {
-       case 0x00:
-               USB_HUB_PRINTF("global over-current protection\n");
-               break;
-       case 0x08:
-               USB_HUB_PRINTF("individual port over-current protection\n");
-               break;
-       case 0x10:
-       case 0x18:
-               USB_HUB_PRINTF("no over-current protection\n");
-               break;
-       }
-
-       USB_HUB_PRINTF("power on to power good time: %dms\n",
-                       descriptor->bPwrOn2PwrGood * 2);
-       USB_HUB_PRINTF("hub controller current requirement: %dmA\n",
-                       descriptor->bHubContrCurrent);
-
-       for (i = 0; i < dev->maxchild; i++)
-               USB_HUB_PRINTF("port %d is%s removable\n", i + 1,
-                       hub->desc.DeviceRemovable[(i + 1) / 8] & \
-                                          (1 << ((i + 1) % 8)) ? " not" : "");
-
-       if (sizeof(struct usb_hub_status) > USB_BUFSIZ) {
-               USB_HUB_PRINTF("usb_hub_configure: failed to get Status - " \
-                               "too long: %d\n", descriptor->bLength);
-               return -1;
-       }
-
-       if (usb_get_hub_status(dev, buffer) < 0) {
-               USB_HUB_PRINTF("usb_hub_configure: failed to get Status %lX\n",
-                               dev->status);
-               return -1;
-       }
-
-#ifdef USB_HUB_DEBUG
-       hubsts = (struct usb_hub_status *)buffer;
-#endif
-       USB_HUB_PRINTF("get_hub_status returned status %X, change %X\n",
-                       le16_to_cpu(hubsts->wHubStatus),
-                       le16_to_cpu(hubsts->wHubChange));
-       USB_HUB_PRINTF("local power source is %s\n",
-               (le16_to_cpu(hubsts->wHubStatus) & HUB_STATUS_LOCAL_POWER) ? \
-               "lost (inactive)" : "good");
-       USB_HUB_PRINTF("%sover-current condition exists\n",
-               (le16_to_cpu(hubsts->wHubStatus) & HUB_STATUS_OVERCURRENT) ? \
-               "" : "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) {
-                       USB_HUB_PRINTF("get_port_status failed\n");
-                       continue;
-               }
-
-               portstatus = le16_to_cpu(portsts.wPortStatus);
-               portchange = le16_to_cpu(portsts.wPortChange);
-               USB_HUB_PRINTF("Port %d Status %X Change %X\n",
-                               i + 1, portstatus, portchange);
-
-               if (portchange & USB_PORT_STAT_C_CONNECTION) {
-                       USB_HUB_PRINTF("port %d connection change\n", i + 1);
-                       usb_hub_port_connect_change(dev, i);
-               }
-               if (portchange & USB_PORT_STAT_C_ENABLE) {
-                       USB_HUB_PRINTF("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]))) {
-                               USB_HUB_PRINTF("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) {
-                       USB_HUB_PRINTF("port %d suspend change\n", i + 1);
-                       usb_clear_port_feature(dev, i + 1,
-                                               USB_PORT_FEAT_SUSPEND);
-               }
-
-               if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
-                       USB_HUB_PRINTF("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);
-               }
-
-               if (portchange & USB_PORT_STAT_C_RESET) {
-                       USB_HUB_PRINTF("port %d reset change\n", i + 1);
-                       usb_clear_port_feature(dev, i + 1,
-                                               USB_PORT_FEAT_C_RESET);
-               }
-       } /* end for i all ports */
-
-       return 0;
-}
-
-static int usb_hub_probe(struct usb_device *dev, int ifnum)
-{
-       struct usb_interface *iface;
-       struct usb_endpoint_descriptor *ep;
-       int ret;
-
-       iface = &dev->config.if_desc[ifnum];
-       /* Is it a hub? */
-       if (iface->desc.bInterfaceClass != USB_CLASS_HUB)
-               return 0;
-       /* Some hubs have a subclass of 1, which AFAICT according to the */
-       /*  specs is not defined, but it works */
-       if ((iface->desc.bInterfaceSubClass != 0) &&
-           (iface->desc.bInterfaceSubClass != 1))
-               return 0;
-       /* Multiple endpoints? What kind of mutant ninja-hub is this? */
-       if (iface->desc.bNumEndpoints != 1)
-               return 0;
-       ep = &iface->ep_desc[0];
-       /* Output endpoint? Curiousier and curiousier.. */
-       if (!(ep->bEndpointAddress & USB_DIR_IN))
-               return 0;
-       /* If it's not an interrupt endpoint, we'd better punt! */
-       if ((ep->bmAttributes & 3) != 3)
-               return 0;
-       /* We found a hub */
-       USB_HUB_PRINTF("USB hub found\n");
-       ret = usb_hub_configure(dev);
-       return ret;
-}
-
 /* EOF */
diff --git a/common/usb_hub.c b/common/usb_hub.c
new file mode 100644 (file)
index 0000000..576e0e6
--- /dev/null
@@ -0,0 +1,476 @@
+/*
+ *
+ * Most of this source has been derived from the Linux USB
+ * project:
+ * (C) Copyright Linus Torvalds 1999
+ * (C) Copyright Johannes Erdfelt 1999-2001
+ * (C) Copyright Andreas Gal 1999
+ * (C) Copyright Gregory P. Smith 1999
+ * (C) Copyright Deti Fliegl 1999 (new USB architecture)
+ * (C) Copyright Randy Dunlap 2000
+ * (C) Copyright David Brownell 2000 (kernel hotplug, usb_device_id)
+ * (C) Copyright Yggdrasil Computing, Inc. 2000
+ *     (usb_device_id matching changes by Adam J. Richter)
+ *
+ * Adapted for U-Boot:
+ * (C) Copyright 2001 Denis Peter, MPL AG Switzerland
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+
+/****************************************************************************
+ * HUB "Driver"
+ * Probes device for being a hub and configurate it
+ */
+
+#include <common.h>
+#include <command.h>
+#include <asm/processor.h>
+#include <linux/ctype.h>
+#include <asm/byteorder.h>
+#include <asm/unaligned.h>
+
+#include <usb.h>
+#ifdef CONFIG_4xx
+#include <asm/4xx_pci.h>
+#endif
+
+#ifdef DEBUG
+#define USB_DEBUG      1
+#define USB_HUB_DEBUG  1
+#else
+#define USB_DEBUG      0
+#define USB_HUB_DEBUG  0
+#endif
+
+#define USB_PRINTF(fmt, args...)       debug_cond(USB_DEBUG, fmt, ##args)
+#define USB_HUB_PRINTF(fmt, args...)   debug_cond(USB_HUB_DEBUG, fmt, ##args)
+
+#define USB_BUFSIZ     512
+
+static struct usb_hub_device hub_dev[USB_MAX_HUB];
+static int usb_hub_index;
+
+
+static int usb_get_hub_descriptor(struct usb_device *dev, void *data, int size)
+{
+       return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+               USB_REQ_GET_DESCRIPTOR, USB_DIR_IN | USB_RT_HUB,
+               USB_DT_HUB << 8, 0, data, size, USB_CNTL_TIMEOUT);
+}
+
+static int usb_clear_port_feature(struct usb_device *dev, int port, int feature)
+{
+       return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+                               USB_REQ_CLEAR_FEATURE, USB_RT_PORT, feature,
+                               port, NULL, 0, USB_CNTL_TIMEOUT);
+}
+
+static int usb_set_port_feature(struct usb_device *dev, int port, int feature)
+{
+       return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+                               USB_REQ_SET_FEATURE, USB_RT_PORT, feature,
+                               port, NULL, 0, USB_CNTL_TIMEOUT);
+}
+
+static int usb_get_hub_status(struct usb_device *dev, void *data)
+{
+       return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+                       USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_HUB, 0, 0,
+                       data, sizeof(struct usb_hub_status), USB_CNTL_TIMEOUT);
+}
+
+static int usb_get_port_status(struct usb_device *dev, int port, void *data)
+{
+       return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+                       USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, port,
+                       data, sizeof(struct usb_hub_status), USB_CNTL_TIMEOUT);
+}
+
+
+static void usb_hub_power_on(struct usb_hub_device *hub)
+{
+       int i;
+       struct usb_device *dev;
+
+       dev = hub->pusb_dev;
+       /* Enable power to the ports */
+       USB_HUB_PRINTF("enabling power on all ports\n");
+       for (i = 0; i < dev->maxchild; i++) {
+               usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
+               USB_HUB_PRINTF("port %d returns %lX\n", i + 1, dev->status);
+               wait_ms(hub->desc.bPwrOn2PwrGood * 2);
+       }
+}
+
+void usb_hub_reset(void)
+{
+       usb_hub_index = 0;
+}
+
+static struct usb_hub_device *usb_hub_allocate(void)
+{
+       if (usb_hub_index < USB_MAX_HUB)
+               return &hub_dev[usb_hub_index++];
+
+       printf("ERROR: USB_MAX_HUB (%d) reached\n", USB_MAX_HUB);
+       return NULL;
+}
+
+#define MAX_TRIES 5
+
+static inline char *portspeed(int portstatus)
+{
+       if (portstatus & (1 << USB_PORT_FEAT_HIGHSPEED))
+               return "480 Mb/s";
+       else if (portstatus & (1 << USB_PORT_FEAT_LOWSPEED))
+               return "1.5 Mb/s";
+       else
+               return "12 Mb/s";
+}
+
+int hub_port_reset(struct usb_device *dev, int port,
+                       unsigned short *portstat)
+{
+       int tries;
+       struct usb_port_status portsts;
+       unsigned short portstatus, portchange;
+
+       USB_HUB_PRINTF("hub_port_reset: resetting port %d...\n", port);
+       for (tries = 0; tries < MAX_TRIES; tries++) {
+
+               usb_set_port_feature(dev, port + 1, USB_PORT_FEAT_RESET);
+               wait_ms(200);
+
+               if (usb_get_port_status(dev, port + 1, &portsts) < 0) {
+                       USB_HUB_PRINTF("get_port_status failed status %lX\n",
+                                       dev->status);
+                       return -1;
+               }
+               portstatus = le16_to_cpu(portsts.wPortStatus);
+               portchange = le16_to_cpu(portsts.wPortChange);
+
+               USB_HUB_PRINTF("portstatus %x, change %x, %s\n",
+                               portstatus, portchange,
+                               portspeed(portstatus));
+
+               USB_HUB_PRINTF("STAT_C_CONNECTION = %d STAT_CONNECTION = %d" \
+                              "  USB_PORT_STAT_ENABLE %d\n",
+                       (portchange & USB_PORT_STAT_C_CONNECTION) ? 1 : 0,
+                       (portstatus & USB_PORT_STAT_CONNECTION) ? 1 : 0,
+                       (portstatus & USB_PORT_STAT_ENABLE) ? 1 : 0);
+
+               if ((portchange & USB_PORT_STAT_C_CONNECTION) ||
+                   !(portstatus & USB_PORT_STAT_CONNECTION))
+                       return -1;
+
+               if (portstatus & USB_PORT_STAT_ENABLE)
+                       break;
+
+               wait_ms(200);
+       }
+
+       if (tries == MAX_TRIES) {
+               USB_HUB_PRINTF("Cannot enable port %i after %i retries, " \
+                               "disabling port.\n", port + 1, MAX_TRIES);
+               USB_HUB_PRINTF("Maybe the USB cable is bad?\n");
+               return -1;
+       }
+
+       usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_C_RESET);
+       *portstat = portstatus;
+       return 0;
+}
+
+
+void usb_hub_port_connect_change(struct usb_device *dev, int port)
+{
+       struct usb_device *usb;
+       struct usb_port_status portsts;
+       unsigned short portstatus;
+
+       /* Check status */
+       if (usb_get_port_status(dev, port + 1, &portsts) < 0) {
+               USB_HUB_PRINTF("get_port_status failed\n");
+               return;
+       }
+
+       portstatus = le16_to_cpu(portsts.wPortStatus);
+       USB_HUB_PRINTF("portstatus %x, change %x, %s\n",
+                       portstatus,
+                       le16_to_cpu(portsts.wPortChange),
+                       portspeed(portstatus));
+
+       /* Clear the connection change status */
+       usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_C_CONNECTION);
+
+       /* Disconnect any existing devices under this port */
+       if (((!(portstatus & USB_PORT_STAT_CONNECTION)) &&
+            (!(portstatus & USB_PORT_STAT_ENABLE))) || (dev->children[port])) {
+               USB_HUB_PRINTF("usb_disconnect(&hub->children[port]);\n");
+               /* Return now if nothing is connected */
+               if (!(portstatus & USB_PORT_STAT_CONNECTION))
+                       return;
+       }
+       wait_ms(200);
+
+       /* Reset the port */
+       if (hub_port_reset(dev, port, &portstatus) < 0) {
+               printf("cannot reset port %i!?\n", port + 1);
+               return;
+       }
+
+       wait_ms(200);
+
+       /* Allocate a new device struct for it */
+       usb = usb_alloc_new_device();
+
+       if (portstatus & USB_PORT_STAT_HIGH_SPEED)
+               usb->speed = USB_SPEED_HIGH;
+       else if (portstatus & USB_PORT_STAT_LOW_SPEED)
+               usb->speed = USB_SPEED_LOW;
+       else
+               usb->speed = USB_SPEED_FULL;
+
+       dev->children[port] = usb;
+       usb->parent = dev;
+       usb->portnr = port + 1;
+       /* Run it through the hoops (find a driver, etc) */
+       if (usb_new_device(usb)) {
+               /* Woops, disable the port */
+               USB_HUB_PRINTF("hub: disabling port %d\n", port + 1);
+               usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_ENABLE);
+       }
+}
+
+
+static int usb_hub_configure(struct usb_device *dev)
+{
+       int i;
+       unsigned char buffer[USB_BUFSIZ], *bitmap;
+       struct usb_hub_descriptor *descriptor;
+       struct usb_hub_device *hub;
+#ifdef USB_HUB_DEBUG
+       struct usb_hub_status *hubsts;
+#endif
+
+       /* "allocate" Hub device */
+       hub = usb_hub_allocate();
+       if (hub == NULL)
+               return -1;
+       hub->pusb_dev = dev;
+       /* Get the the hub descriptor */
+       if (usb_get_hub_descriptor(dev, buffer, 4) < 0) {
+               USB_HUB_PRINTF("usb_hub_configure: failed to get hub " \
+                                  "descriptor, giving up %lX\n", dev->status);
+               return -1;
+       }
+       descriptor = (struct usb_hub_descriptor *)buffer;
+
+       /* silence compiler warning if USB_BUFSIZ is > 256 [= sizeof(char)] */
+       i = descriptor->bLength;
+       if (i > USB_BUFSIZ) {
+               USB_HUB_PRINTF("usb_hub_configure: failed to get hub " \
+                               "descriptor - too long: %d\n",
+                               descriptor->bLength);
+               return -1;
+       }
+
+       if (usb_get_hub_descriptor(dev, buffer, descriptor->bLength) < 0) {
+               USB_HUB_PRINTF("usb_hub_configure: failed to get hub " \
+                               "descriptor 2nd giving up %lX\n", dev->status);
+               return -1;
+       }
+       memcpy((unsigned char *)&hub->desc, buffer, descriptor->bLength);
+       /* adjust 16bit values */
+       hub->desc.wHubCharacteristics =
+                               le16_to_cpu(descriptor->wHubCharacteristics);
+       /* set the bitmap */
+       bitmap = (unsigned char *)&hub->desc.DeviceRemovable[0];
+       /* devices not removable by default */
+       memset(bitmap, 0xff, (USB_MAXCHILDREN+1+7)/8);
+       bitmap = (unsigned char *)&hub->desc.PortPowerCtrlMask[0];
+       memset(bitmap, 0xff, (USB_MAXCHILDREN+1+7)/8); /* PowerMask = 1B */
+
+       for (i = 0; i < ((hub->desc.bNbrPorts + 1 + 7)/8); i++)
+               hub->desc.DeviceRemovable[i] = descriptor->DeviceRemovable[i];
+
+       for (i = 0; i < ((hub->desc.bNbrPorts + 1 + 7)/8); i++)
+               hub->desc.PortPowerCtrlMask[i] = descriptor->PortPowerCtrlMask[i];
+
+       dev->maxchild = descriptor->bNbrPorts;
+       USB_HUB_PRINTF("%d ports detected\n", dev->maxchild);
+
+       switch (hub->desc.wHubCharacteristics & HUB_CHAR_LPSM) {
+       case 0x00:
+               USB_HUB_PRINTF("ganged power switching\n");
+               break;
+       case 0x01:
+               USB_HUB_PRINTF("individual port power switching\n");
+               break;
+       case 0x02:
+       case 0x03:
+               USB_HUB_PRINTF("unknown reserved power switching mode\n");
+               break;
+       }
+
+       if (hub->desc.wHubCharacteristics & HUB_CHAR_COMPOUND)
+               USB_HUB_PRINTF("part of a compound device\n");
+       else
+               USB_HUB_PRINTF("standalone hub\n");
+
+       switch (hub->desc.wHubCharacteristics & HUB_CHAR_OCPM) {
+       case 0x00:
+               USB_HUB_PRINTF("global over-current protection\n");
+               break;
+       case 0x08:
+               USB_HUB_PRINTF("individual port over-current protection\n");
+               break;
+       case 0x10:
+       case 0x18:
+               USB_HUB_PRINTF("no over-current protection\n");
+               break;
+       }
+
+       USB_HUB_PRINTF("power on to power good time: %dms\n",
+                       descriptor->bPwrOn2PwrGood * 2);
+       USB_HUB_PRINTF("hub controller current requirement: %dmA\n",
+                       descriptor->bHubContrCurrent);
+
+       for (i = 0; i < dev->maxchild; i++)
+               USB_HUB_PRINTF("port %d is%s removable\n", i + 1,
+                       hub->desc.DeviceRemovable[(i + 1) / 8] & \
+                                          (1 << ((i + 1) % 8)) ? " not" : "");
+
+       if (sizeof(struct usb_hub_status) > USB_BUFSIZ) {
+               USB_HUB_PRINTF("usb_hub_configure: failed to get Status - " \
+                               "too long: %d\n", descriptor->bLength);
+               return -1;
+       }
+
+       if (usb_get_hub_status(dev, buffer) < 0) {
+               USB_HUB_PRINTF("usb_hub_configure: failed to get Status %lX\n",
+                               dev->status);
+               return -1;
+       }
+
+#ifdef USB_HUB_DEBUG
+       hubsts = (struct usb_hub_status *)buffer;
+#endif
+       USB_HUB_PRINTF("get_hub_status returned status %X, change %X\n",
+                       le16_to_cpu(hubsts->wHubStatus),
+                       le16_to_cpu(hubsts->wHubChange));
+       USB_HUB_PRINTF("local power source is %s\n",
+               (le16_to_cpu(hubsts->wHubStatus) & HUB_STATUS_LOCAL_POWER) ? \
+               "lost (inactive)" : "good");
+       USB_HUB_PRINTF("%sover-current condition exists\n",
+               (le16_to_cpu(hubsts->wHubStatus) & HUB_STATUS_OVERCURRENT) ? \
+               "" : "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) {
+                       USB_HUB_PRINTF("get_port_status failed\n");
+                       continue;
+               }
+
+               portstatus = le16_to_cpu(portsts.wPortStatus);
+               portchange = le16_to_cpu(portsts.wPortChange);
+               USB_HUB_PRINTF("Port %d Status %X Change %X\n",
+                               i + 1, portstatus, portchange);
+
+               if (portchange & USB_PORT_STAT_C_CONNECTION) {
+                       USB_HUB_PRINTF("port %d connection change\n", i + 1);
+                       usb_hub_port_connect_change(dev, i);
+               }
+               if (portchange & USB_PORT_STAT_C_ENABLE) {
+                       USB_HUB_PRINTF("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]))) {
+                               USB_HUB_PRINTF("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) {
+                       USB_HUB_PRINTF("port %d suspend change\n", i + 1);
+                       usb_clear_port_feature(dev, i + 1,
+                                               USB_PORT_FEAT_SUSPEND);
+               }
+
+               if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
+                       USB_HUB_PRINTF("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);
+               }
+
+               if (portchange & USB_PORT_STAT_C_RESET) {
+                       USB_HUB_PRINTF("port %d reset change\n", i + 1);
+                       usb_clear_port_feature(dev, i + 1,
+                                               USB_PORT_FEAT_C_RESET);
+               }
+       } /* end for i all ports */
+
+       return 0;
+}
+
+int usb_hub_probe(struct usb_device *dev, int ifnum)
+{
+       struct usb_interface *iface;
+       struct usb_endpoint_descriptor *ep;
+       int ret;
+
+       iface = &dev->config.if_desc[ifnum];
+       /* Is it a hub? */
+       if (iface->desc.bInterfaceClass != USB_CLASS_HUB)
+               return 0;
+       /* Some hubs have a subclass of 1, which AFAICT according to the */
+       /*  specs is not defined, but it works */
+       if ((iface->desc.bInterfaceSubClass != 0) &&
+           (iface->desc.bInterfaceSubClass != 1))
+               return 0;
+       /* Multiple endpoints? What kind of mutant ninja-hub is this? */
+       if (iface->desc.bNumEndpoints != 1)
+               return 0;
+       ep = &iface->ep_desc[0];
+       /* Output endpoint? Curiousier and curiousier.. */
+       if (!(ep->bEndpointAddress & USB_DIR_IN))
+               return 0;
+       /* If it's not an interrupt endpoint, we'd better punt! */
+       if ((ep->bmAttributes & 3) != 3)
+               return 0;
+       /* We found a hub */
+       USB_HUB_PRINTF("USB hub found\n");
+       ret = usb_hub_configure(dev);
+       return ret;
+}
index 06170cdc5a51a45524badfa39c38adb2ab1956d8..9b740507863ffdfdacc6120b2ea9efeb993276e7 100644 (file)
@@ -367,4 +367,12 @@ struct usb_hub_device {
        struct usb_hub_descriptor desc;
 };
 
+int usb_hub_probe(struct usb_device *dev, int ifnum);
+void usb_hub_reset(void);
+int hub_port_reset(struct usb_device *dev, int port,
+                         unsigned short *portstat);
+
+struct usb_device *usb_alloc_new_device(void);
+int usb_new_device(struct usb_device *dev);
+
 #endif /*_USB_H_ */