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

soc/intel/tigerlake: Save DIMM info by available nodes 

TEST=Verified that dmidecode produces output identical to private repo

Signed-off-by: Jamie Ryu <jamie.m.ryu@intel.com>
Change-Id: I951ea94c280b7dd5b67f320a264d13fca82a4596
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39359
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Caveh Jalali <caveh@chromium.org>
Reviewed-by: Wonkyu Kim <wonkyu.kim@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Jamie Ryu 2019-11-05 19:19:29 -08:00 committed by Patrick Georgi
parent fe2a4c1001
commit a02f00e5d6
1 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/soc/intel/tigerlake/romstage/romstage.c
View File

@ -37,22 +37,23 @@
/* Save the DIMM information for SMBIOS table 17 */ /* Save the DIMM information for SMBIOS table 17 */
static void save_dimm_info(void) static void save_dimm_info(void)
{ {
int channel, dimm, dimm_max, index; int node, channel, dimm, dimm_max, index;
size_t hob_size; size_t hob_size;
const CONTROLLER_INFO *ctrlr_info; const CONTROLLER_INFO *ctrlr_info;
const CHANNEL_INFO *channel_info; const CHANNEL_INFO *channel_info;
const DIMM_INFO *src_dimm; const DIMM_INFO *src_dimm;
struct dimm_info *dest_dimm; struct dimm_info *dest_dimm;
struct memory_info *mem_info; struct memory_info *mem_info;
const MEMORY_INFO_DATA_HOB *memory_info_hob; const MEMORY_INFO_DATA_HOB *meminfo_hob;
const uint8_t smbios_memory_info_guid[16] = const uint8_t smbios_memory_info_guid[16] =
FSP_SMBIOS_MEMORY_INFO_GUID; FSP_SMBIOS_MEMORY_INFO_GUID;
const uint8_t *serial_num;
/* Locate the memory info HOB, presence validated by raminit */ /* Locate the memory info HOB, presence validated by raminit */
memory_info_hob = fsp_find_extension_hob_by_guid( meminfo_hob = fsp_find_extension_hob_by_guid(
smbios_memory_info_guid, smbios_memory_info_guid,
&hob_size); &hob_size);
if (memory_info_hob == NULL || hob_size == 0) { if (meminfo_hob == NULL || hob_size == 0) {
printk(BIOS_ERR, "SMBIOS MEMORY_INFO_DATA_HOB not found\n"); printk(BIOS_ERR, "SMBIOS MEMORY_INFO_DATA_HOB not found\n");
return; return;
} }
@ -68,40 +69,46 @@ static void save_dimm_info(void)
} }
memset(mem_info, 0, sizeof(*mem_info)); memset(mem_info, 0, sizeof(*mem_info));
/* Describe the first N DIMMs in the system */ /* Save available DIMM information */
index = 0; index = 0;
dimm_max = ARRAY_SIZE(mem_info->dimm); dimm_max = ARRAY_SIZE(mem_info->dimm);
ctrlr_info = &memory_info_hob->Controller[0]; for (node = 0; node < MAX_NODE; node++) {
for (channel = 0; channel < MAX_CH && index < dimm_max; channel++) { ctrlr_info = &meminfo_hob->Controller[node];
channel_info = &ctrlr_info->ChannelInfo[channel]; for (channel = 0; channel < MAX_CH && index < dimm_max;
if (channel_info->Status != CHANNEL_PRESENT) channel++) {
continue; channel_info = &ctrlr_info->ChannelInfo[channel];
for (dimm = 0; dimm < MAX_DIMM && index < dimm_max; dimm++) { if (channel_info->Status != CHANNEL_PRESENT)
src_dimm = &channel_info->DimmInfo[dimm];
dest_dimm = &mem_info->dimm[index];
if (src_dimm->Status != DIMM_PRESENT)
continue; continue;
u8 memProfNum = memory_info_hob->MemoryProfile; for (dimm = 0; dimm < MAX_DIMM && index < dimm_max;
dimm++) {
src_dimm = &channel_info->DimmInfo[dimm];
dest_dimm = &mem_info->dimm[index];
if (src_dimm->Status != DIMM_PRESENT)
continue;
/* Populate the DIMM information */ u8 memProfNum = meminfo_hob->MemoryProfile;
dimm_info_fill(dest_dimm, serial_num = src_dimm->SpdSave +
src_dimm->DimmCapacity, SPD_SAVE_OFFSET_SERIAL;
memory_info_hob->MemoryType,
memory_info_hob->ConfiguredMemoryClockSpeed, /* Populate the DIMM information */
src_dimm->RankInDimm, dimm_info_fill(dest_dimm,
channel_info->ChannelId, src_dimm->DimmCapacity,
src_dimm->DimmId, meminfo_hob->MemoryType,
(const char *)src_dimm->ModulePartNum, meminfo_hob->ConfiguredMemoryClockSpeed,
sizeof(src_dimm->ModulePartNum), src_dimm->RankInDimm,
src_dimm->SpdSave + SPD_SAVE_OFFSET_SERIAL, channel_info->ChannelId,
memory_info_hob->DataWidth, src_dimm->DimmId,
memory_info_hob->VddVoltage[memProfNum], (const char *)src_dimm->ModulePartNum,
memory_info_hob->EccSupport, sizeof(src_dimm->ModulePartNum),
src_dimm->MfgId, serial_num,
src_dimm->SpdModuleType); meminfo_hob->DataWidth,
index++; meminfo_hob->VddVoltage[memProfNum],
meminfo_hob->EccSupport,
src_dimm->MfgId,
src_dimm->SpdModuleType);
index++;
}
} }
} }
mem_info->dimm_cnt = index; mem_info->dimm_cnt = index;