From 0bc878db192e585fa6bf73e81bbc10350d907c21 Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
Date: Tue, 16 Feb 2021 11:55:50 +0100
Subject: [PATCH] soc/intel/common/block/memory: Always write `data->spd_len`

The `data->spd_len` option always needs to be initialised. However, it
did not get set when using a mixed memory topology. Correct this bug.

Fixes: commit 859ca18ced83ed3b8b529112da5f214ede3d38b0
Change-Id: I8a165f000e5d52e49de18d7648d02fe76d2dd296
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50786
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/soc/intel/common/block/memory/meminit.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/soc/intel/common/block/memory/meminit.c b/src/soc/intel/common/block/memory/meminit.c
index 84987d612be7..17bf066ba28a 100644
--- a/src/soc/intel/common/block/memory/meminit.c
+++ b/src/soc/intel/common/block/memory/meminit.c
@@ -167,5 +167,7 @@ void mem_populate_channel_data(const struct soc_mem_cfg *soc_mem_cfg,
 		 */
 		if (spd_md_len != spd_dimm_len)
 			die("Length of SPD does not match for mixed topology!\n");
+
+		data->spd_len = spd_md_len;
 	}
 }