From 9b2d1d8f61f598fb69a0c69f997bd8ca5190ef3f Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 22 Sep 2022 16:12:58 +0200 Subject: include/cpu/x86/mtrr: define NUM_FIXED_MTRRS once in mtrr.h Instead of defining NUM_FIXED_MTRRS in both cpu/x86/mp_init.h and cpu/x86/mtrr/mtrr.c in two different ways that will evaluate to the same value, define it once in include/cpu/x86/mtrr.h which is included in both C files. TEST=Timeless build for amd/mandolin results in identical firmware image Signed-off-by: Felix Held Change-Id: I71cec61e22f5ce76baef21344c7427be29f193f8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/67774 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Martin Roth --- src/cpu/x86/mp_init.c | 1 - src/cpu/x86/mtrr/mtrr.c | 1 - src/include/cpu/x86/mtrr.h | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c index 2255841220f0..9ccfc2f3c164 100644 --- a/src/cpu/x86/mp_init.c +++ b/src/cpu/x86/mp_init.c @@ -218,7 +218,6 @@ static void setup_default_sipi_vector_params(struct sipi_params *sp) sp->stack_top = ALIGN_DOWN((uintptr_t)&_estack, CONFIG_STACK_SIZE); } -#define NUM_FIXED_MTRRS 11 static const unsigned int fixed_mtrrs[NUM_FIXED_MTRRS] = { MTRR_FIX_64K_00000, MTRR_FIX_16K_80000, MTRR_FIX_16K_A0000, MTRR_FIX_4K_C0000, MTRR_FIX_4K_C8000, MTRR_FIX_4K_D0000, diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c index d95e590950a4..41164bb3fb52 100644 --- a/src/cpu/x86/mtrr/mtrr.c +++ b/src/cpu/x86/mtrr/mtrr.c @@ -103,7 +103,6 @@ static void enable_var_mtrr(unsigned char deftype) (((x) > RANGE_SHIFT) ? ((x) - RANGE_SHIFT) : RANGE_SHIFT) #define PHYS_TO_RANGE_ADDR(x) ((x) >> RANGE_SHIFT) #define RANGE_TO_PHYS_ADDR(x) (((resource_t)(x)) << RANGE_SHIFT) -#define NUM_FIXED_MTRRS (NUM_FIXED_RANGES / RANGES_PER_FIXED_MTRR) /* Helpful constants. */ #define RANGE_1MB PHYS_TO_RANGE_ADDR(1ULL << 20) diff --git a/src/include/cpu/x86/mtrr.h b/src/include/cpu/x86/mtrr.h index ed55c0402072..298947a982dc 100644 --- a/src/include/cpu/x86/mtrr.h +++ b/src/include/cpu/x86/mtrr.h @@ -44,6 +44,7 @@ #define NUM_FIXED_RANGES 88 #define RANGES_PER_FIXED_MTRR 8 +#define NUM_FIXED_MTRRS (NUM_FIXED_RANGES / RANGES_PER_FIXED_MTRR) #define MTRR_FIX_64K_00000 0x250 #define MTRR_FIX_16K_80000 0x258 #define MTRR_FIX_16K_A0000 0x259 -- cgit v1.2.3