aboutsummaryrefslogtreecommitdiff
path: root/resources/libreboot/patch/kgpe-d16/0135-northbridge-amd-amdmct-mct_ddr3-Use-StopOnError-to-d.patch
diff options
context:
space:
mode:
Diffstat (limited to 'resources/libreboot/patch/kgpe-d16/0135-northbridge-amd-amdmct-mct_ddr3-Use-StopOnError-to-d.patch')
-rw-r--r--resources/libreboot/patch/kgpe-d16/0135-northbridge-amd-amdmct-mct_ddr3-Use-StopOnError-to-d.patch231
1 files changed, 0 insertions, 231 deletions
diff --git a/resources/libreboot/patch/kgpe-d16/0135-northbridge-amd-amdmct-mct_ddr3-Use-StopOnError-to-d.patch b/resources/libreboot/patch/kgpe-d16/0135-northbridge-amd-amdmct-mct_ddr3-Use-StopOnError-to-d.patch
deleted file mode 100644
index b946b420..00000000
--- a/resources/libreboot/patch/kgpe-d16/0135-northbridge-amd-amdmct-mct_ddr3-Use-StopOnError-to-d.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From be23a938df377710e927fa920a656a70409139b4 Mon Sep 17 00:00:00 2001
-From: Timothy Pearson <tpearson@raptorengineeringinc.com>
-Date: Thu, 3 Sep 2015 18:59:53 -0500
-Subject: [PATCH 135/143] northbridge/amd/amdmct/mct_ddr3: Use StopOnError to
- decrease training time
-
-Change-Id: I979e27c32a3e0b101590fba0de3d7a25d6fc44d2
-Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
----
- src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c | 84 +++++++++++++++++-------
- src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c | 4 +-
- 2 files changed, 64 insertions(+), 24 deletions(-)
-
-diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
-index 553a54a..f2a7681 100644
---- a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
-+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
-@@ -1121,7 +1121,7 @@ static void stop_dram_dqs_training_pattern_fam15(struct MCTStatStruc *pMCTstat,
- }
-
- static void read_dram_dqs_training_pattern_fam15(struct MCTStatStruc *pMCTstat,
-- struct DCTStatStruc *pDCTstat, uint8_t dct, uint8_t Receiver, uint8_t lane)
-+ struct DCTStatStruc *pDCTstat, uint8_t dct, uint8_t Receiver, uint8_t lane, uint8_t stop_on_error)
- {
- uint32_t dword;
- uint32_t dev = pDCTstat->dev_dct;
-@@ -1133,24 +1133,35 @@ static void read_dram_dqs_training_pattern_fam15(struct MCTStatStruc *pMCTstat,
- if (lane < 4) {
- Set_NB32_DCT(dev, dct, 0x274, ~(0xff << (lane * 8)));
- Set_NB32_DCT(dev, dct, 0x278, ~0x0);
-+ dword = Get_NB32_DCT(dev, dct, 0x27c);
-+ dword |= 0xff; /* EccMask = 0xff */
-+ Set_NB32_DCT(dev, dct, 0x27c, dword);
- } else if (lane < 8) {
- Set_NB32_DCT(dev, dct, 0x274, ~0x0);
- Set_NB32_DCT(dev, dct, 0x278, ~(0xff << (lane * 8)));
-+ dword = Get_NB32_DCT(dev, dct, 0x27c);
-+ dword |= 0xff; /* EccMask = 0xff */
-+ Set_NB32_DCT(dev, dct, 0x27c, dword);
-+ } else if (lane == 8) {
-+ Set_NB32_DCT(dev, dct, 0x274, ~0x0);
-+ Set_NB32_DCT(dev, dct, 0x278, ~0x0);
-+ dword = Get_NB32_DCT(dev, dct, 0x27c);
-+ dword &= ~(0xff); /* EccMask = 0x0 */
-+ Set_NB32_DCT(dev, dct, 0x27c, dword);
- } else if (lane == 0xff) {
- Set_NB32_DCT(dev, dct, 0x274, ~0xffffffff);
- Set_NB32_DCT(dev, dct, 0x278, ~0xffffffff);
-+ dword = Get_NB32_DCT(dev, dct, 0x27c);
-+ dword &= ~(0xff); /* EccMask = 0x0 */
-+ Set_NB32_DCT(dev, dct, 0x27c, dword);
- } else {
- Set_NB32_DCT(dev, dct, 0x274, ~0x0);
- Set_NB32_DCT(dev, dct, 0x278, ~0x0);
-+ dword = Get_NB32_DCT(dev, dct, 0x27c);
-+ dword |= 0xff; /* EccMask = 0xff */
-+ Set_NB32_DCT(dev, dct, 0x27c, dword);
- }
-
-- dword = Get_NB32_DCT(dev, dct, 0x27c);
-- dword &= ~(0xff); /* EccMask = 0 */
-- if (lane != 0xff)
-- if ((lane != 8) || (pDCTstat->DimmECCPresent == 0))
-- dword |= 0xff; /* EccMask = 0xff */
-- Set_NB32_DCT(dev, dct, 0x27c, dword);
--
- dword = Get_NB32_DCT(dev, dct, 0x270);
- dword &= ~(0x7ffff); /* DataPrbsSeed = 55555 */
- // dword |= (0x55555);
-@@ -1182,7 +1193,8 @@ static void read_dram_dqs_training_pattern_fam15(struct MCTStatStruc *pMCTstat,
-
- dword = Get_NB32_DCT(dev, dct, 0x250);
- dword |= (0x1 << 3); /* ResetAllErr = 1 */
-- dword &= ~(0x1 << 4); /* StopOnErr = 0 */
-+ dword &= ~(0x1 << 4); /* StopOnErr = stop_on_error */
-+ dword |= (stop_on_error & 0x1) << 4;
- dword &= ~(0x3 << 8); /* CmdTgt = 1 (Alternate between Target A and Target B) */
- dword |= (0x1 << 8);
- dword &= ~(0x7 << 5); /* CmdType = 0 (Read) */
-@@ -1202,7 +1214,7 @@ static void read_dram_dqs_training_pattern_fam15(struct MCTStatStruc *pMCTstat,
- }
-
- static void write_dram_dqs_training_pattern_fam15(struct MCTStatStruc *pMCTstat,
-- struct DCTStatStruc *pDCTstat, uint8_t dct, uint8_t Receiver, uint8_t lane)
-+ struct DCTStatStruc *pDCTstat, uint8_t dct, uint8_t Receiver, uint8_t lane, uint8_t stop_on_error)
- {
- uint32_t dword;
- uint32_t dev = pDCTstat->dev_dct;
-@@ -1214,24 +1226,35 @@ static void write_dram_dqs_training_pattern_fam15(struct MCTStatStruc *pMCTstat,
- if (lane < 4) {
- Set_NB32_DCT(dev, dct, 0x274, ~(0xff << (lane * 8)));
- Set_NB32_DCT(dev, dct, 0x278, ~0x0);
-+ dword = Get_NB32_DCT(dev, dct, 0x27c);
-+ dword |= 0xff; /* EccMask = 0xff */
-+ Set_NB32_DCT(dev, dct, 0x27c, dword);
- } else if (lane < 8) {
- Set_NB32_DCT(dev, dct, 0x274, ~0x0);
- Set_NB32_DCT(dev, dct, 0x278, ~(0xff << (lane * 8)));
-+ dword = Get_NB32_DCT(dev, dct, 0x27c);
-+ dword |= 0xff; /* EccMask = 0xff */
-+ Set_NB32_DCT(dev, dct, 0x27c, dword);
-+ } else if (lane == 8) {
-+ Set_NB32_DCT(dev, dct, 0x274, ~0x0);
-+ Set_NB32_DCT(dev, dct, 0x278, ~0x0);
-+ dword = Get_NB32_DCT(dev, dct, 0x27c);
-+ dword &= ~(0xff); /* EccMask = 0x0 */
-+ Set_NB32_DCT(dev, dct, 0x27c, dword);
- } else if (lane == 0xff) {
- Set_NB32_DCT(dev, dct, 0x274, ~0xffffffff);
- Set_NB32_DCT(dev, dct, 0x278, ~0xffffffff);
-+ dword = Get_NB32_DCT(dev, dct, 0x27c);
-+ dword &= ~(0xff); /* EccMask = 0x0 */
-+ Set_NB32_DCT(dev, dct, 0x27c, dword);
- } else {
- Set_NB32_DCT(dev, dct, 0x274, ~0x0);
- Set_NB32_DCT(dev, dct, 0x278, ~0x0);
-+ dword = Get_NB32_DCT(dev, dct, 0x27c);
-+ dword |= 0xff; /* EccMask = 0xff */
-+ Set_NB32_DCT(dev, dct, 0x27c, dword);
- }
-
-- dword = Get_NB32_DCT(dev, dct, 0x27c);
-- dword &= ~(0xff); /* EccMask = 0 */
-- if (lane != 0xff)
-- if ((lane != 8) || (pDCTstat->DimmECCPresent == 0))
-- dword |= 0xff; /* EccMask = 0xff */
-- Set_NB32_DCT(dev, dct, 0x27c, dword);
--
- dword = Get_NB32_DCT(dev, dct, 0x270);
- dword &= ~(0x7ffff); /* DataPrbsSeed = 55555 */
- // dword |= (0x55555);
-@@ -1263,7 +1286,8 @@ static void write_dram_dqs_training_pattern_fam15(struct MCTStatStruc *pMCTstat,
-
- dword = Get_NB32_DCT(dev, dct, 0x250);
- dword |= (0x1 << 3); /* ResetAllErr = 1 */
-- dword &= ~(0x1 << 4); /* StopOnErr = 0 */
-+ dword &= ~(0x1 << 4); /* StopOnErr = stop_on_error */
-+ dword |= (stop_on_error & 0x1) << 4;
- dword &= ~(0x3 << 8); /* CmdTgt = 1 (Alternate between Target A and Target B) */
- dword |= (0x1 << 8);
- dword &= ~(0x7 << 5); /* CmdType = 1 (Write) */
-@@ -1297,6 +1321,7 @@ static uint8_t TrainDQSRdWrPos_D_Fam15(struct MCTStatStruc *pMCTstat,
- uint8_t dual_rank;
- uint8_t write_iter;
- uint8_t read_iter;
-+ uint8_t check_antiphase;
- uint16_t initial_write_dqs_delay[MAX_BYTE_LANES];
- uint16_t initial_read_dqs_delay[MAX_BYTE_LANES];
- uint16_t initial_write_data_timing[MAX_BYTE_LANES];
-@@ -1378,7 +1403,7 @@ static uint8_t TrainDQSRdWrPos_D_Fam15(struct MCTStatStruc *pMCTstat,
- /* 2.10.5.8.4 (2 B)
- * Write the DRAM training pattern to the test address
- */
-- write_dram_dqs_training_pattern_fam15(pMCTstat, pDCTstat, dct, Receiver, lane);
-+ write_dram_dqs_training_pattern_fam15(pMCTstat, pDCTstat, dct, Receiver, lane, 0);
-
- /* Read current settings of other (previously trained) lanes */
- read_dqs_read_data_timing_registers(current_read_dqs_delay, dev, dct, dimm, index_reg);
-@@ -1389,6 +1414,12 @@ static uint8_t TrainDQSRdWrPos_D_Fam15(struct MCTStatStruc *pMCTstat,
- for (current_read_dqs_delay[lane] = 0; current_read_dqs_delay[lane] < 0x40; current_read_dqs_delay[lane] += 2) {
- print_debug_dqs("\t\t\t\t\tTrainDQSRdWrPos: 161 current_read_dqs_delay[lane] ", current_read_dqs_delay[lane], 6);
-
-+ if ((current_read_dqs_delay[lane] >> 1) >= (32 - 16)) {
-+ check_antiphase = 1;
-+ } else {
-+ check_antiphase = 0;
-+ }
-+
- /* 2.10.5.8.4 (2 A i)
- * Commit the current Read DQS Timing Control settings to the hardware registers
- */
-@@ -1397,7 +1428,16 @@ static uint8_t TrainDQSRdWrPos_D_Fam15(struct MCTStatStruc *pMCTstat,
- /* 2.10.5.8.4 (2 A ii)
- * Read the DRAM training pattern from the test address
- */
-- read_dram_dqs_training_pattern_fam15(pMCTstat, pDCTstat, dct, Receiver, lane);
-+ read_dram_dqs_training_pattern_fam15(pMCTstat, pDCTstat, dct, Receiver, lane, ((check_antiphase == 0)?1:0));
-+
-+ if (check_antiphase == 0) {
-+ /* Check for early abort before analyzing per-nibble status */
-+ dword = Get_NB32_DCT(dev, dct, 0x264) & 0x1ffffff;
-+ if (dword != 0) {
-+ dqs_results_array[Receiver & 0x1][lane - lane_start][current_write_data_delay[lane] - initial_write_dqs_delay[lane]][(current_read_dqs_delay[lane] >> 1) + 16] = 0; /* Fail */
-+ continue;
-+ }
-+ }
-
- /* 2.10.5.8.4 (2 A iii)
- * Record pass / fail status
-@@ -1407,7 +1447,7 @@ static uint8_t TrainDQSRdWrPos_D_Fam15(struct MCTStatStruc *pMCTstat,
- dqs_results_array[Receiver & 0x1][lane - lane_start][current_write_data_delay[lane] - initial_write_dqs_delay[lane]][(current_read_dqs_delay[lane] >> 1) + 16] = 0; /* Fail */
- else
- dqs_results_array[Receiver & 0x1][lane - lane_start][current_write_data_delay[lane] - initial_write_dqs_delay[lane]][(current_read_dqs_delay[lane] >> 1) + 16] = 1; /* Pass */
-- if ((current_read_dqs_delay[lane] >> 1) >= (32 - 16)) {
-+ if (check_antiphase == 1) {
- /* Check antiphase results */
- dword = Get_NB32_DCT(dev, dct, 0x26c) & 0x3ffff;
- if (dword & (0x3 << (lane * 2)))
-@@ -1630,7 +1670,7 @@ static void TrainDQSReceiverEnCyc_D_Fam15(struct MCTStatStruc *pMCTstat,
- uint16_t current_phy_phase_delay[MAX_BYTE_LANES];
- uint8_t dqs_results_array[1024];
-
-- uint16_t ren_step = 0x40;
-+ uint16_t ren_step = 0x40;
- uint32_t index_reg = 0x98;
- uint32_t dev = pDCTstat->dev_dct;
-
-diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c
-index 3ede104..667854a 100644
---- a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c
-+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c
-@@ -1617,14 +1617,14 @@ static void dqsTrainMaxRdLatency_SW_Fam15(struct MCTStatStruc *pMCTstat,
- /* 2.10.5.8.5.1.[2,3]
- * Write the DRAM training pattern to the test address
- */
-- write_dram_dqs_training_pattern_fam15(pMCTstat, pDCTstat, Channel, current_worst_case_total_delay_dimm << 1, 0xff);
-+ write_dram_dqs_training_pattern_fam15(pMCTstat, pDCTstat, Channel, current_worst_case_total_delay_dimm << 1, 0xff, 0);
-
- /* 2.10.5.8.5.1.4
- * Incrementally test each MaxRdLatency candidate
- */
- for (; pDCTstat->CH_MaxRdLat[Channel] < 0x3ff; pDCTstat->CH_MaxRdLat[Channel]++) {
- write_max_read_latency_to_registers(pMCTstat, pDCTstat, Channel, pDCTstat->CH_MaxRdLat[Channel]);
-- read_dram_dqs_training_pattern_fam15(pMCTstat, pDCTstat, Channel, current_worst_case_total_delay_dimm << 1, 0xff);
-+ read_dram_dqs_training_pattern_fam15(pMCTstat, pDCTstat, Channel, current_worst_case_total_delay_dimm << 1, 0xff, 0);
- dword = Get_NB32_DCT(dev, Channel, 0x268) & 0x3ffff;
- if (!dword)
- break;
---
-1.7.9.5
-
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2025-01-08 18:58:02 +0000