Skip to content
Snippets Groups Projects
Commit b6de4d10 authored by Hans de Goede's avatar Hans de Goede Committed by Simon Glass
Browse files

dm: usb: Add support for companion controllers


USB companion controllers must be scanned after the main controller has
been scanned, so that any devices which the main controller which to hand
over to the companion have actually been handed over before we scan the
companion.

As there are no guarantees that this will magically happen in the right
order, split the scanning of the buses in 2 phases, first main controllers,
and then companion controllers.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarSimon Glass <sjg@chromium.org>
parent a24a0e91
No related branches found
No related tags found
No related merge requests found
......@@ -171,6 +171,7 @@ static void usb_scan_bus(struct udevice *bus, bool recurse)
int usb_init(void)
{
int controllers_initialized = 0;
struct usb_bus_priv *priv;
struct udevice *bus;
struct uclass *uc;
int count = 0;
......@@ -198,13 +199,35 @@ int usb_init(void)
printf("probe failed, error %d\n", ret);
continue;
}
controllers_initialized++;
usb_started = true;
}
/*
* lowlevel init is OK, now scan the bus for devices
* i.e. search HUBs and configure them
* lowlevel init done, now scan the bus for devices i.e. search HUBs
* and configure them, first scan primary controllers.
*/
controllers_initialized++;
uclass_foreach_dev(bus, uc) {
if (!device_active(bus))
continue;
priv = dev_get_uclass_priv(bus);
if (!priv->companion)
usb_scan_bus(bus, true);
}
/*
* Now that the primary controllers have been scanned and have handed
* over any devices they do not understand to their companions, scan
* the companions.
*/
uclass_foreach_dev(bus, uc) {
if (!device_active(bus))
continue;
priv = dev_get_uclass_priv(bus);
if (priv->companion)
usb_scan_bus(bus, true);
usb_started = true;
}
debug("scan end\n");
......
......@@ -608,10 +608,13 @@ struct usb_dev_platdata {
* @desc_before_addr: true if we can read a device descriptor before it
* has been assigned an address. For XHCI this is not possible
* so this will be false.
* @companion: True if this is a companion controller to another USB
* controller
*/
struct usb_bus_priv {
int next_addr;
bool desc_before_addr;
bool companion;
};
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment