From adc3235eb7457ee1bed18817c1770627a8251ff4 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Thu, 6 Jun 2019 16:59:34 +0200 Subject: cpu/amd/family_10h-family_15h: Fix 'if' condition identical branches Change-Id: I1c937a62388c38090ee2cc3228973cfb8361bac7 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/coreboot/+/33257 Tested-by: build bot (Jenkins) Reviewed-by: Marshall Dawson --- src/cpu/amd/family_10h-family_15h/init_cpus.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') 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; -- cgit v1.2.3