From 6de8b424824069345714001766b389f0b992df8e Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Tue, 26 Oct 2021 20:46:21 +0530 Subject: arch/x86: Refactor the SMBIOS type 17 write function List of changes: 1. Create Module Type macros as per Memory Type (i.e. DDR2/DDR3/DDR4/DDR5/LPDDR4/LPDDR5) and fix compilation issue due to renaming of existing macros due to scoping the Memory Type. 2. Use dedicated Memory Type and Module type for `Form Factor` and `TypeDetail` conversion using `get_spd_info()` function. 3. Create a new API (convert_form_factor_to_module_type()) for `Form Factor` to 'Module type' conversion as per `Memory Type`. 4. Add new argument as `Memory Type` to smbios_form_factor_to_spd_mod_type() so that it can internally call convert_form_factor_to_module_type() for `Module Type` conversion. 5. Update `test_smbios_form_factor_to_spd_mod_type()` to accommodate different memory types. 6. Skip fixed module type to form factor conversion using DDR2 SPD4 specification (inside dimm_info_fill()). Refer to datasheet SPD4.1.2.M-1 for LPDDRx and SPD4.1.2.L-3 for DDRx. BUG=b:194659789 TEST=Refer to dmidecode -t 17 output as below: Without this code change: Handle 0x0012, DMI type 17, 40 bytes Memory Device Array Handle: 0x000A Error Information Handle: Not Provided Total Width: 16 bits Data Width: 16 bits Size: 2048 MB Form Factor: Unknown .... With this code change: Handle 0x0012, DMI type 17, 40 bytes Memory Device Array Handle: 0x000A Error Information Handle: Not Provided Total Width: 16 bits Data Width: 16 bits Size: 2048 MB Form Factor: Row Of Chips .... Change-Id: Ia337ac8f50b61ae78d86a07c7a86aa9c248bad50 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/56628 Tested-by: build bot (Jenkins) Reviewed-by: Jakub Czapiga Reviewed-by: Tim Wawrzynczak --- src/lib/dimm_info_util.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/lib') diff --git a/src/lib/dimm_info_util.c b/src/lib/dimm_info_util.c index 0e7cc12f18..3507366a3d 100644 --- a/src/lib/dimm_info_util.c +++ b/src/lib/dimm_info_util.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include #include #include #include @@ -72,18 +73,8 @@ uint32_t smbios_memory_size_to_mib(uint16_t memory_size, uint32_t extended_size) return memory_size; } -uint8_t -smbios_form_factor_to_spd_mod_type(smbios_memory_form_factor form_factor) +uint8_t smbios_form_factor_to_spd_mod_type(smbios_memory_type memory_type, + smbios_memory_form_factor form_factor) { - /* This switch reverses the switch in smbios.c */ - switch (form_factor) { - case MEMORY_FORMFACTOR_DIMM: - return SPD_UDIMM; - case MEMORY_FORMFACTOR_RIMM: - return SPD_RDIMM; - case MEMORY_FORMFACTOR_SODIMM: - return SPD_SODIMM; - default: - return SPD_UNDEFINED; - } + return convert_form_factor_to_module_type(memory_type, form_factor); } -- cgit v1.2.3