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/xhci_rh.c | |
| parent | 758f26aa2dd7447267ac7e08b32ef157fc55a755 (diff) | |
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/xhci_rh.c')
| -rw-r--r-- | payloads/libpayload/drivers/usb/xhci_rh.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/payloads/libpayload/drivers/usb/xhci_rh.c b/payloads/libpayload/drivers/usb/xhci_rh.c index c4cbeeaab8..26bb4f9c02 100644 --- a/payloads/libpayload/drivers/usb/xhci_rh.c +++ b/payloads/libpayload/drivers/usb/xhci_rh.c @@ -100,12 +100,22 @@ xhci_rh_port_speed(usbdev_t *const dev, const int port) } static int -xhci_rh_start_port_reset(usbdev_t *const dev, const int port) +xhci_rh_reset_port(usbdev_t *const dev, const int port) { xhci_t *const xhci = XHCI_INST(dev->controller); volatile u32 *const portsc = &xhci->opreg->prs[port - 1].portsc; + /* Trigger port reset. */ *portsc = (*portsc & PORTSC_RW_MASK) | PORTSC_PR; + + /* Wait for port_in_reset == 0, up to 150 * 1000us = 150ms */ + if (generic_hub_wait_for_port(dev, port, 0, xhci_rh_port_in_reset, + 150, 1000) == 0) + usb_debug("xhci_rh: Reset timed out at port %d\n", port); + else + /* Clear reset status bits, since port is out of reset. */ + *portsc = (*portsc & PORTSC_RW_MASK) | PORTSC_PRC | PORTSC_WRC; + return 0; } @@ -118,8 +128,8 @@ static const generic_hub_ops_t xhci_rh_ops = { .port_speed = xhci_rh_port_speed, .enable_port = NULL, .disable_port = NULL, - .start_port_reset = xhci_rh_start_port_reset, - .reset_port = generic_hub_rh_resetport, + .start_port_reset = NULL, + .reset_port = xhci_rh_reset_port, }; void |