Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/51896 )
Change subject: device/dram/ddr3: Rename DDR3 SPD memory types ......................................................................
device/dram/ddr3: Rename DDR3 SPD memory types
To avoid name clashes with definitions for other DRAM generations, rename the enum type and values to contain `ddr3` or `DDR3`.
Change-Id: If3710149ba94b94ed14f03e32f5e1533b4bc25c8 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/51896 Reviewed-by: Michael Niewöhner foss@mniewoehner.de Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/device/dram/ddr3.c M src/include/device/dram/ddr3.h M src/soc/intel/common/smbios.c 3 files changed, 34 insertions(+), 34 deletions(-)
Approvals: build bot (Jenkins): Verified Michael Niewöhner: Looks good to me, approved
diff --git a/src/device/dram/ddr3.c b/src/device/dram/ddr3.c index b38e0a1..d28bfbe 100644 --- a/src/device/dram/ddr3.c +++ b/src/device/dram/ddr3.c @@ -27,11 +27,11 @@ * * @param type DIMM type. This is byte[3] of the SPD. */ -int spd_dimm_is_registered_ddr3(enum spd_dimm_type type) +int spd_dimm_is_registered_ddr3(enum spd_dimm_type_ddr3 type) { - if ((type == SPD_DIMM_TYPE_RDIMM) - | (type == SPD_DIMM_TYPE_MINI_RDIMM) - | (type == SPD_DIMM_TYPE_72B_SO_RDIMM)) + if ((type == SPD_DDR3_DIMM_TYPE_RDIMM) + | (type == SPD_DDR3_DIMM_TYPE_MINI_RDIMM) + | (type == SPD_DDR3_DIMM_TYPE_72B_SO_RDIMM)) return 1;
return 0; @@ -544,22 +544,22 @@ dimm->mod_id = info->manufacturer_id;
switch (info->dimm_type) { - case SPD_DIMM_TYPE_SO_DIMM: + case SPD_DDR3_DIMM_TYPE_SO_DIMM: dimm->mod_type = SPD_SODIMM; break; - case SPD_DIMM_TYPE_72B_SO_CDIMM: + case SPD_DDR3_DIMM_TYPE_72B_SO_CDIMM: dimm->mod_type = SPD_72B_SO_CDIMM; break; - case SPD_DIMM_TYPE_72B_SO_RDIMM: + case SPD_DDR3_DIMM_TYPE_72B_SO_RDIMM: dimm->mod_type = SPD_72B_SO_RDIMM; break; - case SPD_DIMM_TYPE_UDIMM: + case SPD_DDR3_DIMM_TYPE_UDIMM: dimm->mod_type = SPD_UDIMM; break; - case SPD_DIMM_TYPE_RDIMM: + case SPD_DDR3_DIMM_TYPE_RDIMM: dimm->mod_type = SPD_RDIMM; break; - case SPD_DIMM_TYPE_UNDEFINED: + case SPD_DDR3_DIMM_TYPE_UNDEFINED: default: dimm->mod_type = SPD_UNDEFINED; break; diff --git a/src/include/device/dram/ddr3.h b/src/include/device/dram/ddr3.h index 6afcceb..17910ff 100644 --- a/src/include/device/dram/ddr3.h +++ b/src/include/device/dram/ddr3.h @@ -51,23 +51,23 @@ * Module type (byte 3, bits 3:0) of SPD * This definition is specific to DDR3. DDR2 SPDs have a different structure. */ -enum spd_dimm_type { - SPD_DIMM_TYPE_UNDEFINED = 0x00, - SPD_DIMM_TYPE_RDIMM = 0x01, - SPD_DIMM_TYPE_UDIMM = 0x02, - SPD_DIMM_TYPE_SO_DIMM = 0x03, - SPD_DIMM_TYPE_MICRO_DIMM = 0x04, - SPD_DIMM_TYPE_MINI_RDIMM = 0x05, - SPD_DIMM_TYPE_MINI_UDIMM = 0x06, - SPD_DIMM_TYPE_MINI_CDIMM = 0x07, - SPD_DIMM_TYPE_72B_SO_UDIMM = 0x08, - SPD_DIMM_TYPE_72B_SO_RDIMM = 0x09, - SPD_DIMM_TYPE_72B_SO_CDIMM = 0x0a, - SPD_DIMM_TYPE_LRDIMM = 0x0b, - SPD_DIMM_TYPE_16B_SO_DIMM = 0x0c, - SPD_DIMM_TYPE_32B_SO_DIMM = 0x0d, +enum spd_dimm_type_ddr3 { + SPD_DDR3_DIMM_TYPE_UNDEFINED = 0x00, + SPD_DDR3_DIMM_TYPE_RDIMM = 0x01, + SPD_DDR3_DIMM_TYPE_UDIMM = 0x02, + SPD_DDR3_DIMM_TYPE_SO_DIMM = 0x03, + SPD_DDR3_DIMM_TYPE_MICRO_DIMM = 0x04, + SPD_DDR3_DIMM_TYPE_MINI_RDIMM = 0x05, + SPD_DDR3_DIMM_TYPE_MINI_UDIMM = 0x06, + SPD_DDR3_DIMM_TYPE_MINI_CDIMM = 0x07, + SPD_DDR3_DIMM_TYPE_72B_SO_UDIMM = 0x08, + SPD_DDR3_DIMM_TYPE_72B_SO_RDIMM = 0x09, + SPD_DDR3_DIMM_TYPE_72B_SO_CDIMM = 0x0a, + SPD_DDR3_DIMM_TYPE_LRDIMM = 0x0b, + SPD_DDR3_DIMM_TYPE_16B_SO_DIMM = 0x0c, + SPD_DDR3_DIMM_TYPE_32B_SO_DIMM = 0x0d, /* Masks to bits 3:0 to give the dimm type */ - SPD_DIMM_TYPE_MASK = 0x0f, + SPD_DDR3_DIMM_TYPE_MASK = 0x0f, };
/** @@ -120,7 +120,7 @@ */ struct dimm_attr_ddr3_st { enum spd_memory_type dram_type; - enum spd_dimm_type dimm_type; + enum spd_dimm_type_ddr3 dimm_type; u16 cas_supported; /* Flags extracted from SPD */ union dimm_flags_ddr3_st flags; @@ -173,7 +173,7 @@ u16 spd_ddr3_calc_crc(u8 *spd, int len); u16 spd_ddr3_calc_unique_crc(u8 *spd, int len); int spd_decode_ddr3(struct dimm_attr_ddr3_st *dimm, spd_raw_data spd_data); -int spd_dimm_is_registered_ddr3(enum spd_dimm_type type); +int spd_dimm_is_registered_ddr3(enum spd_dimm_type_ddr3 type); void dram_print_spd_ddr3(const struct dimm_attr_ddr3_st *dimm); int spd_xmp_decode_ddr3(struct dimm_attr_ddr3_st *dimm, spd_raw_data spd, diff --git a/src/soc/intel/common/smbios.c b/src/soc/intel/common/smbios.c index 5e3560c..9cbdecb 100644 --- a/src/soc/intel/common/smbios.c +++ b/src/soc/intel/common/smbios.c @@ -17,22 +17,22 @@ dimm->mod_id = mod_id; /* Translate to DDR2 module type field that SMBIOS code expects. */ switch (mod_type) { - case SPD_DIMM_TYPE_SO_DIMM: + case SPD_DDR3_DIMM_TYPE_SO_DIMM: dimm->mod_type = SPD_SODIMM; break; - case SPD_DIMM_TYPE_72B_SO_CDIMM: + case SPD_DDR3_DIMM_TYPE_72B_SO_CDIMM: dimm->mod_type = SPD_72B_SO_CDIMM; break; - case SPD_DIMM_TYPE_72B_SO_RDIMM: + case SPD_DDR3_DIMM_TYPE_72B_SO_RDIMM: dimm->mod_type = SPD_72B_SO_RDIMM; break; - case SPD_DIMM_TYPE_UDIMM: + case SPD_DDR3_DIMM_TYPE_UDIMM: dimm->mod_type = SPD_UDIMM; break; - case SPD_DIMM_TYPE_RDIMM: + case SPD_DDR3_DIMM_TYPE_RDIMM: dimm->mod_type = SPD_RDIMM; break; - case SPD_DIMM_TYPE_UNDEFINED: + case SPD_DDR3_DIMM_TYPE_UNDEFINED: default: dimm->mod_type = SPD_UNDEFINED; break;
-
Angel Pons (Code Review)