Francois Toguo Fotso has uploaded this change for review.

View Change

Fix for missing  mem_rank info in SMBIOS

Found-by: Google
BUG=None
TEST=Boot to OS:

Change-Id: I212215040e4786c258a9c604cc5c2bb62867c842
Signed-off-by: Francois Toguo <francois.toguo.fotso@intel.com>
---
M 3rdparty/blobs
M src/soc/intel/apollolake/meminit_util_apl.c
M src/soc/intel/apollolake/meminit_util_glk.c
M src/soc/intel/cannonlake/romstage/romstage.c
M src/soc/intel/common/smbios.c
M src/soc/intel/common/smbios.h
M src/soc/intel/icelake/romstage/romstage.c
M src/soc/intel/skylake/romstage/romstage_fsp20.c
8 files changed, 9 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/31235/1

diff --git a/3rdparty/blobs b/3rdparty/blobs
index 16058e5..678b4c4 160000
--- a/3rdparty/blobs
+++ b/3rdparty/blobs
@@ -1 +1 @@
-Subproject commit 16058e552279b4884b1f671e7a78752d28abd1cc
+Subproject commit 678b4c4a81069bb6e10e2e59f5374b83d727cd2b
diff --git a/src/soc/intel/apollolake/meminit_util_apl.c b/src/soc/intel/apollolake/meminit_util_apl.c
index 755d708..0112789 100644
--- a/src/soc/intel/apollolake/meminit_util_apl.c
+++ b/src/soc/intel/apollolake/meminit_util_apl.c
@@ -85,6 +85,7 @@
 				src_dimm->SizeInMb,
 				memory_info_hob->MemoryType,
 				memory_info_hob->MemoryFrequencyInMHz,
+				src_dimm->RankInDimm,
 				channel_info->ChannelId,
 				src_dimm->DimmId,
 				dram_part_num,
diff --git a/src/soc/intel/apollolake/meminit_util_glk.c b/src/soc/intel/apollolake/meminit_util_glk.c
index db69f51..9bfdf0b 100644
--- a/src/soc/intel/apollolake/meminit_util_glk.c
+++ b/src/soc/intel/apollolake/meminit_util_glk.c
@@ -91,6 +91,7 @@
 				    src_dimm->DimmCapacity,
 				    memory_info_hob->MemoryType,
 				    memory_info_hob->ConfiguredMemoryClockSpeed,
+				    src_dimm->RankInDimm,
 				    channel_info->ChannelId,
 				    src_dimm->DimmId,
 				    dram_part_num,
diff --git a/src/soc/intel/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c
index 9224ba6..24f1f12 100644
--- a/src/soc/intel/cannonlake/romstage/romstage.c
+++ b/src/soc/intel/cannonlake/romstage/romstage.c
@@ -93,6 +93,7 @@
 				src_dimm->DimmCapacity,
 				memory_info_hob->MemoryType,
 				memory_info_hob->ConfiguredMemoryClockSpeed,
+				src_dimm->RankInDimm,
 				channel_info->ChannelId,
 				src_dimm->DimmId,
 				(const char *)src_dimm->ModulePartNum,
diff --git a/src/soc/intel/common/smbios.c b/src/soc/intel/common/smbios.c
index bcddb78..d714a34 100644
--- a/src/soc/intel/common/smbios.c
+++ b/src/soc/intel/common/smbios.c
@@ -20,13 +20,14 @@
 
 /* Fill the SMBIOS memory information from FSP MEM_INFO_DATA_HOB in CBMEM.*/
 void dimm_info_fill(struct dimm_info *dimm, u32 dimm_capacity, u8 ddr_type,
-		u32 frequency, u8 channel_id, u8 dimm_id,
+		u32 frequency, u8 rankInDimm, u8 channel_id, u8 dimm_id,
 		const char *module_part_num, size_t module_part_number_size,
 		u16 data_width)
 {
 	dimm->dimm_size = dimm_capacity;
 	dimm->ddr_type = ddr_type;
 	dimm->ddr_frequency = frequency;
+	dimm->rank_per_dimm = rankInDimm;
 	dimm->channel_num = channel_id;
 	dimm->dimm_num = dimm_id;
 	strncpy((char *)dimm->module_part_number,
diff --git a/src/soc/intel/common/smbios.h b/src/soc/intel/common/smbios.h
index 4750d3c..022271d 100644
--- a/src/soc/intel/common/smbios.h
+++ b/src/soc/intel/common/smbios.h
@@ -21,7 +21,7 @@
 
 /* Fill the SMBIOS memory information from FSP MEM_INFO_DATA_HOB in CBMEM.*/
 void dimm_info_fill(struct dimm_info *dimm, u32 dimm_capacity, u8 ddr_type,
-		u32 frequency, u8 channel_id, u8 dimm_id,
+		u32 frequency, u8 rank_per_dim, u8 channel_id, u8 dimm_id,
 		const char *module_part_num, size_t module_part_number_size,
 		u16 data_width);
 
diff --git a/src/soc/intel/icelake/romstage/romstage.c b/src/soc/intel/icelake/romstage/romstage.c
index 432cae5..3951124 100644
--- a/src/soc/intel/icelake/romstage/romstage.c
+++ b/src/soc/intel/icelake/romstage/romstage.c
@@ -95,6 +95,7 @@
 				src_dimm->DimmCapacity,
 				memory_info_hob->MemoryType,
 				memory_info_hob->ConfiguredMemoryClockSpeed,
+				src_dimm->RankInDimm,
 				channel_info->ChannelId,
 				src_dimm->DimmId,
 				(const char *)src_dimm->ModulePartNum,
diff --git a/src/soc/intel/skylake/romstage/romstage_fsp20.c b/src/soc/intel/skylake/romstage/romstage_fsp20.c
index 2a60158..7a3509f 100644
--- a/src/soc/intel/skylake/romstage/romstage_fsp20.c
+++ b/src/soc/intel/skylake/romstage/romstage_fsp20.c
@@ -121,6 +121,7 @@
 				src_dimm->DimmCapacity,
 				ddr_type,
 				memory_info_hob->ConfiguredMemoryClockSpeed,
+				src_dimm->RankInDim,
 				channel_info->ChannelId,
 				src_dimm->DimmId,
 				(const char *)src_dimm->ModulePartNum,

To view, visit change 31235. To unsubscribe, or for help writing mail filters, visit settings.