diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2014-03-10 14:12:29 -0700 |
|---|---|---|
| committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-10-02 17:28:47 +0200 |
| commit | a16029a93d06dc73f7ee2796db7c90b2211ee776 (patch) | |
| tree | 75f372b40b9ec766d3e50234cc9a9f1d6ff78969 /payloads/libpayload/drivers/usb/generic_hub.c | |
| parent | 758f26aa2dd7447267ac7e08b32ef157fc55a755 (diff) | |
| download | coreboot-a16029a93d06dc73f7ee2796db7c90b2211ee776.tar.xz | |
libpayload: usb: Remove generic roothub reset port function
The generic roothub reset port function is overly broad and does some
things which may be undesirable, such as issuing multiple resets to a
port if the reset is deemed to have finished too quickly. Remove the
generic function and replace it with a controller-specific function,
currently only implemented for xhci.
Change-Id: Id46f73ea3341d4d01d2b517c6bf687402022d272
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/189495
Reviewed-by: Julius Werner <jwerner@chromium.org>
(cherry picked from commit 54e1da075b0106b0a1f736641fa52c39401d349d)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/7001
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'payloads/libpayload/drivers/usb/generic_hub.c')
| -rw-r--r-- | payloads/libpayload/drivers/usb/generic_hub.c | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/payloads/libpayload/drivers/usb/generic_hub.c b/payloads/libpayload/drivers/usb/generic_hub.c index fa95969f2a..9f8670597e 100644 --- a/payloads/libpayload/drivers/usb/generic_hub.c +++ b/payloads/libpayload/drivers/usb/generic_hub.c @@ -93,7 +93,7 @@ generic_hub_debounce(usbdev_t *const dev, const int port) return 0; /* ignore timeouts, try to always go on */ } -static int +int generic_hub_wait_for_port(usbdev_t *const dev, const int port, const int wait_for, int (*const port_op)(usbdev_t *, int), @@ -135,38 +135,6 @@ generic_hub_resetport(usbdev_t *const dev, const int port) return 0; /* ignore timeouts, try to always go on */ } -int -generic_hub_rh_resetport(usbdev_t *const dev, const int port) -{ - generic_hub_t *const hub = GEN_HUB(dev); - - /* - * Resetting a root hub port should hold 50ms with pulses of at - * least 10ms and gaps of at most 3ms (usb20 spec 7.1.7.5). - * After reset, the port will be enabled automatically. - */ - int total = 500; /* 500 * 100us = 50ms */ - while (total > 0) { - if (hub->ops->start_port_reset(dev, port) < 0) - return -1; - - /* wait 100ms for the hub to finish the reset pulse */ - const int timeout = generic_hub_wait_for_port( - /* time out after 1000 * 100us = 100ms */ - dev, port, 0, hub->ops->port_in_reset, 1000, 100); - const int reset_time = 1000 - timeout; - if (timeout < 0) - return -1; - else if (!timeout) - usb_debug("generic_hub: Reset timed out at port %d\n", - port); - else if (reset_time < 100) /* i.e. < 100 * 100us */ - usb_debug("generic_hub: Port reset too short\n"); - total -= reset_time; - } - return 0; /* ignore timeouts, try to always go on */ -} - static int generic_hub_detach_dev(usbdev_t *const dev, const int port) { |