Change in coreboot[master]: nb/i945/raminit: Don't fall back to smbus read on failed SPD decode

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/21621

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

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 
---
M src/northbridge/intel/i945/raminit.c
1 file changed, 8 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/21621/1

diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c
index a9d183c..b7d2108 100644
--- a/src/northbridge/intel/i945/raminit.c
+++ b/src/northbridge/intel/i945/raminit.c
@@ -387,8 +387,7 @@
    	printk(BIOS_DEBUG, "Reading SPD using i2c block operation.\n");
    	if (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP) && bytes_read > 0)
    		hexdump(raw_spd, bytes_read);
-		if (bytes_read != 64 || spd_decode_ddr2(&dimm_info, raw_spd)
-				!= SPD_STATUS_OK) {
+		if (bytes_read != 64) {
    		/* Try again with SMBUS byte read */
    		printk(BIOS_DEBUG, "i2c block operation failed,"
    			"trying smbus byte operation.\n");
@@ -396,10 +395,14 @@
    			raw_spd[j] = spd_read_byte(device, j);
    		if (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP))
    			hexdump(raw_spd, 64);
-			if (spd_decode_ddr2(&dimm_info, raw_spd)
-					!= SPD_STATUS_OK)
-				continue;
    	}
+
+		if (spd_decode_ddr2(&dimm_info, raw_spd) != SPD_STATUS_OK) {
+			printk(BIOS_WARNING, "Encountered problems with SPD, "
+				"skipping this dimm.\n");
+			continue;
+		}
+
    	if (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP))
    		dram_print_spd_ddr2(&dimm_info);