[coreboot-gerrit] Change in coreboot[master]: soc/mediatek/mt8183: Transfer ddr geometry type to dram blob

[Hung-Te Lin (Code Review)]

Hung-Te Lin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/43796 )

Change subject: soc/mediatek/mt8183: Transfer ddr geometry type to dram blob
......................................................................

soc/mediatek/mt8183: Transfer ddr geometry type to dram blob

BUG=none
BRANCH=kukui
TEST=Boots correctly on Kukui

Change-Id: I3a677195f5036321939c60c8f9f1bace7c4a2e3f
Signed-off-by: Huayang Duan 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43796
Tested-by: build bot (Jenkins) 
Reviewed-by: Hung-Te Lin 
Reviewed-by: Yu-Ping Wu 
---
M src/soc/mediatek/mt8183/memory.c
1 file changed, 8 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Hung-Te Lin: Looks good to me, approved
  Yu-Ping Wu: Looks good to me, approved

diff --git a/src/soc/mediatek/mt8183/memory.c b/src/soc/mediatek/mt8183/memory.c
index ff30f67..6b80a43 100644
--- a/src/soc/mediatek/mt8183/memory.c
+++ b/src/soc/mediatek/mt8183/memory.c
@@ -97,7 +97,8 @@
    return 0;
 }

-static int dram_run_full_calibration(struct dramc_param *dparam, u16 config)
+static int dram_run_full_calibration(struct dramc_param *dparam,
+				     u32 ddr_geometry, u16 config)
 {
    initialize_dramc_param(dparam, config);

@@ -111,6 +112,8 @@
    	return -2;

dparam->do_putc = do_putchar;
+	dparam->freq_params[0].ddr_geometry = ddr_geometry;
+	printk(BIOS_INFO, "ddr_geometry: %d, config: %#x\n", ddr_geometry, config);
    prog_set_entry(&dram, prog_entry(&dram), dparam);
    prog_run(&dram);

@@ -184,9 +187,11 @@
    	       "Failed to read calibration data from flash\n");
    }

+	const struct sdram_params *sdram_cfg = get_sdram_config();
+
    /* Run full calibration */
    printk(BIOS_INFO, "DRAM-K: Full Calibration\n");
-	int err = dram_run_full_calibration(dparam, config);
+	int err = dram_run_full_calibration(dparam, sdram_cfg->ddr_geometry, config);
    if (err == 0) {
    	printk(BIOS_INFO, "Successfully loaded DRAM blobs and "
    	       "ran DRAM calibration\n");
@@ -211,7 +216,7 @@

/* Init params from sdram configs and run partial calibration */
    printk(BIOS_INFO, "DRAM-K: Partial Calibration\n");
-	init_sdram_params(dparam->freq_params, get_sdram_config());
+	init_sdram_params(dparam->freq_params, sdram_cfg);
    if (mt_set_emi(dparam) != 0)
    	die("Set emi failed with params from sdram config\n");
    if (mt_mem_test() != 0)