dm: usb: initialize and scan multiple buses simultaneously with uthread
Use the uthread framework to initialize and scan USB buses in parallel
for better performance. The console output is slightly modified with a
final per-bus report of the number of devices found, common to UTHREAD
and !UTHREAD. The USB tests are updated accordingly.
Tested on two platforms:
1. arm64 QEMU on a somewhat contrived example (4 USB buses, each with
one audio device, one keyboard, one mouse and one tablet)
$ make qemu_arm64_defconfig
$ make -j$(nproc) CROSS_COMPILE="ccache aarch64-linux-gnu-"
$ qemu-system-aarch64 -M virt -nographic -cpu max -bios u-boot.bin \
$(for i in {1..4}; do echo -device qemu-xhci,id=xhci$i \
-device\ usb-{audio,kbd,mouse,tablet},bus=xhci$i.0; \
done)
2. i.MX93 EVK (imx93_11x11_evk_defconfig) with two USB hubs, each with
one webcam and one ethernet adapter, resulting in the following device
tree:
USB device tree:
1 Hub (480 Mb/s, 0mA)
| u-boot EHCI Host Controller
|
+-2 Hub (480 Mb/s, 100mA)
| GenesysLogic USB2.1 Hub
|
+-3 Vendor specific (480 Mb/s, 350mA)
| Realtek USB 10/100/1000 LAN 001000001
|
+-4 (480 Mb/s, 500mA)
HD Pro Webcam C920 8F7CD51F
1 Hub (480 Mb/s, 0mA)
| u-boot EHCI Host Controller
|
+-2 Hub (480 Mb/s, 100mA)
| USB 2.0 Hub
|
+-3 Vendor specific (480 Mb/s, 200mA)
| Realtek USB 10/100/1000 LAN 000001
|
+-4 (480 Mb/s, 500mA)
Generic OnLan-CS30 201801010008
Note that i.MX was tested on top of the downstream repository [1] since
USB doesn't work in the upstream master branch.
[1] https://github.com/nxp-imx/uboot-imx/tree/lf-6.6.52-2.2.0
commit 6c4545203d12 ("LF-13928 update key for capsule")
The time spent in usb_init() ("usb start" command) is reported on
the console. Here are the results:
| CONFIG_UTHREAD=n | CONFIG_UTHREAD=y
--------+------------------+-----------------
QEMU | 5628 ms | 2212 ms
i.MX93 | 4591 ms | 2441 ms
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
This commit is contained in:
Jerome Forissier
committed by
Tom Rini
Tom Rini
parent
4634346e3e
commit
1c0f6999b5
@@ -9,6 +9,7 @@
|
||||
#define LOG_CATEGORY UCLASS_USB
|
||||
|
||||
#include <bootdev.h>
|
||||
#include <uthread.h>
|
||||
#include <dm.h>
|
||||
#include <errno.h>
|
||||
#include <log.h>
|
||||
@@ -17,6 +18,7 @@
|
||||
#include <dm/device-internal.h>
|
||||
#include <dm/lists.h>
|
||||
#include <dm/uclass-internal.h>
|
||||
#include <time.h>
|
||||
|
||||
static bool asynch_allowed;
|
||||
|
||||
@@ -172,6 +174,10 @@ int usb_get_max_xfer_size(struct usb_device *udev, size_t *size)
|
||||
return ops->get_max_xfer_size(bus, size);
|
||||
}
|
||||
|
||||
#if CONFIG_IS_ENABLED(UTHREAD)
|
||||
static struct uthread_mutex mutex = UTHREAD_MUTEX_INITIALIZER;
|
||||
#endif
|
||||
|
||||
int usb_stop(void)
|
||||
{
|
||||
struct udevice *bus;
|
||||
@@ -180,10 +186,14 @@ int usb_stop(void)
|
||||
struct usb_uclass_priv *uc_priv;
|
||||
int err = 0, ret;
|
||||
|
||||
uthread_mutex_lock(&mutex);
|
||||
|
||||
/* De-activate any devices that have been activated */
|
||||
ret = uclass_get(UCLASS_USB, &uc);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
uthread_mutex_unlock(&mutex);
|
||||
return ret;
|
||||
}
|
||||
|
||||
uc_priv = uclass_get_priv(uc);
|
||||
|
||||
@@ -218,28 +228,23 @@ int usb_stop(void)
|
||||
uc_priv->companion_device_count = 0;
|
||||
usb_started = 0;
|
||||
|
||||
uthread_mutex_unlock(&mutex);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static void usb_scan_bus(struct udevice *bus, bool recurse)
|
||||
static void _usb_scan_bus(void *arg)
|
||||
{
|
||||
struct udevice *bus = (struct udevice *)arg;
|
||||
struct usb_bus_priv *priv;
|
||||
struct udevice *dev;
|
||||
int ret;
|
||||
|
||||
priv = dev_get_uclass_priv(bus);
|
||||
|
||||
assert(recurse); /* TODO: Support non-recusive */
|
||||
|
||||
printf("scanning bus %s for devices... ", bus->name);
|
||||
debug("\n");
|
||||
ret = usb_scan_device(bus, 0, USB_SPEED_FULL, &dev);
|
||||
if (ret)
|
||||
printf("failed, error %d\n", ret);
|
||||
else if (priv->next_addr == 0)
|
||||
printf("No USB Device found\n");
|
||||
else
|
||||
printf("%d USB Device(s) found\n", priv->next_addr);
|
||||
printf("Scanning bus %s failed, error %d\n", bus->name, ret);
|
||||
}
|
||||
|
||||
static void remove_inactive_children(struct uclass *uc, struct udevice *bus)
|
||||
@@ -287,12 +292,12 @@ static int usb_probe_companion(struct udevice *bus)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void usb_init_bus(struct udevice *bus)
|
||||
static void _usb_init_bus(void *arg)
|
||||
{
|
||||
struct udevice *bus = (struct udevice *)arg;
|
||||
int ret;
|
||||
|
||||
/* init low_level USB */
|
||||
printf("Bus %s: ", bus->name);
|
||||
|
||||
/*
|
||||
* For Sandbox, we need scan the device tree each time when we
|
||||
@@ -307,39 +312,96 @@ static void usb_init_bus(struct udevice *bus)
|
||||
IS_ENABLED(CONFIG_USB_ONBOARD_HUB)) {
|
||||
ret = dm_scan_fdt_dev(bus);
|
||||
if (ret) {
|
||||
printf("USB device scan from fdt failed (%d)", ret);
|
||||
printf("Bus %s: USB device scan from fdt failed (%d)\n",
|
||||
bus->name, ret);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
ret = device_probe(bus);
|
||||
if (ret == -ENODEV) { /* No such device. */
|
||||
puts("Port not available.\n");
|
||||
printf("Bus %s: Port not available.\n", bus->name);
|
||||
return;
|
||||
}
|
||||
|
||||
if (ret) { /* Other error. */
|
||||
printf("probe failed, error %d\n", ret);
|
||||
printf("Bus %s: probe failed, error %d\n", bus->name, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
usb_probe_companion(bus);
|
||||
}
|
||||
|
||||
static int nthr;
|
||||
static int grp_id;
|
||||
|
||||
static void usb_init_bus(struct udevice *bus)
|
||||
{
|
||||
if (!grp_id)
|
||||
grp_id = uthread_grp_new_id();
|
||||
if (!uthread_create(NULL, _usb_init_bus, (void *)bus, 0, grp_id))
|
||||
nthr++;
|
||||
}
|
||||
|
||||
static void usb_scan_bus(struct udevice *bus, bool recurse)
|
||||
{
|
||||
if (!grp_id)
|
||||
grp_id = uthread_grp_new_id();
|
||||
if (!uthread_create(NULL, _usb_scan_bus, (void *)bus, 0, grp_id))
|
||||
nthr++;
|
||||
}
|
||||
|
||||
static void usb_report_devices(struct uclass *uc)
|
||||
{
|
||||
struct usb_bus_priv *priv;
|
||||
struct udevice *bus;
|
||||
|
||||
uclass_foreach_dev(bus, uc) {
|
||||
if (!device_active(bus))
|
||||
continue;
|
||||
priv = dev_get_uclass_priv(bus);
|
||||
printf("Bus %s: ", bus->name);
|
||||
if (priv->next_addr == 0)
|
||||
printf("No USB Device found\n");
|
||||
else
|
||||
printf("%d USB Device(s) found\n", priv->next_addr);
|
||||
}
|
||||
}
|
||||
|
||||
static void run_threads(void)
|
||||
{
|
||||
#if CONFIG_IS_ENABLED(UTHREAD)
|
||||
if (!nthr)
|
||||
return;
|
||||
while (!uthread_grp_done(grp_id))
|
||||
uthread_schedule();
|
||||
nthr = 0;
|
||||
grp_id = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
int usb_init(void)
|
||||
{
|
||||
int controllers_initialized = 0;
|
||||
unsigned long t0 = timer_get_us();
|
||||
struct usb_uclass_priv *uc_priv;
|
||||
struct usb_bus_priv *priv;
|
||||
struct udevice *bus;
|
||||
struct uclass *uc;
|
||||
int ret;
|
||||
|
||||
uthread_mutex_lock(&mutex);
|
||||
|
||||
if (usb_started) {
|
||||
ret = 0;
|
||||
goto out;
|
||||
}
|
||||
|
||||
asynch_allowed = 1;
|
||||
|
||||
ret = uclass_get(UCLASS_USB, &uc);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto out;
|
||||
|
||||
uc_priv = uclass_get_priv(uc);
|
||||
|
||||
@@ -347,6 +409,9 @@ int usb_init(void)
|
||||
usb_init_bus(bus);
|
||||
}
|
||||
|
||||
if (CONFIG_IS_ENABLED(UTHREAD))
|
||||
run_threads();
|
||||
|
||||
usb_started = true;
|
||||
|
||||
/*
|
||||
@@ -364,6 +429,9 @@ int usb_init(void)
|
||||
usb_scan_bus(bus, true);
|
||||
}
|
||||
|
||||
if (CONFIG_IS_ENABLED(UTHREAD))
|
||||
run_threads();
|
||||
|
||||
/*
|
||||
* Now that the primary controllers have been scanned and have handed
|
||||
* over any devices they do not understand to their companions, scan
|
||||
@@ -380,21 +448,34 @@ int usb_init(void)
|
||||
}
|
||||
}
|
||||
|
||||
debug("scan end\n");
|
||||
if (CONFIG_IS_ENABLED(UTHREAD))
|
||||
run_threads();
|
||||
|
||||
usb_report_devices(uc);
|
||||
|
||||
/* Remove any devices that were not found on this scan */
|
||||
remove_inactive_children(uc, bus);
|
||||
|
||||
ret = uclass_get(UCLASS_USB_HUB, &uc);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto out;
|
||||
|
||||
remove_inactive_children(uc, bus);
|
||||
|
||||
/* if we were not able to find at least one working bus, bail out */
|
||||
if (controllers_initialized == 0)
|
||||
printf("No USB controllers found\n");
|
||||
|
||||
debug("USB initialized in %ld ms\n",
|
||||
(timer_get_us() - t0) / 1000);
|
||||
|
||||
uthread_mutex_unlock(&mutex);
|
||||
|
||||
return usb_started ? 0 : -ENOENT;
|
||||
out:
|
||||
uthread_mutex_unlock(&mutex);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp)
|
||||
|
||||
@@ -392,8 +392,7 @@ static int bootdev_test_hunter(struct unit_test_state *uts)
|
||||
ut_assert_console_end();
|
||||
|
||||
ut_assertok(bootdev_hunt("usb1", false));
|
||||
ut_assert_nextline(
|
||||
"Bus usb@1: scanning bus usb@1 for devices... 5 USB Device(s) found");
|
||||
ut_assert_skip_to_line("Bus usb@1: 5 USB Device(s) found");
|
||||
ut_assert_console_end();
|
||||
|
||||
/* USB is 7th in the list, so bit 8 */
|
||||
@@ -448,8 +447,7 @@ static int bootdev_test_cmd_hunt(struct unit_test_state *uts)
|
||||
ut_assert_nextline("scanning bus for devices...");
|
||||
ut_assert_skip_to_line("Hunting with: spi_flash");
|
||||
ut_assert_nextline("Hunting with: usb");
|
||||
ut_assert_nextline(
|
||||
"Bus usb@1: scanning bus usb@1 for devices... 5 USB Device(s) found");
|
||||
ut_assert_skip_to_line("Bus usb@1: 5 USB Device(s) found");
|
||||
ut_assert_nextline("Hunting with: virtio");
|
||||
ut_assert_console_end();
|
||||
|
||||
@@ -551,8 +549,7 @@ static int bootdev_test_hunt_prio(struct unit_test_state *uts)
|
||||
ut_assertok(bootdev_hunt_prio(BOOTDEVP_5_SCAN_SLOW, true));
|
||||
ut_assert_nextline("Hunting with: ide");
|
||||
ut_assert_nextline("Hunting with: usb");
|
||||
ut_assert_nextline(
|
||||
"Bus usb@1: scanning bus usb@1 for devices... 5 USB Device(s) found");
|
||||
ut_assert_skip_to_line("Bus usb@1: 5 USB Device(s) found");
|
||||
ut_assert_console_end();
|
||||
|
||||
return 0;
|
||||
@@ -604,7 +601,7 @@ static int bootdev_test_hunt_label(struct unit_test_state *uts)
|
||||
ut_assertnonnull(dev);
|
||||
ut_asserteq_str("usb_mass_storage.lun0.bootdev", dev->name);
|
||||
ut_asserteq(BOOTFLOW_METHF_SINGLE_UCLASS, mflags);
|
||||
ut_assert_nextlinen("Bus usb@1: scanning bus usb@1");
|
||||
ut_assert_nextline("Bus usb@1: 5 USB Device(s) found");
|
||||
ut_assert_console_end();
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -1290,7 +1290,7 @@ static int bootflow_efi(struct unit_test_state *uts)
|
||||
|
||||
ut_assertok(run_command("bootflow scan", 0));
|
||||
ut_assert_skip_to_line(
|
||||
"Bus usb@1: scanning bus usb@1 for devices... 5 USB Device(s) found");
|
||||
"Bus usb@1: 5 USB Device(s) found");
|
||||
|
||||
ut_assertok(run_command("bootflow list", 0));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user