nb/intel/sandybridge: Remove spurious writes to IOSAV BW mask
The byte-wise error mask only needs to be set for certain corner cases
in read MPR training. Thus, minimize writes to this register.
Tested on Asus P8H61-M PRO, still boots.
Change-Id: I0bb8d99ad60c4964f896d303878e5982ae1dcdbe
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47621
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c
index c41b0f1..68281dd 100644
--- a/src/northbridge/intel/sandybridge/raminit_common.c
+++ b/src/northbridge/intel/sandybridge/raminit_common.c
@@ -1405,9 +1405,7 @@
FOR_ALL_POPULATED_CHANNELS {
program_timings(ctrl, channel);
}
- FOR_ALL_POPULATED_CHANNELS FOR_ALL_LANES {
- MCHBAR32(IOSAV_By_BW_MASK_ch(channel, lane)) = 0;
- }
+
return 0;
}
@@ -1959,7 +1957,7 @@
int write_training(ramctr_timing *ctrl)
{
- int channel, slotrank, lane;
+ int channel, slotrank;
int err;
FOR_ALL_POPULATED_CHANNELS
@@ -1973,10 +1971,6 @@
printram("CPF\n");
- FOR_ALL_POPULATED_CHANNELS FOR_ALL_LANES {
- MCHBAR32(IOSAV_By_BW_MASK_ch(channel, lane)) = 0;
- }
-
FOR_ALL_POPULATED_CHANNELS {
fill_pattern0(ctrl, channel, 0xaaaaaaaa, 0x55555555);
}
@@ -1996,9 +1990,6 @@
FOR_ALL_POPULATED_CHANNELS
program_timings(ctrl, channel);
- FOR_ALL_POPULATED_CHANNELS FOR_ALL_LANES {
- MCHBAR32(IOSAV_By_BW_MASK_ch(channel, lane)) = 0;
- }
return 0;
}
@@ -2275,6 +2266,7 @@
fill_pattern0(ctrl, channel, 0, 0);
FOR_ALL_LANES {
+ MCHBAR32(IOSAV_By_BW_MASK_ch(channel, lane)) = 0;
MCHBAR32(IOSAV_By_BW_SERROR_C_ch(channel, lane));
}
@@ -2338,10 +2330,6 @@
toggle_io_reset();
FOR_ALL_POPULATED_CHANNELS {
- FOR_ALL_LANES {
- MCHBAR32(IOSAV_By_BW_MASK_ch(channel, lane)) = 0;
- }
-
find_predefined_pattern(ctrl, channel);
fill_pattern0(ctrl, channel, 0, 0xffffffff);
@@ -2521,9 +2509,6 @@
FOR_ALL_POPULATED_CHANNELS
program_timings(ctrl, channel);
- FOR_ALL_POPULATED_CHANNELS FOR_ALL_LANES {
- MCHBAR32(IOSAV_By_BW_MASK_ch(channel, lane)) = 0;
- }
return 0;
}
@@ -3030,7 +3015,7 @@
void restore_timings(ramctr_timing *ctrl)
{
- int channel, lane;
+ int channel;
FOR_ALL_POPULATED_CHANNELS {
const union tc_rap_reg tc_rap = {
@@ -3051,10 +3036,6 @@
wait_for_iosav(channel);
}
- FOR_ALL_POPULATED_CHANNELS FOR_ALL_LANES {
- MCHBAR32(IOSAV_By_BW_MASK_ch(channel, lane)) = 0;
- }
-
FOR_ALL_POPULATED_CHANNELS
MCHBAR32_OR(TC_RWP_ch(channel), 1 << 27);