diff options
Diffstat (limited to 'src/soc/intel/common/block/memory')
| -rw-r--r-- | src/soc/intel/common/block/memory/meminit.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/soc/intel/common/block/memory/meminit.c b/src/soc/intel/common/block/memory/meminit.c index f583213254..3c310798d0 100644 --- a/src/soc/intel/common/block/memory/meminit.c +++ b/src/soc/intel/common/block/memory/meminit.c @@ -115,8 +115,9 @@ static bool read_spd_dimm(FSPM_UPD *memupd, const struct soc_mem_cfg *soc_mem_cf for (ch = 0; ch < num_phys_ch; ch++) { for (dimm = 0; dimm < CONFIG_DIMMS_PER_CHANNEL; dimm++) { - blk.addr_map[CH_DIMM_OFFSET(ch, dimm)] = - info->smbus[ch].addr_dimm[dimm]; + if (CH_DIMM_OFFSET(ch, dimm) < ARRAY_SIZE(blk.addr_map)) + blk.addr_map[CH_DIMM_OFFSET(ch, dimm)] = + info->smbus[ch].addr_dimm[dimm]; } } @@ -167,6 +168,8 @@ static bool read_spd_dimm(FSPM_UPD *memupd, const struct soc_mem_cfg *soc_mem_cf size_t mrc_ch = soc_mem_cfg->phys_to_mrc_map[ch]; for (dimm = 0; dimm < CONFIG_DIMMS_PER_CHANNEL; dimm++) { + if (!(CH_DIMM_OFFSET(ch, dimm) < ARRAY_SIZE(blk.spd_array))) + continue; uint8_t *spd_data = blk.spd_array[CH_DIMM_OFFSET(ch, dimm)]; if (spd_data == NULL) continue; |