]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
usb: Read device descriptor after device is addressed for xHCI
authorBin Meng <bmeng.cn@gmail.com>
Mon, 18 Sep 2017 13:40:43 +0000 (06:40 -0700)
committerMarek Vasut <marex@denx.de>
Sun, 1 Oct 2017 14:32:53 +0000 (16:32 +0200)
For xHCI it is not possible to read a device descriptor before it
has been assigned an address. That's why usb_setup_descriptor()
was called with 'do_read' being false. But we really need try to
read the device descriptor before starting any real communication
with the default control endpoint.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
common/usb.c

index 88cee810fac1ac88ca7577824fbdf9d07859caca..8d27bc70607560b7c52841f75c3f2fbecf191e94 100644 (file)
@@ -1052,6 +1052,17 @@ static int usb_prepare_device(struct usb_device *dev, int addr, bool do_read,
 
        mdelay(10);     /* Let the SET_ADDRESS settle */
 
+       /*
+        * If we haven't read device descriptor before, read it here
+        * after device is assigned an address. This is only applicable
+        * to xHCI so far.
+        */
+       if (!do_read) {
+               err = usb_setup_descriptor(dev, true);
+               if (err)
+                       return err;
+       }
+
        return 0;
 }