[S] Change in coreboot[master]: cpu/x86/mtrr: use lapicid instead of cpu_index calls

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/70797 )

Change subject: cpu/x86/mtrr: use lapicid instead of cpu_index calls
......................................................................

cpu/x86/mtrr: use lapicid instead of cpu_index calls

The cpu_index function can't be used before mpinit, so use lapicid calls
instead. This fixes the regression introduced by commit 4c3749884d71
("cpu/x86/mtrr: Print cpu index number when set up MTRRs for BSP/APs")
and also reverts also commit b3261661c703 ("cpu/x86/mtrr/mtrr: fix
printk format strings"), since lapicid returns an unsigned int while
cpu_index returns an unsigned long.

TEST=Mandolin boots again and doesn't fail when it first tries to print
the MTRR configuration

Signed-off-by: Felix Held 
Change-Id: I0d226704051ab171891775a618ce7897b74fde16
---
M src/cpu/x86/mtrr/mtrr.c
1 file changed, 26 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/70797/1

diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c
index 437d119..744090a 100644
--- a/src/cpu/x86/mtrr/mtrr.c
+++ b/src/cpu/x86/mtrr/mtrr.c
@@ -15,6 +15,7 @@
 #include <cpu/amd/mtrr.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
+#include <cpu/x86/lapic.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
 #include <device/device.h>
@@ -291,7 +292,7 @@
    int j;
    int msr_num;
    int type_index;
-	unsigned long cpu_idx = cpu_index();
+	unsigned int cpu_idx = lapicid();
    /* 8 ranges per msr. */
    msr_t fixed_msrs[NUM_FIXED_MTRRS];
    unsigned long msr_index[NUM_FIXED_MTRRS];
@@ -335,7 +336,7 @@
    ASSERT(msr_num == NUM_FIXED_MTRRS)

for (i = 0; i < ARRAY_SIZE(fixed_msrs); i++)
-		printk(BIOS_DEBUG, "CPU 0x%lx: MTRR: Fixed MSR 0x%lx 0x%08x%08x\n",
+		printk(BIOS_DEBUG, "apic_id 0x%x: MTRR: Fixed MSR 0x%lx 0x%08x%08x\n",
    	       cpu_idx, msr_index[i], fixed_msrs[i].hi, fixed_msrs[i].lo);

disable_cache();
@@ -355,7 +356,7 @@
 {
    x86_setup_fixed_mtrrs_no_enable();

-	printk(BIOS_SPEW, "CPU 0x%lx call enable_fixed_mtrr()\n", cpu_index());
+	printk(BIOS_SPEW, "apic_id 0x%x call enable_fixed_mtrr()\n", lapicid());
    enable_fixed_mtrr();
 }

@@ -807,8 +808,8 @@

x86_setup_fixed_mtrrs();
    address_size = cpu_phys_address_size();
-	printk(BIOS_DEBUG, "CPU 0x%lx setup mtrr for CPU physical address size: %d bits\n",
-				cpu_index(), address_size);
+	printk(BIOS_DEBUG, "apic_id 0x%x setup mtrr for CPU physical address size: %d bits\n",
+				lapicid(), address_size);
    x86_setup_var_mtrrs(address_size, above4gb);
 }