From 303afe6a03eba442b5337d26bcbd2fc08619135a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 9 Jan 2017 17:54:35 -0600 Subject: [PATCH] UPSTREAM: amd/mct/ddr3: Avoid using uninitialized register address in ECC setup Logic inside mct_EnableDimmEccEn_D uses an unintialized variable as a register address under certain conditions. Refactor mct_EnableDimmEccEn_D to use the explicit address of the register in all cases. BUG=none BRANCH=none TEST=none Change-Id: If0a31097c60af1fa050b6794ed5d631a7aa4c0d7 Signed-off-by: Patrick Georgi Original-Commit-Id: 590a3e1f6ccce873bb8f2129dc3680cab12e5a42 Original-Found-by: Coverity Scan #1347337 Original-Change-Id: I6bc50d0524ea255aa97c7071ec4813f6a3e9c2b8 Original-Signed-off-by: Timothy Pearson Original-Reviewed-on: https://review.coreboot.org/18079 Original-Tested-by: build bot (Jenkins) Original-Tested-by: Raptor Engineering Automated Test Stand Original-Reviewed-by: Nico Huber Reviewed-on: https://chromium-review.googlesource.com/428249 Commit-Ready: Aaron Durbin --- src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c index 9783f38993..10d4206559 100644 --- a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c +++ b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c @@ -2242,23 +2242,20 @@ void mct_EnableDimmEccEn_D(struct MCTStatStruc *pMCTstat, struct DCTStatStruc *pDCTstat, u8 _DisableDramECC) { u32 val; - u32 reg; u32 dev; /* Enable ECC correction if it was previously disabled */ - dev = pDCTstat->dev_dct; if ((_DisableDramECC & 0x01) == 0x01) { - reg = 0x90; - val = Get_NB32_DCT(dev, 0, reg); + val = Get_NB32_DCT(dev, 0, 0x90); val |= (1<