From: Vincent Palatin <vpalatin@chromium.org>
Date: Thu, 13 Dec 2012 01:55:22 +0000 (-0800)
Subject: usb: ehci: Add 64-bit controller support
X-Git-Tag: v2013.04-rc2~23^2~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2982837e36e56584b0ab0256dd82d306e4ba1249;p=oweals%2Fu-boot.git

usb: ehci: Add 64-bit controller support

On EHCI controller with 64-bit address space support, we must initialize
properly the high word for the PCI bus master accesses.

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 7f98a6354a..20309adfb0 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -870,6 +870,9 @@ int usb_lowlevel_init(int index, void **controller)
 	if (ehci_hcd_init(index, &ehcic[index].hccr, &ehcic[index].hcor))
 		return -1;
 #endif
+	/* Set the high address word (aka segment) for 64-bit controller */
+	if (ehci_readl(&ehcic[index].hccr->cr_hccparams) & 1)
+		ehci_writel(ehcic[index].hcor->or_ctrldssegment, 0);
 
 	qh_list = &ehcic[index].qh_list;