USB hub support

diff --git a/bus/usb/usbhub.c b/bus/usb/usbhub.c
index 523abf93e289707af4dcedbdfa6cbbac27e85f5a..034ccbe8d556e456e74d1fabb44d03cd4a8776ef 100644 (file)
--- a/bus/usb/usbhub.c
+++ b/bus/usb/usbhub.c
@@ -75,14 +75,47 @@ grub_usb_add_hub (grub_usb_device_t dev)
   struct grub_usb_usb_hubdesc hubdesc;
   grub_err_t err;
   int i;
-
-  grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
-                             | GRUB_USB_REQTYPE_CLASS
-                             | GRUB_USB_REQTYPE_TARGET_DEV),
-                       GRUB_USB_REQ_GET_DESCRIPTOR,
-                       (GRUB_USB_DESCRIPTOR_HUB << 8) | 0,
-                       0, sizeof (hubdesc), (char *) &hubdesc);
-
+  grub_uint64_t timeout;
+  grub_usb_device_t next_dev;
+  
+  err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
+                                   | GRUB_USB_REQTYPE_CLASS
+                                   | GRUB_USB_REQTYPE_TARGET_DEV),
+                              GRUB_USB_REQ_GET_DESCRIPTOR,
+                             (GRUB_USB_DESCRIPTOR_HUB << 8) | 0,
+                             0, sizeof (hubdesc), (char *) &hubdesc);
+  if (err)
+    return err;
+  grub_dprintf ("usb", "Hub descriptor:\n\t\t len:%d, typ:0x%02x, cnt:%d, char:0x%02x, pwg:%d, curr:%d\n",
+                hubdesc.length, hubdesc.type, hubdesc.portcnt,
+                hubdesc.characteristics, hubdesc.pwdgood,
+                hubdesc.current);
+
+  /* Activate the first configuration. Hubs should have only one conf. */
+  grub_dprintf ("usb", "Hub set configuration\n");
+  grub_usb_set_configuration (dev, 1);
+
+  /* Power on all Hub ports.  */
+  for (i = 1; i <= hubdesc.portcnt; i++)
+    {
+      grub_dprintf ("usb", "Power on - port %d\n", i);
+      /* Power on the port and wait for possible device connect */
+      err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
+                                       | GRUB_USB_REQTYPE_CLASS
+                                       | GRUB_USB_REQTYPE_TARGET_OTHER),
+                                 GRUB_USB_REQ_SET_FEATURE,
+                                 GRUB_USB_HUB_FEATURE_PORT_POWER,
+                                 i, 0, NULL);
+      /* Just ignore the device if some error happened */
+      if (err)
+       continue;
+    }
+  /* Wait for port power-on */
+  if (hubdesc.pwdgood >= 50)
+    grub_millisleep (hubdesc.pwdgood * 2);
+  else
+    grub_millisleep (100);
+    
   /* Iterate over the Hub ports.  */
   for (i = 1; i <= hubdesc.portcnt; i++)
     {
@@ -92,14 +125,14 @@ grub_usb_add_hub (grub_usb_device_t dev)
       err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
                                        | GRUB_USB_REQTYPE_CLASS
                                        | GRUB_USB_REQTYPE_TARGET_OTHER),
-                                 GRUB_USB_REQ_HUB_GET_PORT_STATUS,
+                                 GRUB_USB_REQ_GET_STATUS,
                                  0, i, sizeof (status), (char *) &status);
-
       /* Just ignore the device if the Hub does not report the
         status.  */
       if (err)
        continue;
-
+      grub_dprintf ("usb", "Hub port %d status: 0x%02x\n", i, status);
+           
       /* If connected, reset and enable the port.  */
       if (status & GRUB_USB_HUB_STATUS_CONNECTED)
        {
@@ -116,21 +149,46 @@ grub_usb_add_hub (grub_usb_device_t dev)
                speed = GRUB_USB_SPEED_FULL;
            }
 
-         /* A device is actually connected to this port, not enable
-            the port.  XXX: Why 0x03?  According to some docs it
-            should be 0x0.  Check the specification!  */
+         /* A device is actually connected to this port.
+          * Now do reset of port. */
+          grub_dprintf ("usb", "Reset hub port - port %d\n", i);
          err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
                                            | GRUB_USB_REQTYPE_CLASS
                                            | GRUB_USB_REQTYPE_TARGET_OTHER),
-                                     0x3, 0x4, i, 0, 0);
-
+                                     GRUB_USB_REQ_SET_FEATURE,
+                                     GRUB_USB_HUB_FEATURE_PORT_RESET,
+                                     i, 0, 0);
          /* If the Hub does not cooperate for this port, just skip
             the port.  */
          if (err)
            continue;
 
+          /* Wait for reset procedure done */
+          timeout = grub_get_time_ms () + 1000;
+          do
+            {
+              /* Get the port status.  */
+              err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
+                                               | GRUB_USB_REQTYPE_CLASS
+                                               | GRUB_USB_REQTYPE_TARGET_OTHER),
+                                         GRUB_USB_REQ_GET_STATUS,
+                                         0, i, sizeof (status), (char *) &status);
+            }
+          while (!err &&
+                 !(status & GRUB_USB_HUB_STATUS_C_PORT_RESET) &&
+                 (grub_get_time_ms() < timeout) );
+          if (err || !(status & GRUB_USB_HUB_STATUS_C_PORT_RESET) )
+            continue;
+   
          /* Add the device and assign a device address to it.  */
-         grub_usb_hub_add_dev (&dev->controller, speed);
+          grub_dprintf ("usb", "Call hub_add_dev - port %d\n", i);
+         next_dev = grub_usb_hub_add_dev (&dev->controller, speed);
+          if (! next_dev)
+            continue;
+
+          /* If the device is a Hub, scan it for more devices.  */
+          if (next_dev->descdev.class == 0x09)
+            grub_usb_add_hub (next_dev);
        }
     }
 

diff --git a/include/grub/usbtrans.h b/include/grub/usbtrans.h
index 40fc0dd5f3a51859b7cd58d6b077c4d5c7717e57..8f49c246f77ae67069a273ae5292d62426593b41 100644 (file)
--- a/include/grub/usbtrans.h
+++ b/include/grub/usbtrans.h
@@ -87,15 +87,17 @@ typedef struct grub_usb_transfer *grub_usb_transfer_t;
 #define GRUB_USB_REQ_SET_INTERFACE     0x0B
 #define GRUB_USB_REQ_SYNC_FRAME                0x0C
 
-#define GRUB_USB_REQ_HUB_GET_PORT_STATUS 0x00
-
 #define GRUB_USB_FEATURE_ENDP_HALT     0x00
 #define GRUB_USB_FEATURE_DEV_REMOTE_WU 0x01
 #define GRUB_USB_FEATURE_TEST_MODE     0x02
 
-#define GRUB_USB_HUB_STATUS_CONNECTED  (1 << 0)
-#define GRUB_USB_HUB_STATUS_LOWSPEED   (1 << 9)
-#define GRUB_USB_HUB_STATUS_HIGHSPEED  (1 << 10)
+#define GRUB_USB_HUB_FEATURE_PORT_RESET   0x04
+#define GRUB_USB_HUB_FEATURE_PORT_POWER   0x08
+
+#define GRUB_USB_HUB_STATUS_CONNECTED   (1 << 0)
+#define GRUB_USB_HUB_STATUS_LOWSPEED    (1 << 9)
+#define GRUB_USB_HUB_STATUS_HIGHSPEED   (1 << 10)
+#define GRUB_USB_HUB_STATUS_C_PORT_RESET (1 << 20)
 
 struct grub_usb_packet_setup
 {