[coreboot-gerrit] Change in ...coreboot[master]: mb/google/poppy/var/nami: Ensure SPD index is non-zero

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33183 )

Change subject: mb/google/poppy/var/nami: Ensure SPD index is non-zero
......................................................................

mb/google/poppy/var/nami: Ensure SPD index is non-zero

Memory id's are 1-indexed for DDR4, so we need to check that the SPD
index is non-zero before converting it to the 0-indexed value in the
bitmap.

Change-Id: Icc542239d91c39b89c23f31856c28e7c20b2fc4d
Signed-off-by: Jacob Garber 
Found-by: Coverity CID 1387028
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33183
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
---
M src/mainboard/google/poppy/variants/nami/memory.c
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved

diff --git a/src/mainboard/google/poppy/variants/nami/memory.c b/src/mainboard/google/poppy/variants/nami/memory.c
index b7f5185..b6e3d2c 100644
--- a/src/mainboard/google/poppy/variants/nami/memory.c
+++ b/src/mainboard/google/poppy/variants/nami/memory.c
@@ -66,8 +66,12 @@
    p->type = MEMORY_DDR4;
    p->use_sec_spd = 0;

+	int spd_index = variant_memory_sku();
+	if (spd_index == 0)
+		die("SPD index is 0\n");
+
    /* Rcomp resistor values are different for SDP and DDP. */
-	if (ddp_bitmap & MEM_ID(variant_memory_sku())) {
+	if (ddp_bitmap & MEM_ID(spd_index)) {
    	p->rcomp_resistor = rcomp_resistor_ddp;
    	p->rcomp_resistor_size = sizeof(rcomp_resistor_ddp);
    } else {