[coreboot-gerrit] New patch to review for coreboot: intel/haswell post-car: Minor fix on MTRR setting

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Fri Jul 22 15:50:22 CEST 2016


Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15796

-gerrit

commit e11e67ffe10a1d5caa92739d444d45787fb32fe2
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Fri Jul 22 15:38:37 2016 +0300

    intel/haswell post-car: Minor fix on MTRR setting
    
    Change-Id: I65f0ad430bdcc2065c1e873743da04201a68d9c9
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/cpu/intel/haswell/romstage.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index 8b15ed5..a05d570 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -69,7 +69,7 @@ static inline u32 *stack_push(u32 *stack, u32 value)
  * cache-as-ram is torn down as well as the MTRR settings to use. */
 static void *setup_romstage_stack_after_car(void)
 {
-	unsigned long top_of_stack;
+	uintptr_t top_of_stack;
 	int num_mtrrs;
 	u32 *slot;
 	u32 mtrr_mask_upper;
@@ -82,7 +82,7 @@ static void *setup_romstage_stack_after_car(void)
 
 	/* The upper bits of the MTRR mask need to set according to the number
 	 * of physical address bits. */
-	mtrr_mask_upper = (1 << ((cpuid_eax(0x80000008) & 0xff) - 32)) - 1;
+	mtrr_mask_upper = (1 << (cpu_phys_address_size() - 32)) - 1;
 
 	/* The order for each MTRR is value then base with upper 32-bits of
 	 * each value coming before the lower 32-bits. The reasoning for



More information about the coreboot-gerrit mailing list