On 4 May 2015 at 15:35, Simon Glass sjg@chromium.org wrote:
Hi Hans,
On 4 May 2015 at 14:28, Simon Glass sjg@chromium.org wrote:
On 4 May 2015 at 11:19, Hans de Goede hdegoede@redhat.com wrote:
Currently we copy over a number of usb_device values stored in the on stack struct usb_device probed in usb_scan_device() to the final driver-model managed struct usb_device in usb_child_pre_probe() through usb_device_platdata, and then call usb_select_config() to fill in the rest.
There are 3 problems with this approach:
- It does not fill in enough fields before calling usb_select_config(),
specifically it does not fill in ep0's maxpacketsize causing a div by zero exception in the ehci driver.
It unnecessarily redoes a number of usb requests making usb probing slower
Calling usb_select_config() a second time fails on some usb-1 devices
plugged into usb-2 hubs, causing u-boot to not recognize these devices.
This commit fixes these issues by removing the usb_select_config() call from usb_child_pre_probe(), and instead of copying over things field by field through usb_device_platdata, store a pointer to the in stack usb_device (which is still valid when usb_child_pre_probe() gets called) and copy over the entire struct.
Signed-off-by: Hans de Goede hdegoede@redhat.com
Acked-by: Simon Glass sjg@chromium.org
But sadly this fails with sandbox. Please do run the driver model tests.
Output:
02: dm: usb: Copy over usb_device values from usb_scan_device() to final usb_device sandbox: + sandbox +../drivers/usb/emul/usb-emul-uclass.c: In function ‘usb_emul_find’: +../drivers/usb/emul/usb-emul-uclass.c:125:11: error: ‘struct usb_dev_platdata’ has no member named ‘devnum’ + if (udev->devnum == devnum) { + ^ +In file included from ../drivers/usb/emul/usb-emul-uclass.c:8:0: +../drivers/usb/emul/usb-emul-uclass.c:127:25: error: ‘struct usb_dev_platdata’ has no member named ‘devnum’ + dev->name, udev->devnum); + ^ +../include/common.h:109:26: note: in definition of macro ‘debug_cond’ + printf(pr_fmt(fmt), ##args); \ + ^ +../drivers/usb/emul/usb-emul-uclass.c:126:4: note: in expansion of macro ‘debug’ + debug("%s: Found emulator '%s', addr %d\n", __func__, + ^ +../drivers/usb/emul/usb-emul-uclass.c: In function ‘usb_emul_control’: +../drivers/usb/emul/usb-emul-uclass.c:168:8: error: ‘struct usb_dev_platdata’ has no member named ‘devnum’ + plat->devnum = setup->value; + ^ +../drivers/usb/emul/usb-emul-uclass.c: In function ‘usb_emul_reset’: +../drivers/usb/emul/usb-emul-uclass.c:253:6: error: ‘struct usb_dev_platdata’ has no member named ‘devnum’ + plat->devnum = 0; + ^
Regards, Simon