summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2019-06-06 16:59:34 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-06-21 08:35:01 +0000
commitadc3235eb7457ee1bed18817c1770627a8251ff4 (patch)
tree317278d63b1e0979e271f4f9b7f87ff37984d37f
parent283b438f5ceaa88eb4860a5e1438b03c875bdf03 (diff)
downloadcoreboot-adc3235eb7457ee1bed18817c1770627a8251ff4.tar.xz
cpu/amd/family_10h-family_15h: Fix 'if' condition identical branches
Change-Id: I1c937a62388c38090ee2cc3228973cfb8361bac7 Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/33257 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
-rw-r--r--src/cpu/amd/family_10h-family_15h/init_cpus.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/cpu/amd/family_10h-family_15h/init_cpus.c b/src/cpu/amd/family_10h-family_15h/init_cpus.c
index d6a4725e2e..f416d9ccdb 100644
--- a/src/cpu/amd/family_10h-family_15h/init_cpus.c
+++ b/src/cpu/amd/family_10h-family_15h/init_cpus.c
@@ -504,10 +504,9 @@ u32 init_cpus(u32 cpu_init_detectedx, struct sys_info *sysinfo)
if (is_fam15h()) {
/* core 1 on node 0 is special; to avoid corrupting the
* BSP do not alter MTRRs on that core */
+ fam15_bsp_core1_apicid = 1;
if (CONFIG(ENABLE_APIC_EXT_ID) && (CONFIG_APIC_ID_OFFSET > 0))
- fam15_bsp_core1_apicid = CONFIG_APIC_ID_OFFSET + 1;
- else
- fam15_bsp_core1_apicid = 1;
+ fam15_bsp_core1_apicid += CONFIG_APIC_ID_OFFSET;
if (apicid == fam15_bsp_core1_apicid)
set_mtrrs = 0;