X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c8bff13a7489ad82aef06e6f68cd5ef35ffb2a7d..95316451cb8a4d8c63fb5cc7074912f497815f12:/target/linux/brcm-2.4/files/arch/mips/bcm947xx/pcibios.c

diff --git a/target/linux/brcm-2.4/files/arch/mips/bcm947xx/pcibios.c b/target/linux/brcm-2.4/files/arch/mips/bcm947xx/pcibios.c
index 8c8f6aab5..0e993d1b9 100644
--- a/target/linux/brcm-2.4/files/arch/mips/bcm947xx/pcibios.c
+++ b/target/linux/brcm-2.4/files/arch/mips/bcm947xx/pcibios.c
@@ -25,7 +25,6 @@
 
 #include <typedefs.h>
 #include <osl.h>
-#include <bcmutils.h>
 #include <sbconfig.h>
 #include <sbutils.h>
 #include <hndpci.h>
@@ -134,7 +133,7 @@ pcibios_init(void)
 {
 	ulong flags;
 
-	if (!(sbh = sb_kattach()))
+	if (!(sbh = sb_kattach(SB_OSH)))
 		panic("sb_kattach failed");
 	spin_lock_init(&sbh_lock);
 
@@ -293,6 +292,7 @@ pcibios_enable_device(struct pci_dev *dev, int mask)
 	 * after calling pcibios_enable_device().
 	 */
 	if (sb_coreid(sbh) == SB_USB) {
+		printk(KERN_INFO "SB USB 1.1 init\n");
 		sb_core_disable(sbh, sb_coreflags(sbh, 0, 0));
 		sb_core_reset(sbh, 1 << 29, 0);
 	}
@@ -307,11 +307,39 @@ pcibios_enable_device(struct pci_dev *dev, int mask)
 	 *    phy components out of reset.
 	 */
 	else if (sb_coreid(sbh) == SB_USB20H) {
+		
+		uint corerev = sb_corerev(sbh);
+
+		printk(KERN_INFO "SB USB20H init\n");
+		printk(KERN_INFO "SB COREREV: %d\n", corerev);
+		
 		if (!sb_iscoreup(sbh)) {
+						
+			printk(KERN_INFO "SB USB20H resetting\n");
+
 			sb_core_reset(sbh, 0, 0);
 			writel(0x7FF, (ulong)regs + 0x200);
 			udelay(1);
 		}
+		/* PRxxxx: War for 5354 failures. */
+		if (corerev == 1 || corerev == 2) {
+			uint32 tmp;
+
+			/* Change Flush control reg */
+			tmp = readl((uintptr)regs + 0x400);
+			tmp &= ~8;
+			writel(tmp, (uintptr)regs + 0x400);
+			tmp = readl((uintptr)regs + 0x400);
+			printk(KERN_INFO "USB20H fcr: 0x%x\n", tmp);
+
+			/* Change Shim control reg */
+			tmp = readl((uintptr)regs + 0x304);
+			tmp &= ~0x100;
+			writel(tmp, (uintptr)regs + 0x304);
+			tmp = readl((uintptr)regs + 0x304);
+			printk(KERN_INFO "USB20H shim cr: 0x%x\n", tmp);
+		}
+
 	} else
 		sb_core_reset(sbh, 0, 0);