diff options
| author | Jacob Garber <jgarber1@ualberta.ca> | 2019-06-03 17:17:11 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2019-06-14 19:56:38 +0000 |
| commit | fb5a83df3c557c9105b17b49e08219a61155c520 (patch) | |
| tree | 5d7856d66e298d074005cf28604c989a277a7878 | |
| parent | 8cf8a6375e5a9acfe418d3f48a9942d7356aac41 (diff) | |
| download | coreboot-fb5a83df3c557c9105b17b49e08219a61155c520.tar.xz | |
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 <jgarber1@ualberta.ca>
Found-by: Coverity CID 1387028
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33183
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/memory.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mainboard/google/poppy/variants/nami/memory.c b/src/mainboard/google/poppy/variants/nami/memory.c index b7f51851c7..b6e3d2cd08 100644 --- a/src/mainboard/google/poppy/variants/nami/memory.c +++ b/src/mainboard/google/poppy/variants/nami/memory.c @@ -66,8 +66,12 @@ static void fill_ddr4_memory_params(struct memory_params *p) 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 { |