nb/intel/sandybridge/raminit: Get rid of fallback attempts
Locking the PLL again once it's locked doesn't work.
The MRC doesn't do this, for some reason.
Remove fallback attempts of lowering DDR frequency.
Change-Id: Iccb54fa7d7357a22182dd26bd5b49c4073c04dc9
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-on: https://review.coreboot.org/17399
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c
index 8123014..65d4348 100644
--- a/src/northbridge/intel/sandybridge/raminit.c
+++ b/src/northbridge/intel/sandybridge/raminit.c
@@ -834,11 +834,8 @@
*/
reg1 = MCHBAR32(0x5e04);
val2 = (u8) reg1;
- if (val2 == FRQ) {
- printk(BIOS_DEBUG, "MCU frequency is set at : %d MHz\n",
- (1000 << 8) / ctrl->tCK);
+ if (val2)
return;
- }
/* Step 2 - Select frequency in the MCU */
reg1 = FRQ;
@@ -4275,22 +4272,6 @@
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");