src/soc/intel/common/smbios: Add addtional infos to dimm_info

Add ECC Support and VDD Voltage to dimm_info struct. Now Bus Width
and ECCSupport will be propagated correctly in SMBIOS Type 17 Entry.

Change-Id: Ic6f0d4b223f1490ec7aa71a6105603635b514021
Signed-off-by: Christian Walter <christian.walter@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33031
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

9 files changed, 42 insertions, 7 deletions

diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c
index bf627f280f..54c2b09c4a 100644
--- a/src/arch/x86/smbios.c
+++ b/src/arch/x86/smbios.c
@@ -372,6 +372,11 @@ static int create_smbios_type17_for_dimm(struct dimm_info *dimm,
 	dimm->module_part_number[DIMM_INFO_PART_NUMBER_SIZE - 1] = '\0';
 	smbios_fill_dimm_part_number((char *)dimm->module_part_number, t);
 
+	/* Voltage Levels */
+	t->configured_voltage = dimm->vdd_voltage;
+	t->minimum_voltage = dimm->vdd_voltage;
+	t->maximum_voltage = dimm->vdd_voltage;
+
 	/* Synchronous = 1 */
 	t->type_detail = 0x0080;
 	/* no handle for error information */
diff --git a/src/include/memory_info.h b/src/include/memory_info.h
index 93c7b6bfc9..ad3c1775f9 100644
--- a/src/include/memory_info.h
+++ b/src/include/memory_info.h
@@ -86,6 +86,10 @@ struct dimm_info {
 	 * See the smbios.h smbios_memory_bus_width enum.
 	 */
 	uint8_t bus_width;
+	/*
+	 * Voltage Level
+	 */
+	uint16_t vdd_voltage;
 } __packed;
 
 struct memory_info {
diff --git a/src/soc/intel/apollolake/meminit_util_apl.c b/src/soc/intel/apollolake/meminit_util_apl.c
index b272a99efe..16d14d945f 100644
--- a/src/soc/intel/apollolake/meminit_util_apl.c
+++ b/src/soc/intel/apollolake/meminit_util_apl.c
@@ -91,7 +91,9 @@ void save_lpddr4_dimm_info_part_num(const char *dram_part_num)
 				dram_part_num,
 				strlen(dram_part_num),
 				NULL, /* SPD not available */
-				memory_info_hob->DataWidth);
+				memory_info_hob->DataWidth,
+				0,
+				0);
 			index++;
 		}
 	}
diff --git a/src/soc/intel/apollolake/meminit_util_glk.c b/src/soc/intel/apollolake/meminit_util_glk.c
index 29dcd56767..59e133076a 100644
--- a/src/soc/intel/apollolake/meminit_util_glk.c
+++ b/src/soc/intel/apollolake/meminit_util_glk.c
@@ -97,7 +97,9 @@ void save_lpddr4_dimm_info_part_num(const char *dram_part_num)
 				    dram_part_num,
 				    strlen(dram_part_num),
 				    src_dimm->SpdSave + SPD_SAVE_OFFSET_SERIAL,
-				    memory_info_hob->DataWidth);
+				    memory_info_hob->DataWidth,
+				    0,
+				    0);
 				index++;
 			}
 		}
diff --git a/src/soc/intel/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c
index 98d4c006a8..fa530a29a6 100644
--- a/src/soc/intel/cannonlake/romstage/romstage.c
+++ b/src/soc/intel/cannonlake/romstage/romstage.c
@@ -101,6 +101,8 @@ static void save_dimm_info(void)
 			mainboard_get_dram_part_num(&dram_part_num,
 							&dram_part_num_len);
 
+			u8 memProfNum = memory_info_hob->MemoryProfile;
+
 			/* Populate the DIMM information */
 			dimm_info_fill(dest_dimm,
 				src_dimm->DimmCapacity,
@@ -112,7 +114,9 @@ static void save_dimm_info(void)
 				dram_part_num,
 				dram_part_num_len,
 				src_dimm->SpdSave + SPD_SAVE_OFFSET_SERIAL,
-				memory_info_hob->DataWidth);
+				memory_info_hob->DataWidth,
+				memory_info_hob->VddVoltage[memProfNum],
+				memory_info_hob->EccSupport);
 			index++;
 		}
 	}
diff --git a/src/soc/intel/common/smbios.c b/src/soc/intel/common/smbios.c
index d89e9d5827..e3ed3a2e69 100644
--- a/src/soc/intel/common/smbios.c
+++ b/src/soc/intel/common/smbios.c
@@ -22,7 +22,8 @@
 void dimm_info_fill(struct dimm_info *dimm, u32 dimm_capacity, u8 ddr_type,
 		u32 frequency, u8 rank_per_dimm, u8 channel_id, u8 dimm_id,
 		const char *module_part_num, size_t module_part_number_size,
-		const u8 *module_serial_num, u16 data_width)
+		const u8 *module_serial_num, u16 data_width, u32 vdd_voltage,
+		bool ecc_support)
 {
 	dimm->dimm_size = dimm_capacity;
 	dimm->ddr_type = ddr_type;
@@ -30,6 +31,12 @@ void dimm_info_fill(struct dimm_info *dimm, u32 dimm_capacity, u8 ddr_type,
 	dimm->rank_per_dimm = rank_per_dimm;
 	dimm->channel_num = channel_id;
 	dimm->dimm_num = dimm_id;
+	if (vdd_voltage > 0xFFFF) {
+		dimm->vdd_voltage = 0xFFFF;
+	} else {
+		dimm->vdd_voltage = vdd_voltage;
+	}
+
 	strncpy((char *)dimm->module_part_number,
 			module_part_num,
 			min(sizeof(dimm->module_part_number),
@@ -57,4 +64,7 @@ void dimm_info_fill(struct dimm_info *dimm, u32 dimm_capacity, u8 ddr_type,
 		printk(BIOS_NOTICE, "Incorrect DIMM Data width: %u\n",
 		       (unsigned int)data_width);
 	}
+
+	if (ecc_support)
+		dimm->bus_width |= 0x8;
 }
diff --git a/src/soc/intel/common/smbios.h b/src/soc/intel/common/smbios.h
index 5824f5d665..12b8da0d85 100644
--- a/src/soc/intel/common/smbios.h
+++ b/src/soc/intel/common/smbios.h
@@ -26,6 +26,7 @@
 void dimm_info_fill(struct dimm_info *dimm, u32 dimm_capacity, u8 ddr_type,
 		u32 frequency, u8 rank_per_dimm, u8 channel_id, u8 dimm_id,
 		const char *module_part_num, size_t module_part_number_size,
-		const u8 *module_serial_num, u16 data_width);
+		const u8 *module_serial_num, u16 data_width, u32 vdd_voltage,
+		bool ecc_support);
 
 #endif /* _COMMON_SMBIOS_H_ */
diff --git a/src/soc/intel/icelake/romstage/romstage.c b/src/soc/intel/icelake/romstage/romstage.c
index 179d99cff6..a09641cf44 100644
--- a/src/soc/intel/icelake/romstage/romstage.c
+++ b/src/soc/intel/icelake/romstage/romstage.c
@@ -86,6 +86,8 @@ static void save_dimm_info(void)
 			if (src_dimm->Status != DIMM_PRESENT)
 				continue;
 
+			u8 memProfNum = memory_info_hob->MemoryProfile;
+
 			/* Populate the DIMM information */
 			dimm_info_fill(dest_dimm,
 				src_dimm->DimmCapacity,
@@ -97,7 +99,9 @@ static void save_dimm_info(void)
 				(const char *)src_dimm->ModulePartNum,
 				sizeof(src_dimm->ModulePartNum),
 				src_dimm->SpdSave + SPD_SAVE_OFFSET_SERIAL,
-				memory_info_hob->DataWidth);
+				memory_info_hob->DataWidth,
+				memory_info_hob->VddVoltage[memProfNum],
+				memory_info_hob->EccSupport);
 			index++;
 		}
 	}
diff --git a/src/soc/intel/skylake/romstage/romstage_fsp20.c b/src/soc/intel/skylake/romstage/romstage_fsp20.c
index 04c369beb8..2819c6f260 100644
--- a/src/soc/intel/skylake/romstage/romstage_fsp20.c
+++ b/src/soc/intel/skylake/romstage/romstage_fsp20.c
@@ -114,6 +114,7 @@ static void save_dimm_info(void)
 				ddr_type = MEMORY_TYPE_UNKNOWN;
 				break;
 			}
+			u8 memProfNum = memory_info_hob->MemoryProfile;
 
 			/* Populate the DIMM information */
 			dimm_info_fill(dest_dimm,
@@ -126,7 +127,9 @@ static void save_dimm_info(void)
 				(const char *)src_dimm->ModulePartNum,
 				sizeof(src_dimm->ModulePartNum),
 				src_dimm->SpdSave + SPD_SAVE_OFFSET_SERIAL,
-				memory_info_hob->DataWidth);
+				memory_info_hob->DataWidth,
+				memory_info_hob->VddVoltage[memProfNum],
+				memory_info_hob->EccSupport);
 			index++;
 		}
 	}