diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2022-09-22 16:12:58 +0200 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-09-24 19:38:44 +0000 |
| commit | 9b2d1d8f61f598fb69a0c69f997bd8ca5190ef3f (patch) | |
| tree | 90d4d23e0d422bb778664d81f0a8e66f6323359f | |
| parent | ee63b44c47cbb8c81ce0e173bbc12129c3edbe71 (diff) | |
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 <felix-coreboot@felixheld.de>
Change-Id: I71cec61e22f5ce76baef21344c7427be29f193f8
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67774
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
| -rw-r--r-- | src/cpu/x86/mp_init.c | 1 | ||||
| -rw-r--r-- | src/cpu/x86/mtrr/mtrr.c | 1 | ||||
| -rw-r--r-- | src/include/cpu/x86/mtrr.h | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c index 2255841220..9ccfc2f3c1 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 d95e590950..41164bb3fb 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 ed55c04020..298947a982 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 |