|
| 1 | +From ce1c7a35fa11b46d0478e97c4a4001179ab9d1bf Mon Sep 17 00:00:00 2001 |
| 2 | +From: Mike Rothfuss <6182328+mrothfuss@users.noreply.github.com> |
| 3 | +Date: Fri, 23 Aug 2024 19:59:09 -0600 |
| 4 | +Subject: [PATCH 2/2] northbridge/amd: Added resets for ram training failures |
| 5 | + |
| 6 | +Instead of booting into an unstable state (and crashing), the board |
| 7 | +resets to re-attempt raminit. |
| 8 | +--- |
| 9 | + src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c | 7 +++++-- |
| 10 | + src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c | 7 +++++-- |
| 11 | + 2 files changed, 10 insertions(+), 4 deletions(-) |
| 12 | + |
| 13 | +diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c b/src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c |
| 14 | +index 1ee10608b9..9a53bd352d 100644 |
| 15 | +--- a/src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c |
| 16 | ++++ b/src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c |
| 17 | +@@ -18,6 +18,7 @@ |
| 18 | + #include <stdint.h> |
| 19 | + #include <console/console.h> |
| 20 | + #include <string.h> |
| 21 | ++#include <southbridge/amd/common/reset.h> |
| 22 | + #include "mct_d.h" |
| 23 | + #include "mct_d_gcc.h" |
| 24 | + |
| 25 | +@@ -265,11 +266,13 @@ static void WriteLevelization_HW(struct MCTStatStruc *pMCTstat, |
| 26 | + |
| 27 | + pDCTstat->TargetFreq = final_target_freq; |
| 28 | + |
| 29 | +- if (global_phy_training_status) |
| 30 | ++ if (global_phy_training_status) { |
| 31 | + printk(BIOS_WARNING, |
| 32 | + "%s: Uncorrectable invalid value(s) detected in second phase of write levelling; " |
| 33 | +- "continuing but system may be unstable!\n", |
| 34 | ++ "Restarting system\n", |
| 35 | + __func__); |
| 36 | ++ soft_reset(); |
| 37 | ++ } |
| 38 | + |
| 39 | + uint8_t dct; |
| 40 | + for (dct = 0; dct < 2; dct++) { |
| 41 | +diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c |
| 42 | +index dbb989fe3d..c4cb53442d 100644 |
| 43 | +--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c |
| 44 | ++++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c |
| 45 | +@@ -26,6 +26,7 @@ |
| 46 | + #include <string.h> |
| 47 | + #include <cpu/x86/msr.h> |
| 48 | + #include <cpu/amd/msr.h> |
| 49 | ++#include <southbridge/amd/common/reset.h> |
| 50 | + #include "mct_d.h" |
| 51 | + #include "mct_d_gcc.h" |
| 52 | + |
| 53 | +@@ -1698,8 +1699,10 @@ void dqsTrainMaxRdLatency_SW_Fam15(struct MCTStatStruc *pMCTstat, |
| 54 | + Set_NB32_index_wait_DCT(dev, Channel, index_reg, 0x00000050, 0x13131313); |
| 55 | + } |
| 56 | + dword = Get_NB32_DCT(dev, Channel, 0x268) & 0x3ffff; |
| 57 | +- if (dword) |
| 58 | +- printk(BIOS_ERR, "WARNING: MaxRdLatency training FAILED! Attempting to continue but your system may be unstable...\n"); |
| 59 | ++ if (dword) { |
| 60 | ++ printk(BIOS_ERR, "WARNING: MaxRdLatency training FAILED! Restarting system\n"); |
| 61 | ++ soft_reset(); |
| 62 | ++ } |
| 63 | + |
| 64 | + /* 2.10.5.8.5.1.5 */ |
| 65 | + nb_pstate = 0; |
| 66 | +-- |
| 67 | +2.39.2 |
| 68 | + |
0 commit comments