Change in coreboot[master]: lib: Use `smbios_bus_width_to_spd_width` for setting dimm.bus_width

[Subrata Banik (Code Review)]

Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/58655 )

Change subject: lib: Use `smbios_bus_width_to_spd_width` for setting dimm.bus_width
......................................................................

lib: Use `smbios_bus_width_to_spd_width` for setting dimm.bus_width

Make use of `smbios_bus_width_to_spd_width()` for filling DIMM info.

Additionally, ensures dimm_info_util.c file is getting compiled for
romstage.

TEST=dmidecode -t 17 output Total Width and Data Width as expected.

Change-Id: I7fdc19fadc576dec43e12f182fe088707e6654d9
Signed-off-by: Subrata Banik 
---
M src/lib/Makefile.inc
M src/soc/intel/common/smbios.c
2 files changed, 7 insertions(+), 21 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/58655/1

diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 8da875e..693a526 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -110,6 +110,7 @@
 romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c

romstage-y += compute_ip_checksum.c
+romstage-y += dimm_info_util.c
 ifeq ($(CONFIG_COMPILER_GCC),y)
 bootblock-$(CONFIG_ARCH_BOOTBLOCK_X86_32) += gcc.c
 verstage-$(CONFIG_ARCH_VERSTAGE_X86_32) += gcc.c
diff --git a/src/soc/intel/common/smbios.c b/src/soc/intel/common/smbios.c
index 9cbdecb..47033d3 100644
--- a/src/soc/intel/common/smbios.c
+++ b/src/soc/intel/common/smbios.c
@@ -6,6 +6,7 @@
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <device/dram/ddr3.h>
+#include <dimm_info_util.h>

/* 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,
@@ -56,27 +57,11 @@
    if (module_serial_num)
    	memcpy(dimm->serial, module_serial_num,
    	       DIMM_INFO_SERIAL_SIZE);
-	switch (data_width) {
-	case 8:
-		dimm->bus_width = MEMORY_BUS_WIDTH_8;
-		break;
-	case 16:
-		dimm->bus_width = MEMORY_BUS_WIDTH_16;
-		break;
-	case 32:
-		dimm->bus_width = MEMORY_BUS_WIDTH_32;
-		break;
-	case 64:
-		dimm->bus_width = MEMORY_BUS_WIDTH_64;
-		break;
-	case 128:
-		dimm->bus_width = MEMORY_BUS_WIDTH_128;
-		break;
-	default:
-		printk(BIOS_NOTICE, "Incorrect DIMM Data width: %u\n",
-		       (unsigned int)data_width);
-	}
+
+	uint16_t total_width = data_width;

if (ecc_support)
-		dimm->bus_width |= 0x8;
+		total_width += SPD_ECC_8BIT;
+
+	dimm->bus_width = smbios_bus_width_to_spd_width(total_width, data_width);
 }