mb/msi/ms7d25: Add support for DDR5 variant
The DDR5 board is almost identical to the DDR4 one. The only major
difference is the board's DDR5 memory design.
TEST=Boot MSI PRO Z690-A board successfully to Ubuntu 22.04. Memory:
Crucial CT8G48C40U5.M4A1 in all 4 slots.
Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
Change-Id: I652a879d1616df4708fe4690797ad98384897f53
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68448
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Krystian Hebel <krystian.hebel@3mdeb.com>
diff --git a/src/mainboard/msi/ms7d25/romstage_fsp_params.c b/src/mainboard/msi/ms7d25/romstage_fsp_params.c
index 9199a81..707f871 100644
--- a/src/mainboard/msi/ms7d25/romstage_fsp_params.c
+++ b/src/mainboard/msi/ms7d25/romstage_fsp_params.c
@@ -10,11 +10,25 @@
static const struct mb_cfg ddr4_mem_config = {
.type = MEM_TYPE_DDR4,
+ /* According to DOC #573387 rcomp values no longer have to be provided */
+ /* DDR DIMM configuration does not need to set DQ/DQS maps */
+ .UserBd = BOARD_TYPE_DESKTOP_2DPC,
+
+ .ddr_config = {
+ .dq_pins_interleaved = true,
+ },
+};
+
+static const struct mb_cfg ddr5_mem_config = {
+ .type = MEM_TYPE_DDR5,
+
+ .ect = true, /* Early Command Training */
/* According to DOC #573387 rcomp values no longer have to be provided */
/* DDR DIMM configuration does not need to set DQ/DQS maps */
+ .UserBd = BOARD_TYPE_DESKTOP_2DPC,
- .UserBd = BOARD_TYPE_DESKTOP_2DPC, /* FIXME */
+ .LpDdrDqDqsReTraining = 1,
.ddr_config = {
.dq_pins_interleaved = true,
@@ -54,7 +68,10 @@
*/
memupd->FspmConfig.GpioOverride = 0;
- memcfg_init(memupd, &ddr4_mem_config, &dimm_module_spd_info, false);
+ if (CONFIG(BOARD_MSI_Z690_A_PRO_WIFI_DDR4))
+ memcfg_init(memupd, &ddr4_mem_config, &dimm_module_spd_info, false);
+ if (CONFIG(BOARD_MSI_Z690_A_PRO_WIFI_DDR5))
+ memcfg_init(memupd, &ddr5_mem_config, &dimm_module_spd_info, false);
gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
}