libpayload/usb: Increase USB request timeout to 5 s
Increase the timeout for USB requests to 5 seconds for all USB host controllers. Prior to this fix, the xCHI driver was detecting false timeouts during SET ADDRESS requests when nested downstream hubs were connected to the xHCI root hub. BUG=b:124730179 BRANCH=sarien TEST=Build libpayload and depthcharge on sarien/arcada. TEST=Without change replicate USB set address timeouts in depthcharge when dock and 4K monitor connected (which includes a total of 4 USB hubs). With timeout fix, depthcharge boots OS with no USB errors and the same USB topology. Note that this tests xHCI operation only. Change-Id: I53e3e67d893420e7c9e8b52c47dd0edb979e5468 Signed-off-by: Keith Short <keithshort@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/33671 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
committed by
Duncan Laurie
parent
9d0b7b9021
commit
bf2c693f89
@@ -292,14 +292,13 @@ ohci_stop (hci_t *controller)
|
||||
OHCI_INST (controller)->opreg->HcControl &= ~PeriodicListEnable;
|
||||
}
|
||||
|
||||
#define OHCI_SLEEP_TIME_US 1000
|
||||
|
||||
static int
|
||||
wait_for_ed(usbdev_t *dev, ed_t *head, int pages)
|
||||
{
|
||||
/* wait for results */
|
||||
/* TOTEST: how long to wait?
|
||||
* give 2s per TD (2 pages) plus another 2s for now
|
||||
*/
|
||||
int timeout = pages*1000 + 2000;
|
||||
int timeout = USB_MAX_PROCESSING_TIME_US / OHCI_SLEEP_TIME_US;
|
||||
while (((head->head_pointer & ~3) != head->tail_pointer) &&
|
||||
!(head->head_pointer & 1) &&
|
||||
((((td_t*)phys_to_virt(head->head_pointer & ~3))->config
|
||||
@@ -315,9 +314,9 @@ wait_for_ed(usbdev_t *dev, ed_t *head, int pages)
|
||||
((td_t*)phys_to_virt(head->head_pointer & ~3))->next_td,
|
||||
head->tail_pointer,
|
||||
(((td_t*)phys_to_virt(head->head_pointer & ~3))->config & TD_CC_MASK) >> TD_CC_SHIFT);
|
||||
mdelay(1);
|
||||
udelay(OHCI_SLEEP_TIME_US);
|
||||
}
|
||||
if (timeout < 0)
|
||||
if (timeout <= 0)
|
||||
usb_debug("Error: ohci: endpoint "
|
||||
"descriptor processing timed out.\n");
|
||||
/* Clear the done queue. */
|
||||
|
Reference in New Issue
Block a user