summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/northbridge/intel/sandybridge/raminit_common.c8
-rw-r--r--src/northbridge/intel/sandybridge/raminit_common.h2
-rw-r--r--src/northbridge/intel/sandybridge/raminit_native.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c
index b583264002..23eab153ed 100644
--- a/src/northbridge/intel/sandybridge/raminit_common.c
+++ b/src/northbridge/intel/sandybridge/raminit_common.c
@@ -2308,7 +2308,7 @@ int command_training(ramctr_timing *ctrl)
return 0;
}
-static int discover_edges_real(ramctr_timing *ctrl, int channel, int slotrank, int *edges)
+static int find_read_mpr_margin(ramctr_timing *ctrl, int channel, int slotrank, int *edges)
{
int edge;
int stats[NUM_LANES][MAX_EDGE_TIMING + 1];
@@ -2412,7 +2412,7 @@ static void find_predefined_pattern(ramctr_timing *ctrl, const int channel)
}
}
-int discover_edges(ramctr_timing *ctrl)
+int read_mpr_training(ramctr_timing *ctrl)
{
int falling_edges[NUM_CHANNELS][NUM_SLOTRANKS][NUM_LANES];
int rising_edges[NUM_CHANNELS][NUM_SLOTRANKS][NUM_LANES];
@@ -2441,7 +2441,7 @@ int discover_edges(ramctr_timing *ctrl)
printram("discover falling edges:\n[%x] = %x\n", IOSAV_DC_MASK, 0x300);
FOR_ALL_CHANNELS FOR_ALL_POPULATED_RANKS {
- err = discover_edges_real(ctrl, channel, slotrank,
+ err = find_read_mpr_margin(ctrl, channel, slotrank,
falling_edges[channel][slotrank]);
if (err)
return err;
@@ -2451,7 +2451,7 @@ int discover_edges(ramctr_timing *ctrl)
printram("discover rising edges:\n[%x] = %x\n", IOSAV_DC_MASK, 0x200);
FOR_ALL_CHANNELS FOR_ALL_POPULATED_RANKS {
- err = discover_edges_real(ctrl, channel, slotrank,
+ err = find_read_mpr_margin(ctrl, channel, slotrank,
rising_edges[channel][slotrank]);
if (err)
return err;
diff --git a/src/northbridge/intel/sandybridge/raminit_common.h b/src/northbridge/intel/sandybridge/raminit_common.h
index e6858c98c1..80693bb30e 100644
--- a/src/northbridge/intel/sandybridge/raminit_common.h
+++ b/src/northbridge/intel/sandybridge/raminit_common.h
@@ -259,7 +259,7 @@ void dram_jedecreset(ramctr_timing *ctrl);
int read_training(ramctr_timing *ctrl);
int write_training(ramctr_timing *ctrl);
int command_training(ramctr_timing *ctrl);
-int discover_edges(ramctr_timing *ctrl);
+int read_mpr_training(ramctr_timing *ctrl);
int discover_edges_write(ramctr_timing *ctrl);
int discover_timC_write(ramctr_timing *ctrl);
void normalize_training(ramctr_timing *ctrl);
diff --git a/src/northbridge/intel/sandybridge/raminit_native.c b/src/northbridge/intel/sandybridge/raminit_native.c
index 53017eb8c2..454ba011ab 100644
--- a/src/northbridge/intel/sandybridge/raminit_native.c
+++ b/src/northbridge/intel/sandybridge/raminit_native.c
@@ -690,7 +690,7 @@ int try_init_dram_ddr3(ramctr_timing *ctrl, int fast_boot, int s3resume, int me_
printram("CP5a\n");
- err = discover_edges(ctrl);
+ err = read_mpr_training(ctrl);
if (err)
return err;