frag_usb_fffaed66

2 files changed, 106 insertions, 175 deletions

diff --git a/src/northbridge/intel/haswell/mrc_frags.c b/src/northbridge/intel/haswell/mrc_frags.c
index 57acdce1fa..f14b21f198 100644
--- a/src/northbridge/intel/haswell/mrc_frags.c
+++ b/src/northbridge/intel/haswell/mrc_frags.c
@@ -8,6 +8,7 @@
 #include "mrc_sku.h"
 #include <cpu/intel/haswell/haswell.h>
 #include "mrc_pch.h"
+#include "pei_usb.h"
 
 void frag_fffa0ff3(void);
 void frag_fffa0ff3(void)
@@ -401,3 +402,103 @@ void frag_usb_fffaecbe(void)
 	if (mrc_sku_type() == 2)
 		pch_iobp_update(0xe5007f02, 0xff3fffff, 0);
 }
+
+static const u32 ref_fffcb9f0[17] = {
+	0x13000000,
+	0x15000000,
+	0x15000000,
+	0x15000000,
+	0x15000000,
+	0x15000000,
+	0x15000000,
+	0x15000000,
+	0x11000000,
+	0x15000000,
+	0x15000000,
+	0x15000000,
+	0x15000000,
+	0x15000000,
+	0x15000000,
+	0x15000000,
+	0x0f000000
+};
+
+void frag_usb_fffaed66(PEI_USB *upd, void *xbar);
+void frag_usb_fffaed66(PEI_USB *upd, void *xbar)
+{
+#define XBAR_AND_OR(a, andv, orv) bar_update32(xbar, a, andv, orv)
+#define XBAR_OR(a, orv) bar_or32(xbar, a, orv)
+#define XBAR_RW32(addr, v) do { \
+	read32(xbar + (addr)); \
+	write32(xbar + (addr), v); \
+} while(0);
+
+	int sku = mrc_sku_type();
+	int rev = mrc_pch_revision();
+	u32 tmp1, tmp2;
+
+	/* XBAR is e8100000
+	printk(BIOS_DEBUG, "XBAR is %p.\n", xbar);
+	*/
+
+	if ((upd->xhci_resume_info[2] & 3) == 0)
+		return;
+
+	tmp1 = 0;
+	if (sku == 1) {
+		tmp2 = (pci_read_config32(PCI_DEV(0, 0x14, 0), 0xe0) & 0x18) - 8;
+		if (tmp2 <= 0x10)
+			tmp1 = ref_fffcb9f0[tmp2];
+		else
+			tmp1 = 0x15000000;
+
+		XBAR_AND_OR(4, 0xffffff, tmp1);
+	}
+	XBAR_AND_OR(0xc, 0xff00, 0x200000a);
+	XBAR_AND_OR(0x10, 0xfffff9df, 0x0600);
+	if (sku == 1) {
+		XBAR_AND_OR(0x8008, 0xfff7ffff, 0);
+		XBAR_AND_OR(0x8058, 0xffeefeff, 0x110000);
+	} else if (sku == 2) {
+		XBAR_AND_OR(0x8058, 0xfffefeff, 0x10000);
+	}
+
+	XBAR_OR(0x8060, 0x2040000);
+	XBAR_OR(0x8090, 0x4100);
+	XBAR_OR(0x8094, 0xa04000);
+	XBAR_AND_OR(0x80e0, 0xfffeffbf, 0x40);
+	XBAR_AND_OR(0x80ec, 0xffff81ff, 0x0c00);
+	XBAR_AND_OR(0x80f0, 0xffefffff, 0);
+	if (sku == 2) {
+		XBAR_OR(0x80fc, 0x2000000);
+		XBAR_AND_OR(0x8110, 0xffeff6fb, 0x100800);
+		read32(xbar + 0x8140);
+		write32(xbar + 0x8140, 0xff00f03c);
+		tmp2 = 0x200000;
+		tmp1 = 0x2000;
+	} else if (sku == 1) {
+		XBAR_AND_OR(0x8110, 0xffeff7fb, 0x100800);
+		read32(xbar + 0x8140);
+		write32(xbar + 0x8140, 0xff03c132);
+		tmp2 = 0x202000;
+		tmp1 = 0;
+	} else {
+		tmp2 = 0;
+	}
+	XBAR_AND_OR(0x8154, ~tmp2, tmp1);
+	XBAR_AND_OR(0x8154, 0xfffffff7, 0);
+	if (sku == 2) {
+		XBAR_OR(0x8164, 3);
+		write32(xbar + 0x8174, 0x1400c0a);
+		XBAR_RW32(0x817c, 0x33200a3);
+		XBAR_RW32(0x8180, 0xcb0028);
+		XBAR_RW32(0x8184, 0x64001e);
+	}
+	pci_or_config16(PCI_DEV(0, 0x14, 0), 0x44, 0xc401);
+	pci_or_config8(PCI_DEV(0, 0x14, 0), 0x46, 0xf);
+	if (rev > 3 && sku == 2) {
+		XBAR_OR(0x8188, 0x5000000);
+	} else if (rev != 0 && sku == 1) {
+		XBAR_OR(0x8188, 0x1000000);
+	}
+}
diff --git a/src/northbridge/intel/haswell/pei_usb.asm b/src/northbridge/intel/haswell/pei_usb.asm
index efe2156995..4ed6bb1f56 100644
--- a/src/northbridge/intel/haswell/pei_usb.asm
+++ b/src/northbridge/intel/haswell/pei_usb.asm
@@ -11,6 +11,7 @@ extern ref_fffcb99c
 extern ref_fffcc988
 extern xhci_setup_ss_route
 extern frag_usb_fffaecbe
+extern frag_usb_fffaed66
 
 mrc_init_usb:
 push ebp
@@ -238,157 +239,10 @@ or eax, 6
 mov word [edi + 0xa0004], ax
 
 loc_fffaed66:
-call mrc_sku_type
-mov esi, eax
-call mrc_pch_revision
-mov edx, dword [ebp - 0x30]
-mov dword [ebp - 0x3c], eax
-test byte [edx + 0x57], 3
-je loc_fffaefd0  ; je 0xfffaefd0
-xor eax, eax
-cmp esi, 1
-jne short loc_fffaedb4  ; jne 0xfffaedb4
-mov edx, dword [edi + 0xa00e0]
-mov eax, 0x15000000
-and edx, 0x18
-sub edx, 8
-cmp edx, 0x10
-ja short loc_fffaeda6  ; ja 0xfffaeda6
-mov eax, dword [edx*4 + ref_fffcb9f0]  ; mov eax, dword [edx*4 - 0x34610]
-
-loc_fffaeda6:
-mov edx, dword [ebx + 4]
-and edx, 0xffffff
-or edx, eax
-mov dword [ebx + 4], edx
-
-loc_fffaedb4:
-mov edx, dword [ebx + 0xc]
-and edx, 0xff00
-or edx, 0x200000a
-mov dword [ebx + 0xc], edx
-mov edx, dword [ebx + 0x10]
-and edx, 0xfffff9df
-or dh, 6
-mov dword [ebx + 0x10], edx
-cmp esi, 1
-jne short loc_fffaee00  ; jne 0xfffaee00
-mov edx, dword [ebx + 0x8008]
-and edx, 0xfff7ffff
-mov dword [ebx + 0x8008], edx
-mov edx, dword [ebx + 0x8058]
-and edx, 0xffeefeff
-or edx, 0x110000
-jmp short loc_fffaee17  ; jmp 0xfffaee17
-
-loc_fffaee00:
-cmp esi, 2
-jne short loc_fffaee1d  ; jne 0xfffaee1d
-mov edx, dword [ebx + 0x8058]
-and edx, 0xfffefeff
-or edx, 0x10000
-
-loc_fffaee17:
-mov dword [ebx + 0x8058], edx
-
-loc_fffaee1d:
-mov edx, dword [ebx + 0x8060]
-or edx, 0x2040000
-mov dword [ebx + 0x8060], edx
-mov edx, dword [ebx + 0x8090]
-or dh, 0x41
-mov dword [ebx + 0x8090], edx
-mov edx, dword [ebx + 0x8094]
-or edx, 0xa04000
-mov dword [ebx + 0x8094], edx
-mov edx, dword [ebx + 0x80e0]
-and edx, 0xfffeffbf
-or edx, 0x40
-mov dword [ebx + 0x80e0], edx
-mov edx, dword [ebx + 0x80ec]
-and dh, 0x81
-or dh, 0xc
-mov dword [ebx + 0x80ec], edx
-mov edx, dword [ebx + 0x80f0]
-and edx, 0xffefffff
-mov dword [ebx + 0x80f0], edx
-cmp esi, 2
-jne loc_fffaf9d7  ; jne 0xfffaf9d7
-mov eax, dword [ebx + 0x80fc]
-or eax, 0x2000000
-mov dword [ebx + 0x80fc], eax
-mov eax, dword [ebx + 0x8110]
-and eax, 0xffeff6fb
-or eax, 0x100800
-mov dword [ebx + 0x8110], eax
-mov eax, dword [ebx + 0x8140]
-mov dword [ebx + 0x8140], 0xff00f03c
-mov edx, 0x200000
-mov eax, 0x2000
-jmp short loc_fffaef02  ; jmp 0xfffaef02
-
-loc_fffaeed5:
-mov eax, dword [ebx + 0x8110]
-and eax, 0xffeff7fb
-or eax, 0x100800
-mov dword [ebx + 0x8110], eax
-mov eax, dword [ebx + 0x8140]
-mov dword [ebx + 0x8140], 0xff03c132
-mov edx, 0x202000
-xor eax, eax
-
-loc_fffaef02:
-mov ecx, dword [ebx + 0x8154]
-not edx
-and edx, ecx
-or edx, eax
-mov dword [ebx + 0x8154], edx
-mov eax, dword [ebx + 0x8154]
-and eax, 0xfffffff7
-mov dword [ebx + 0x8154], eax
-cmp esi, 2
-jne short loc_fffaef71  ; jne 0xfffaef71
-mov eax, dword [ebx + 0x8164]
-or eax, 3
-mov dword [ebx + 0x8164], eax
-mov dword [ebx + 0x8174], 0x1400c0a
-mov eax, dword [ebx + 0x817c]
-mov dword [ebx + 0x817c], 0x33200a3
-mov eax, dword [ebx + 0x8180]
-mov dword [ebx + 0x8180], 0xcb0028
-mov eax, dword [ebx + 0x8184]
-mov dword [ebx + 0x8184], 0x64001e
-
-loc_fffaef71:
-mov ax, word [edi + 0xa0044]
-mov cl, byte [ebp - 0x3c]
-or ax, 0xc401
-mov word [edi + 0xa0044], ax
-mov al, byte [edi + 0xa0046]
-or eax, 0xf
-mov byte [edi + 0xa0046], al
-cmp cl, 3
-seta dl
-cmp esi, 2
-sete al
-test dl, al
-je short loc_fffaefb2  ; je 0xfffaefb2
-mov eax, dword [ebx + 0x8188]
-or eax, 0x5000000
-jmp short loc_fffaefca  ; jmp 0xfffaefca
-
-loc_fffaefb2:
-test cl, cl
-setne dl
-dec esi
-sete al
-test dl, al
-je short loc_fffaefd0  ; je 0xfffaefd0
-mov eax, dword [ebx + 0x8188]
-or eax, 0x1000000
-
-loc_fffaefca:
-mov dword [ebx + 0x8188], eax
+push ebx
+push dword [ebp - 0x30]
+call frag_usb_fffaed66
+add esp, 8
 
 loc_fffaefd0:
 call mrc_sku_type
@@ -1358,12 +1212,6 @@ loc_fffaf9ce:
 mov dword [ebp - 0x58], 0x80000002
 jmp short loc_fffafa2f  ; jmp 0xfffafa2f
 
-loc_fffaf9d7:
-cmp esi, 1
-je loc_fffaeed5  ; je 0xfffaeed5
-xor edx, edx
-jmp near loc_fffaef02  ; jmp 0xfffaef02
-
 loc_fffaf9e7:
 cmp dword [ebp - 0x34], 0
 je loc_fffaf44c  ; je 0xfffaf44c
@@ -1392,24 +1240,6 @@ ref_fffcb9e8:
 dd ref_fffcca08
 dd ref_fffcca20
 
-ref_fffcb9f0:
-dd 0x13000000
-dd 0x15000000
-dd 0x15000000
-dd 0x15000000
-dd 0x15000000
-dd 0x15000000
-dd 0x15000000
-dd 0x15000000
-dd 0x11000000
-dd 0x15000000
-dd 0x15000000
-dd 0x15000000
-dd 0x15000000
-dd 0x15000000
-dd 0x15000000
-dd 0x15000000
-dd 0x0f000000
 
 ref_fffcba34:
 db 0x1d