sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/intel/x4x: Refactor sync DLL programming (part 1)

Browse Source 
Extract some common code patterns into functions.

Change-Id: I5f8d40bb55d4b4f0639e0287881ae0ecde298590
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51905
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Nico Huber 2021-03-28 18:27:08 +02:00
parent b6a2ebe5ef
commit a20a02e82a
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/northbridge/intel/x4x/raminit_ddr23.c
View File

@ -663,6 +663,30 @@ static void program_timings(struct sysinfo *s)
mchbar_clrsetbits8(0x6c4, 0x7, 0x2); mchbar_clrsetbits8(0x6c4, 0x7, 0x2);
} }
const unsigned int sync_dll_max_taps = 16;
static void sync_dll_load_tap(unsigned int tap)
{
mchbar_clrsetbits8(0x1c8, 0x1f, tap & 0x1f);
mchbar_setbits8(0x180, 1 << 4);
do {} while (mchbar_read8(0x180) & (1 << 4));
}
static bool sync_dll_test_tap(unsigned int tap, uint32_t val)
{
if (tap >= sync_dll_max_taps)
return false;
sync_dll_load_tap(tap);
return mchbar_read32(0x184) == val;
}
static void sync_dll_search_tap(uint8_t *tap, uint32_t val)
{
for (; *tap < sync_dll_max_taps; ++*tap)
if (sync_dll_test_tap(*tap, val))
return;
}
static void program_dll(struct sysinfo *s) static void program_dll(struct sysinfo *s)
{ {
u8 i, j, r, reg8, clk, async = 0; u8 i, j, r, reg8, clk, async = 0;
@ -821,12 +845,8 @@ static void program_dll(struct sysinfo *s)
mchbar_clrbits16(0x180, 1 << 15 | 1 << 9); mchbar_clrbits16(0x180, 1 << 15 | 1 << 9);
mchbar_setbits8(0x180, 1 << 2); mchbar_setbits8(0x180, 1 << 2);
j = 0; j = 0;
for (i = 0; i < 16; i++) { for (i = 0; i < sync_dll_max_taps; i++) {
mchbar_clrsetbits8(0x1c8, 0x1f, i); if (sync_dll_test_tap(i, 0xffffffff)) {
mchbar_setbits8(0x180, 1 << 4);
while (mchbar_read8(0x180) & (1 << 4))
;
if (mchbar_read32(0x184) == 0xffffffff) {
j++; j++;
if (j >= 2) if (j >= 2)
break; break;
@ -842,22 +862,10 @@ static void program_dll(struct sysinfo *s)
if (i == 1 || ((i == 0) && s->selected_timings.mem_clk == MEM_CLOCK_667MHz)) { if (i == 1 || ((i == 0) && s->selected_timings.mem_clk == MEM_CLOCK_667MHz)) {
j = 0; j = 0;
i++; i++;
for (; i < 16; i++) { sync_dll_search_tap(&i, 0);
mchbar_clrsetbits8(0x1c8, 0x1f, i); i++;
mchbar_setbits8(0x180, 1 << 4); for (; i < sync_dll_max_taps; i++) {
while (mchbar_read8(0x180) & (1 << 4)) if (sync_dll_test_tap(i, 0xffffffff)) {
;
if (mchbar_read32(0x184) == 0) {
i++;
break;
}
}
for (; i < 16; i++) {
mchbar_clrsetbits8(0x1c8, 0x1f, i);
mchbar_setbits8(0x180, 1 << 4);
while (mchbar_read8(0x180) & (1 << 4))
;
if (mchbar_read32(0x184) == 0xffffffff) {
j++; j++;
if (j >= 2) if (j >= 2)
break; break;
@ -866,10 +874,7 @@ static void program_dll(struct sysinfo *s)
} }
} }
if (j < 2) { if (j < 2) {
mchbar_clrsetbits8(0x1c8, 0x1f, 0); sync_dll_load_tap(0);
mchbar_setbits8(0x180, 1 << 4);
while (mchbar_read8(0x180) & (1 << 4))
;
j = 2; j = 2;
} }
} }
@ -890,10 +895,7 @@ static void program_dll(struct sysinfo *s)
i = (i + 10) % 14; i = (i + 10) % 14;
else /* DDR3 */ else /* DDR3 */
i = (i + 3) % 12; i = (i + 3) % 12;
mchbar_clrsetbits8(0x1c8, 0x1f, i); sync_dll_load_tap(i);
mchbar_setbits8(0x180, 1 << 4);
while (mchbar_read8(0x180) & (1 << 4))
;
} }
switch (s->selected_timings.mem_clk) { switch (s->selected_timings.mem_clk) {