From c575a5c958ce88732d28044352c89418bcd5ea86 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Thu, 22 Aug 2013 16:24:09 -0700 Subject: [PATCH] libpayload: ehci: Set explicit terminate bits in dummy_qh next pointers. The EHCI host controllers in Samsung Exynos SoC seem to be a little more picky than Intel ones. When they reach the dummy_qh in the periodic frame list, they try to access the next qTD pointer even though it's NULL, an run into a HostSystemError. This patch explicitly sets the Terminate bit on those pointers to mark them invalid. BUG=chrome-os-partner:18635 TEST=Fix all the other issues with EHCI on ARM, then make sure it works. Change-Id: I50fa79bbf1c5fab306d7885c01efd66b13e279b8 Signed-off-by: Julius Werner Reviewed-on: https://gerrit.chromium.org/gerrit/66884 Reviewed-by: Vincent Palatin --- payloads/libpayload/drivers/usb/ehci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/payloads/libpayload/drivers/usb/ehci.c b/payloads/libpayload/drivers/usb/ehci.c index 478fd04072..e49f8ab649 100644 --- a/payloads/libpayload/drivers/usb/ehci.c +++ b/payloads/libpayload/drivers/usb/ehci.c @@ -791,6 +791,8 @@ ehci_init (void *bar) memset((void *)EHCI_INST(controller)->dummy_qh, 0, sizeof(*EHCI_INST(controller)->dummy_qh)); EHCI_INST(controller)->dummy_qh->horiz_link_ptr = QH_TERMINATE; + EHCI_INST(controller)->dummy_qh->td.next_qtd = QH_TERMINATE; + EHCI_INST(controller)->dummy_qh->td.alt_next_qtd = QH_TERMINATE; for (i = 0; i < 1024; ++i) periodic_list[i] = virt_to_phys(EHCI_INST(controller)->dummy_qh) | PS_TYPE_QH;