summaryrefslogtreecommitdiff
path: root/payloads/libpayload/drivers/usb/usb.c
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2014-04-08 12:54:25 -0700
committerMarc Jones <marc.jones@se-eng.com>2014-11-13 06:22:45 +0100
commit7234d60a6e6ee3a3403865ad1469105ff1d92c4e (patch)
treed4bb49b8cb95ae5b6efd655c2aa32b6ce5ded690 /payloads/libpayload/drivers/usb/usb.c
parentbadf0f974479cf16134063d7c8c17bd1a30273d7 (diff)
libpayload: usb: Fix up usb_shutdown() code paths
This patch combines a few minor fixes and refactoring to the various host controller and root hub drivers to ensure they all do the right thing on a call to usb_exit(). It puts a usb_detach_device(0) call into detach_controller() so that the HCD doesn't need to remember to tear down the root hub itself, and makes sure all root hubs properly detach the subtree of devices connected to their ports first (as generic_hub and by extension XHCI had already been doing). It also fixes up some missing free() calls and replaces most 'ptr = malloc(); if (!ptr) fatal()' idioms with the new x(z)alloc(). BUG=chromium:343415 TEST=Tested EHCI on Big and OHCI, EHCI, and XHCI on Snow. Could not test UHCI (unless anyone volunteers to port coreboot to a ZGB? ;) ), but the changes are really tame. Original-Change-Id: I6eca51ff2685d0946fe4267ad7d3ec48ad7fc510 Original-Signed-off-by: Julius Werner <jwerner@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/193731 Original-Reviewed-by: Stefan Reinauer <reinauer@chromium.org> (cherry picked from commit 5791b546e5a21a360d0c65888a5b92d5f48f8178) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: I00138f0aeceb12ed721f7368c7788c9b6bee227d Reviewed-on: http://review.coreboot.org/7222 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix@chromium.org>
Diffstat (limited to 'payloads/libpayload/drivers/usb/usb.c')
-rw-r--r--payloads/libpayload/drivers/usb/usb.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c
index 4f21e0cf3b..eb23760033 100644
--- a/payloads/libpayload/drivers/usb/usb.c
+++ b/payloads/libpayload/drivers/usb/usb.c
@@ -39,15 +39,9 @@ hci_t *usb_hcs = 0;
hci_t *
new_controller (void)
{
- hci_t *controller = malloc (sizeof (hci_t));
-
- if (controller) {
- /* atomic */
- controller->next = usb_hcs;
- usb_hcs = controller;
- /* atomic end */
- }
-
+ hci_t *controller = xzalloc(sizeof (hci_t));
+ controller->next = usb_hcs;
+ usb_hcs = controller;
return controller;
}
@@ -56,6 +50,9 @@ detach_controller (hci_t *controller)
{
if (controller == NULL)
return;
+
+ usb_detach_device(controller, 0); /* tear down root hub tree */
+
if (usb_hcs == controller) {
usb_hcs = controller->next;
} else {