[S] Change in coreboot[master]: Revert "cpu/x86/mtrr/mtrr: fix printk format strings"

[Raul Rangel (Code Review)]

Attention is currently required from: Marshall Dawson, Angel Pons, Arthur Heymans, Fred Reitberger, Felix Held.

Hello build bot (Jenkins), Marshall Dawson, Angel Pons, Arthur Heymans, Fred Reitberger, Felix Held,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/coreboot/+/70800

to review the following change.

Change subject: Revert "cpu/x86/mtrr/mtrr: fix printk format strings"
......................................................................

Revert "cpu/x86/mtrr/mtrr: fix printk format strings"

This reverts commit b3261661c703a267eab1809d25f83a8a1e0e23b1.

Reason for revert: Rolling back the cpu_index change

Change-Id: I4d7eb4fb7e643e562da109f8def04f79c7d6cc04
---
M src/cpu/x86/mtrr/mtrr.c
1 file changed, 17 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/70800/1

diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c
index 437d119..4e2244d 100644
--- a/src/cpu/x86/mtrr/mtrr.c
+++ b/src/cpu/x86/mtrr/mtrr.c
@@ -291,7 +291,7 @@
    int j;
    int msr_num;
    int type_index;
-	unsigned long cpu_idx = cpu_index();
+	int cpu_idx = cpu_index();
    /* 8 ranges per msr. */
    msr_t fixed_msrs[NUM_FIXED_MTRRS];
    unsigned long msr_index[NUM_FIXED_MTRRS];
@@ -335,7 +335,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, "CPU 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 +355,7 @@
 {
    x86_setup_fixed_mtrrs_no_enable();

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

@@ -807,7 +807,7 @@

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",
+	printk(BIOS_DEBUG, "CPU 0x%x setup mtrr for CPU physical address size: %d bits\n",
    			cpu_index(), address_size);
    x86_setup_var_mtrrs(address_size, above4gb);
 }