soc/mediatek: Save dramc_param header to mrc_cache

Fast-k flow may need to re-init header because mrc_cache doesn't
store header. Storing header together with dparam data is better
for data consistancy.

TEST=fast calibration pass on Corsola
BUG=b:204226005

Signed-off-by: Xi Chen <xixi.chen@mediatek.corp-partner.google.com>
Change-Id: I22982923dce06c9e770aa4f20f3dcd2f33685d84
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61294
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
This commit is contained in:
Xi Chen
2022-01-21 17:18:45 +08:00
committed by Hung-Te Lin
parent 20f836bfdf
commit f4bb77bd9e

View File

@@ -172,17 +172,15 @@ static void mem_init_set_default_config(struct dramc_param *dparam,
static void mt_mem_init_run(struct dramc_param *dparam, static void mt_mem_init_run(struct dramc_param *dparam,
const struct sdram_info *dram_info) const struct sdram_info *dram_info)
{ {
const ssize_t mrc_cache_size = sizeof(dparam->dramc_datas); const ssize_t mrc_cache_size = sizeof(*dparam);
ssize_t data_size; ssize_t data_size;
struct stopwatch sw; struct stopwatch sw;
int ret; int ret;
/* Load calibration params from flash and run fast calibration */ /* Load calibration params from flash and run fast calibration */
mem_init_set_default_config(dparam, dram_info);
data_size = mrc_cache_load_current(MRC_TRAINING_DATA, data_size = mrc_cache_load_current(MRC_TRAINING_DATA,
DRAMC_PARAM_HEADER_VERSION, DRAMC_PARAM_HEADER_VERSION,
&dparam->dramc_datas, dparam, mrc_cache_size);
mrc_cache_size);
if (data_size == mrc_cache_size) { if (data_size == mrc_cache_size) {
printk(BIOS_INFO, "DRAM-K: Running fast calibration\n"); printk(BIOS_INFO, "DRAM-K: Running fast calibration\n");
stopwatch_init(&sw); stopwatch_init(&sw);
@@ -194,11 +192,10 @@ static void mt_mem_init_run(struct dramc_param *dparam,
stopwatch_duration_msecs(&sw), ret); stopwatch_duration_msecs(&sw), ret);
/* Erase flash data after fast calibration failed */ /* Erase flash data after fast calibration failed */
memset(&dparam->dramc_datas, 0xa5, mrc_cache_size); memset(dparam, 0xa5, mrc_cache_size);
mrc_cache_stash_data(MRC_TRAINING_DATA, mrc_cache_stash_data(MRC_TRAINING_DATA,
DRAMC_PARAM_HEADER_VERSION, DRAMC_PARAM_HEADER_VERSION,
&dparam->dramc_datas, dparam, mrc_cache_size);
mrc_cache_size);
} else { } else {
printk(BIOS_INFO, "DRAM-K: Fast calibration passed in %ld msecs\n", printk(BIOS_INFO, "DRAM-K: Fast calibration passed in %ld msecs\n",
stopwatch_duration_msecs(&sw)); stopwatch_duration_msecs(&sw));
@@ -220,7 +217,7 @@ static void mt_mem_init_run(struct dramc_param *dparam,
stopwatch_duration_msecs(&sw)); stopwatch_duration_msecs(&sw));
mrc_cache_stash_data(MRC_TRAINING_DATA, mrc_cache_stash_data(MRC_TRAINING_DATA,
DRAMC_PARAM_HEADER_VERSION, DRAMC_PARAM_HEADER_VERSION,
&dparam->dramc_datas, mrc_cache_size); dparam, mrc_cache_size);
} else { } else {
printk(BIOS_ERR, "DRAM-K: Full calibration failed in %ld msecs\n", printk(BIOS_ERR, "DRAM-K: Full calibration failed in %ld msecs\n",
stopwatch_duration_msecs(&sw)); stopwatch_duration_msecs(&sw));