GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/i945/raminit: Don't fall back to smbus read on failed SPD decode 

SPD decoding problems are no longer a good method for detecting if i2c
byte read failed, since the return value of i2c_block_read is checked.

Change-Id: I230aa22964c452cf28a9370c927b82c57e39cc62
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/21621
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Arthur Heymans 2017-09-21 09:12:42 +02:00 committed by Nico Huber
parent c8bc983673
commit 5661945c3b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/northbridge/intel/i945/raminit.c
View File

@ -387,8 +387,7 @@ static void gather_common_timing(struct sys_info *sysinfo,
printk(BIOS_DEBUG, "Reading SPD using i2c block operation.\n"); printk(BIOS_DEBUG, "Reading SPD using i2c block operation.\n");
if (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP) && bytes_read > 0) if (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP) && bytes_read > 0)
hexdump(raw_spd, bytes_read); hexdump(raw_spd, bytes_read);
if (bytes_read != 64 || spd_decode_ddr2(&dimm_info, raw_spd) if (bytes_read != 64) {
!= SPD_STATUS_OK) {
/* Try again with SMBUS byte read */ /* Try again with SMBUS byte read */
printk(BIOS_DEBUG, "i2c block operation failed," printk(BIOS_DEBUG, "i2c block operation failed,"
" trying smbus byte operation.\n"); " trying smbus byte operation.\n");
@ -396,10 +395,14 @@ static void gather_common_timing(struct sys_info *sysinfo,
raw_spd[j] = spd_read_byte(device, j); raw_spd[j] = spd_read_byte(device, j);
if (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP)) if (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP))
hexdump(raw_spd, 64); hexdump(raw_spd, 64);
if (spd_decode_ddr2(&dimm_info, raw_spd) }
!= SPD_STATUS_OK)
if (spd_decode_ddr2(&dimm_info, raw_spd) != SPD_STATUS_OK) {
printk(BIOS_WARNING, "Encountered problems with SPD, "
"skipping this DIMM.\n");
continue; continue;
} }
if (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP)) if (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP))
dram_print_spd_ddr2(&dimm_info); dram_print_spd_ddr2(&dimm_info);