GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/intel/sandybridge/raminit: fix regression "always use mrccache" 

Fix regression introduced by:
Ib48fe8380446846df17d37b22968f7d4fd6b9b13

Don't run channel_test on S3 resume as it overrides memory
that might be in use.
Fixes MCE events reported by the GNU/Linux kernel that
low memory has been modified.

Reset on failed s3 resume.

Change-Id: Ibadea286619c7906225f86a93aaa0b4caf26cabe
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-on: https://review.coreboot.org/14439
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Patrick Rudolph 2016-04-20 18:00:27 +02:00 committed by Nico Huber
parent fa6f861b57
commit 588ccaa9a7
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/northbridge/intel/sandybridge/raminit.c
View File

@ -4038,7 +4038,7 @@ static void restore_timings(ramctr_timing * ctrl)
} }
static int try_init_dram_ddr3(ramctr_timing *ctrl, int fast_boot, static int try_init_dram_ddr3(ramctr_timing *ctrl, int fast_boot,
int me_uma_size) int s3_resume, int me_uma_size)
{ {
int err; int err;
@ -4148,9 +4148,11 @@ static int try_init_dram_ddr3(ramctr_timing *ctrl, int fast_boot,
write_controller_mr(ctrl); write_controller_mr(ctrl);
err = channel_test(ctrl); if (!s3_resume) {
if (err) err = channel_test(ctrl);
return err; if (err)
return err;
}
return 0; return 0;
} }
@ -4228,9 +4230,14 @@ void init_dram_ddr3(spd_raw_data *spds, int mobile, int min_tck,
printk(BIOS_DEBUG, "Trying stored timings.\n"); printk(BIOS_DEBUG, "Trying stored timings.\n");
memcpy(&ctrl, ctrl_cached, sizeof(ctrl)); memcpy(&ctrl, ctrl_cached, sizeof(ctrl));
err = try_init_dram_ddr3(&ctrl, fast_boot, me_uma_size); err = try_init_dram_ddr3(&ctrl, fast_boot, s3resume, me_uma_size);
if (err) { if (err) {
/* no need to erase bad mrc cache here, it gets overritten on if (s3resume) {
/* Failed S3 resume, reset to come up cleanly */
outb(0x6, 0xcf9);
halt();
}
/* no need to erase bad mrc cache here, it gets overwritten on
* successful boot. */ * successful boot. */
printk(BIOS_ERR, "Stored timings are invalid !\n"); printk(BIOS_ERR, "Stored timings are invalid !\n");
fast_boot = 0; fast_boot = 0;
@ -4243,7 +4250,7 @@ void init_dram_ddr3(spd_raw_data *spds, int mobile, int min_tck,
/* Get DDR3 SPD data */ /* Get DDR3 SPD data */
dram_find_spds_ddr3(spds, &ctrl); dram_find_spds_ddr3(spds, &ctrl);
err = try_init_dram_ddr3(&ctrl, fast_boot, me_uma_size); err = try_init_dram_ddr3(&ctrl, fast_boot, s3resume, me_uma_size);
} }
if (err) if (err)
die("raminit failed"); die("raminit failed");