southbridge/nvidia/ck804: Fix boot hang on ASUS KFSN4-DRE w/ K8 CPU

Change-Id: Ie4b74f6d63c323ca499a6890defe9b8afe83ea96
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/12209
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Timothy Pearson 2015-10-28 02:58:37 -05:00 committed by Patrick Georgi
parent 8e1f020cee
commit cdc526e582
1 changed files with 4 additions and 1 deletions

View File

@ -142,7 +142,7 @@ static void ck804_early_setup(unsigned ck804_num, unsigned *busn,
CK804_MB_SETUP
#endif
#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AMDFAM10)
#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AMDFAM10) || (IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AMDK8) && IS_ENABLED(CONFIG_CPU_AMD_SOCKET_F))
/*
* Avoid crash (complete with severe memory corruption!) during initial CAR boot
* in ck804_early_setup_x() on Fam10h systems by not touching 0x78.
@ -351,8 +351,11 @@ static int ck804_early_setup_x(void)
}
}
printk(BIOS_DEBUG, "ck804_early_set_port(%d, %d, %d)\n", ck804_num, busn[0], io_base[0]);
ck804_early_set_port(ck804_num, busn, io_base);
printk(BIOS_DEBUG, "ck804_early_setup(%d, %d, %d)\n", ck804_num, busn[0], io_base[0]);
ck804_early_setup(ck804_num, busn, io_base);
printk(BIOS_DEBUG, "ck804_early_clear_port(%d, %d, %d)\n", ck804_num, busn[0], io_base[0]);
ck804_early_clear_port(ck804_num, busn, io_base);
return set_ht_link_ck804(4);