summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/northbridge/intel/sandybridge/raminit.c44
1 files changed, 44 insertions, 0 deletions
diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c
index 3c606e17c2..0c191b2abd 100644
--- a/src/northbridge/intel/sandybridge/raminit.c
+++ b/src/northbridge/intel/sandybridge/raminit.c
@@ -201,6 +201,7 @@ typedef struct ramctr_timing_st {
#define MAX_TIMA 127
#define MAKE_ERR ((channel<<16)|(slotrank<<8)|1)
+#define GET_ERR_CHANNEL(x) (x>>16)
static void program_timings(ramctr_timing * ctrl, int channel);
@@ -241,6 +242,18 @@ static void toggle_io_reset(void) {
}
/*
+ * Disable a channel in ramctr_timing.
+ */
+static void disable_channel(ramctr_timing *ctrl, int channel) {
+ ctrl->rankmap[channel] = 0;
+ memset(&ctrl->rank_mirror[channel][0], 0, sizeof(ctrl->rank_mirror[0]));
+ ctrl->channel_size_mb[channel] = 0;
+ ctrl->cmd_stretch[channel] = 0;
+ ctrl->mad_dimm[channel] = 0;
+ memset(&ctrl->timings[channel][0], 0, sizeof(ctrl->timings[0]));
+}
+
+/*
* Fill cbmem with information for SMBIOS type 17.
*/
static void fill_smbios17(ramctr_timing *ctrl)
@@ -4252,6 +4265,37 @@ void init_dram_ddr3(spd_raw_data *spds, int mobile, int min_tck,
err = try_init_dram_ddr3(&ctrl, fast_boot, s3resume, me_uma_size);
}
+
+ if (err && (ctrl.tCK < TCK_400MHZ)) {
+ /* fallback: lower clock frequency */
+ printk(BIOS_ERR, "RAM training failed, trying fallback.\n");
+ printram("Decreasing clock frequency.\n");
+ ctrl.tCK++;
+ err = try_init_dram_ddr3(&ctrl, fast_boot, s3resume, me_uma_size);
+ }
+
+ if (err && (ctrl.tCK < TCK_400MHZ)) {
+ /* fallback: lower clock frequency */
+ printk(BIOS_ERR, "RAM training failed, trying fallback.\n");
+ printram("Decreasing clock frequency.\n");
+ ctrl.tCK++;
+ err = try_init_dram_ddr3(&ctrl, fast_boot, s3resume, me_uma_size);
+ }
+
+ if (err) {
+ /* fallback: disable failing channel */
+ printk(BIOS_ERR, "RAM training failed, trying fallback.\n");
+ printram("Disable failing channel.\n");
+
+ /* Reset DDR3 frequency */
+ dram_find_spds_ddr3(spds, &ctrl);
+
+ /* disable failing channel */
+ disable_channel(&ctrl, GET_ERR_CHANNEL(err));
+
+ err = try_init_dram_ddr3(&ctrl, fast_boot, s3resume, me_uma_size);
+ }
+
if (err)
die("raminit failed");