summaryrefslogtreecommitdiff
path: root/src/northbridge
diff options
context:
space:
mode:
Diffstat (limited to 'src/northbridge')
-rw-r--r--src/northbridge/intel/gm45/raminit_read_write_training.c74
1 files changed, 46 insertions, 28 deletions
diff --git a/src/northbridge/intel/gm45/raminit_read_write_training.c b/src/northbridge/intel/gm45/raminit_read_write_training.c
index 8c8e66a807..6936d0788f 100644
--- a/src/northbridge/intel/gm45/raminit_read_write_training.c
+++ b/src/northbridge/intel/gm45/raminit_read_write_training.c
@@ -99,50 +99,68 @@ static int read_training_test(const int channel, const int lane,
}
return 1;
}
-static void read_training_per_lane(const int channel, const int lane,
- const address_bunch_t *const addresses)
+static void read_training_find_lower(const int channel, const int lane,
+ const address_bunch_t *const addresses,
+ read_timing_t *const lower)
{
- read_timing_t lower, upper;
-
- MCHBAR32(CxRDTy_MCHBAR(channel, lane)) |= 3 << 25;
-
- /* Search lower bound. */
- lower.t = 0;
- lower.p = 0;
- program_read_timing(channel, lane, &lower);
/* Coarse search for good t. */
+ program_read_timing(channel, lane, lower);
while (!read_training_test(channel, lane, addresses)) {
- ++lower.t;
- program_read_timing(channel, lane, &lower);
+ ++lower->t;
+ program_read_timing(channel, lane, lower);
}
+
/* Step back, then fine search for good p. */
- if (lower.t > 0) {
- --lower.t;
- program_read_timing(channel, lane, &lower);
+ if (lower->t > 0) {
+ --lower->t;
+ program_read_timing(channel, lane, lower);
while (!read_training_test(channel, lane, addresses)) {
- ++lower.p;
- program_read_timing(channel, lane, &lower);
+ ++lower->p;
+ program_read_timing(channel, lane, lower);
}
}
-
- /* Search upper bound. */
- upper.t = lower.t + 1;
- upper.p = lower.p;
- program_read_timing(channel, lane, &upper);
+}
+static void read_training_find_upper(const int channel, const int lane,
+ const address_bunch_t *const addresses,
+ read_timing_t *const upper)
+{
+ program_read_timing(channel, lane, upper);
if (!read_training_test(channel, lane, addresses))
die("Read training failed: limits too narrow.\n");
/* Coarse search for bad t. */
do {
- ++upper.t;
- program_read_timing(channel, lane, &upper);
+ ++upper->t;
+ program_read_timing(channel, lane, upper);
} while (read_training_test(channel, lane, addresses));
/* Fine search for bad p. */
- --upper.t;
- program_read_timing(channel, lane, &upper);
+ --upper->t;
+ program_read_timing(channel, lane, upper);
while (read_training_test(channel, lane, addresses)) {
- ++upper.p;
- program_read_timing(channel, lane, &upper);
+ ++upper->p;
+ program_read_timing(channel, lane, upper);
}
+}
+static void read_training_per_lane(const int channel, const int lane,
+ const address_bunch_t *const addresses)
+{
+ read_timing_t lower, upper;
+
+ MCHBAR32(CxRDTy_MCHBAR(channel, lane)) |= 3 << 25;
+
+ /*** Search lower bound. ***/
+
+ /* Start at zero. */
+ lower.t = 0;
+ lower.p = 0;
+ read_training_find_lower(channel, lane, addresses, &lower);
+
+ /*** Search upper bound. ***/
+
+ /* Start at lower + 1t. */
+ upper.t = lower.t + 1;
+ upper.p = lower.p;
+
+ read_training_find_upper(channel, lane, addresses, &upper);
/* Calculate and program mean value. */
lower.p += lower.t << READ_TIMING_P_SHIFT;