GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/intel/sandybridge: Refactor `dram_find_spds_ddr3` 

Pointers to structs can be very useful, especially when they point to an
array element. In this case, changing one pointer allows the function to
be rewritten more concisely, since most redundancy can be eliminated.

Tested on Asus P8Z77-V LX2, still boots. No functional difference.

Change-Id: I7f0c37ea49db640f197162f371165a6f8e9c1b9c
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48612
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Angel Pons 2020-12-12 16:57:37 +01:00 committed by Felix Held
parent 9f4ed3b550
commit 323c0aeb64
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/northbridge/intel/sandybridge/raminit.c
View File

@ -153,7 +153,6 @@ static void dram_find_spds_ddr3(spd_raw_data *spd, ramctr_timing *ctrl)
int dimms = 0, ch_dimms; int dimms = 0, ch_dimms;
int channel, slot, spd_slot; int channel, slot, spd_slot;
bool can_use_ecc = ctrl->ecc_supported; bool can_use_ecc = ctrl->ecc_supported;
dimm_info *dimm = &ctrl->info;
memset (ctrl->rankmap, 0, sizeof(ctrl->rankmap)); memset (ctrl->rankmap, 0, sizeof(ctrl->rankmap));
@ -176,69 +175,67 @@ static void dram_find_spds_ddr3(spd_raw_data *spd, ramctr_timing *ctrl)
spd_slot = 2 * channel + slot; spd_slot = 2 * channel + slot;
printk(BIOS_DEBUG, "SPD probe channel%d, slot%d\n", channel, slot); printk(BIOS_DEBUG, "SPD probe channel%d, slot%d\n", channel, slot);
dimm_attr *const dimm = &ctrl->info.dimm[channel][slot];
/* Search for XMP profile */ /* Search for XMP profile */
spd_xmp_decode_ddr3(&dimm->dimm[channel][slot], spd[spd_slot], spd_xmp_decode_ddr3(dimm, spd[spd_slot],
DDR3_XMP_PROFILE_1); DDR3_XMP_PROFILE_1);
if (dimm->dimm[channel][slot].dram_type != SPD_MEMORY_TYPE_SDRAM_DDR3) { if (dimm->dram_type != SPD_MEMORY_TYPE_SDRAM_DDR3) {
printram("No valid XMP profile found.\n"); printram("No valid XMP profile found.\n");
spd_decode_ddr3(&dimm->dimm[channel][slot], spd[spd_slot]); spd_decode_ddr3(dimm, spd[spd_slot]);
} else if (ch_dimms > dimm->dimm[channel][slot].dimms_per_channel) { } else if (ch_dimms > dimm->dimms_per_channel) {
printram( printram(
"XMP profile supports %u DIMMs, but %u DIMMs are installed.\n", "XMP profile supports %u DIMMs, but %u DIMMs are installed.\n",
dimm->dimm[channel][slot].dimms_per_channel, ch_dimms); dimm->dimms_per_channel, ch_dimms);
if (CONFIG(NATIVE_RAMINIT_IGNORE_XMP_MAX_DIMMS)) if (CONFIG(NATIVE_RAMINIT_IGNORE_XMP_MAX_DIMMS))
printk(BIOS_WARNING, printk(BIOS_WARNING,
"XMP maximum DIMMs will be ignored.\n"); "XMP maximum DIMMs will be ignored.\n");
else else
spd_decode_ddr3(&dimm->dimm[channel][slot], spd_decode_ddr3(dimm, spd[spd_slot]);
spd[spd_slot]);
} else if (dimm->dimm[channel][slot].voltage != 1500) { } else if (dimm->voltage != 1500) {
/* TODO: Support DDR3 voltages other than 1500mV */ /* TODO: Support DDR3 voltages other than 1500mV */
printram("XMP profile's requested %u mV is unsupported.\n", printram("XMP profile's requested %u mV is unsupported.\n",
dimm->dimm[channel][slot].voltage); dimm->voltage);
spd_decode_ddr3(&dimm->dimm[channel][slot], spd[spd_slot]); spd_decode_ddr3(dimm, spd[spd_slot]);
} }
/* Fill in CRC16 for MRC cache */ /* Fill in CRC16 for MRC cache */
ctrl->spd_crc[channel][slot] = ctrl->spd_crc[channel][slot] =
spd_ddr3_calc_unique_crc(spd[spd_slot], sizeof(spd_raw_data)); spd_ddr3_calc_unique_crc(spd[spd_slot], sizeof(spd_raw_data));
if (dimm->dimm[channel][slot].dram_type != SPD_MEMORY_TYPE_SDRAM_DDR3) { if (dimm->dram_type != SPD_MEMORY_TYPE_SDRAM_DDR3) {
/* Mark DIMM as invalid */ /* Mark DIMM as invalid */
dimm->dimm[channel][slot].ranks = 0; dimm->ranks = 0;
dimm->dimm[channel][slot].size_mb = 0; dimm->size_mb = 0;
continue; continue;
} }
dram_print_spd_ddr3(&dimm->dimm[channel][slot]); dram_print_spd_ddr3(dimm);
dimms++; dimms++;
ctrl->rank_mirror[channel][slot * 2] = 0; ctrl->rank_mirror[channel][slot * 2] = 0;
ctrl->rank_mirror[channel][slot * 2 + 1] = ctrl->rank_mirror[channel][slot * 2 + 1] = dimm->flags.pins_mirrored;
dimm->dimm[channel][slot].flags.pins_mirrored;
ctrl->channel_size_mb[channel] += dimm->dimm[channel][slot].size_mb; ctrl->channel_size_mb[channel] += dimm->size_mb;
if (!dimm->dimm[channel][slot].flags.is_ecc) if (!dimm->flags.is_ecc)
can_use_ecc = false; can_use_ecc = false;
ctrl->auto_self_refresh &= dimm->dimm[channel][slot].flags.asr; ctrl->auto_self_refresh &= dimm->flags.asr;
ctrl->extended_temperature_range &= ctrl->extended_temperature_range &= dimm->flags.ext_temp_refresh;
dimm->dimm[channel][slot].flags.ext_temp_refresh;
ctrl->rankmap[channel] |= ctrl->rankmap[channel] |= ((1 << dimm->ranks) - 1) << (2 * slot);
((1 << dimm->dimm[channel][slot].ranks) - 1) << (2 * slot);
printk(BIOS_DEBUG, "channel[%d] rankmap = 0x%x\n", channel, printk(BIOS_DEBUG, "channel[%d] rankmap = 0x%x\n", channel,
ctrl->rankmap[channel]); ctrl->rankmap[channel]);
} }
if ((ctrl->rankmap[channel] & 0x03) && (ctrl->rankmap[channel] & 0x0c) if ((ctrl->rankmap[channel] & 0x03) && (ctrl->rankmap[channel] & 0x0c)
&& dimm->dimm[channel][0].reference_card <= 5 && ctrl->info.dimm[channel][0].reference_card <= 5
&& dimm->dimm[channel][1].reference_card <= 5) { && ctrl->info.dimm[channel][1].reference_card <= 5) {
const int ref_card_offset_table[6][6] = { const int ref_card_offset_table[6][6] = {
{ 0, 0, 0, 0, 2, 2 }, { 0, 0, 0, 0, 2, 2 },
@ -249,8 +246,8 @@ static void dram_find_spds_ddr3(spd_raw_data *spd, ramctr_timing *ctrl)
{ 2, 2, 2, 1, 0, 0 }, { 2, 2, 2, 1, 0, 0 },
}; };
ctrl->ref_card_offset[channel] = ref_card_offset_table ctrl->ref_card_offset[channel] = ref_card_offset_table
[dimm->dimm[channel][0].reference_card] [ctrl->info.dimm[channel][0].reference_card]
[dimm->dimm[channel][1].reference_card]; [ctrl->info.dimm[channel][1].reference_card];
} else { } else {
ctrl->ref_card_offset[channel] = 0; ctrl->ref_card_offset[channel] = 0;
} }