[coreboot-gerrit] Change in coreboot[master]: mb/google/hatch/romstage_spd_smbus.c: Fix missing DIMM issue

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40820 )

Change subject: mb/google/hatch/romstage_spd_smbus.c: Fix missing DIMM issue
......................................................................

mb/google/hatch/romstage_spd_smbus.c: Fix missing DIMM issue

Since https://review.coreboot.org/c/coreboot/+/40558/13 got
merged Puff will not be able to boot up and stop as below log:

```
 ...
SPD: banks 16, ranks 2, rows 16, columns 10, density 8192 Mb
SPD: device width 8 bits, bus width 64 bits
SPD: module size is 16384 MB (per channel)
ASSERTION ERROR: file 'src/soc/intel/cannonlake/cnl_memcfg_init.c', line 47
```

BUG=b:155220125
BRANCH=none
TEST=none

Change-Id: I5f47c849344951d53fa8c67e779b7c46d632d124
Signed-off-by: Edward O'Callaghan 
---
M src/mainboard/google/hatch/romstage_spd_smbus.c
1 file changed, 15 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/40820/1

diff --git a/src/mainboard/google/hatch/romstage_spd_smbus.c b/src/mainboard/google/hatch/romstage_spd_smbus.c
index 4aa37fa..bac5d58 100644
--- a/src/mainboard/google/hatch/romstage_spd_smbus.c
+++ b/src/mainboard/google/hatch/romstage_spd_smbus.c
@@ -18,15 +18,24 @@

/* Access memory info through SMBUS. */
    get_spd_smbus(&blk);
-	memcfg.spd[0].read_type = READ_SPD_MEMPTR;
-	memcfg.spd[0].spd_spec.spd_data_ptr_info.spd_data_len = blk.len;
-	memcfg.spd[0].spd_spec.spd_data_ptr_info.spd_data_ptr = (uintptr_t)blk.spd_array[0];
+
+	if (blk.spd_array[0] == NULL) {
+		memcfg.spd[0].read_type = NOT_EXISTING;
+	} else {
+		memcfg.spd[0].read_type = READ_SPD_MEMPTR;
+		memcfg.spd[0].spd_spec.spd_data_ptr_info.spd_data_len = blk.len;
+		memcfg.spd[0].spd_spec.spd_data_ptr_info.spd_data_ptr = (uintptr_t)blk.spd_array[0];
+	}

memcfg.spd[1].read_type = NOT_EXISTING;

-	memcfg.spd[2].read_type = READ_SPD_MEMPTR;
-	memcfg.spd[2].spd_spec.spd_data_ptr_info.spd_data_len = blk.len;
-	memcfg.spd[2].spd_spec.spd_data_ptr_info.spd_data_ptr = (uintptr_t)blk.spd_array[1];
+	if (blk.spd_array[1] == NULL) {
+		memcfg.spd[2].read_type = NOT_EXISTING;
+	} else {
+		memcfg.spd[2].read_type = READ_SPD_MEMPTR;
+		memcfg.spd[2].spd_spec.spd_data_ptr_info.spd_data_len = blk.len;
+		memcfg.spd[2].spd_spec.spd_data_ptr_info.spd_data_ptr = (uintptr_t)blk.spd_array[1];
+	}

memcfg.spd[3].read_type = NOT_EXISTING;
    dump_spd_info(&blk);