summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Garber <jgarber1@ualberta.ca>2019-06-04 11:35:14 -0600
committerNico Huber <nico.h@gmx.de>2019-06-15 16:25:37 +0000
commite94335e9fd00ee5c707eb927922ef09b9487c5d6 (patch)
treed706d492e700d05237cce47551197dfd69afb66e
parent74d22d403032f66eb96e73e27c201d698e07394b (diff)
downloadcoreboot-e94335e9fd00ee5c707eb927922ef09b9487c5d6.tar.xz
nb/amd/amdmct/mct: Simplify conditional
These if statements can be combined to merge the two branches of the conditional and remove the duplicate pDCTstat->Speed == 3 check. Change-Id: I41aa19b4b7ed7b1a0e4f83f72e66869760e677dd Signed-off-by: Jacob Garber <jgarber1@ualberta.ca> Found-by: Coverity CID 1229583 Reviewed-on: https://review.coreboot.org/c/coreboot/+/33211 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--src/northbridge/amd/amdmct/mct/mctardk3.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/northbridge/amd/amdmct/mct/mctardk3.c b/src/northbridge/amd/amdmct/mct/mctardk3.c
index ce79a5245b..4eac790d5c 100644
--- a/src/northbridge/amd/amdmct/mct/mctardk3.c
+++ b/src/northbridge/amd/amdmct/mct/mctardk3.c
@@ -90,21 +90,13 @@ void mctGet_PS_Cfg_D(struct MCTStatStruc *pMCTstat,
valx &= 0xAA;
valx >>= 1;
}
- if (mctGet_NVbits(NV_MAX_DIMMS) == 8) {
- val &= valx;
- if (val != 0) {
+ val &= valx;
+ if (val != 0) {
+ if (mctGet_NVbits(NV_MAX_DIMMS) == 8 ||
+ pDCTstat->Speed == 3) {
pDCTstat->CH_ADDR_TMG[dct] &= 0xFFFF00FF;
pDCTstat->CH_ADDR_TMG[dct] |= 0x00002F00;
}
- } else {
- val &= valx;
- if (val != 0) {
- if (pDCTstat->Speed == 3 || pDCTstat->Speed == 3) {
- pDCTstat->CH_ADDR_TMG[dct] &= 0xFFFF00FF;
- pDCTstat->CH_ADDR_TMG[dct] |= 0x00002F00;
- }
- }
-
}
}
}