From eaf11c944530c078226e79c61b24461a7152f112 Mon Sep 17 00:00:00 2001 From: Werner Zeh Date: Mon, 11 Apr 2022 08:35:06 +0200 Subject: x86/mtrr: Print address ranges inclusive to be more consistent The printed address ranges in the tree (resource allocator and even some MTRR code) usually shows the range inclusive (meaning from start address to the real end address of the range). Though there is still some code in the MTRR context which prints the ranges with an exclusive end. This patch aligns the printing of ranges in the MTRR code to be consistent among the tree so that the shown end addresses are now inclusive. Change-Id: I0ca292f9cf272564cb5ef1c4ea38f5c483605c94 Signed-off-by: Werner Zeh Reviewed-on: https://review.coreboot.org/c/coreboot/+/63541 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Subrata Banik Reviewed-by: Eric Lai Reviewed-by: Christian Walter --- src/arch/x86/postcar_loader.c | 2 +- src/cpu/x86/mtrr/mtrr.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/arch/x86/postcar_loader.c b/src/arch/x86/postcar_loader.c index 2609fd62cc..0fe174bc54 100644 --- a/src/arch/x86/postcar_loader.c +++ b/src/arch/x86/postcar_loader.c @@ -60,7 +60,7 @@ static void postcar_var_mtrr_set(const struct var_mtrr_context *ctx, struct postcar_frame *pcf = ctx->arg; printk(BIOS_DEBUG, "MTRR Range: Start=%lx End=%lx (Size %zx)\n", - addr, addr + size, size); + addr, addr + size - 1, size); stack_push(pcf, mask.hi); stack_push(pcf, mask.lo); diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c index 288f06dd0e..d8903b89e0 100644 --- a/src/cpu/x86/mtrr/mtrr.c +++ b/src/cpu/x86/mtrr/mtrr.c @@ -154,7 +154,7 @@ static void print_physical_address_space(const struct memranges *addr_space, memranges_each_entry(r, addr_space) printk(BIOS_DEBUG, "0x%016llx - 0x%016llx size 0x%08llx type %ld\n", - range_entry_base(r), range_entry_end(r), + range_entry_base(r), range_entry_end(r) - 1, range_entry_size(r), range_entry_tag(r)); } @@ -272,7 +272,7 @@ static void calc_fixed_mtrrs(void) type = range_entry_tag(r); printk(MTRR_VERBOSE_LEVEL, "MTRR addr 0x%x-0x%x set to %d type @ %d\n", - begin, begin + desc->step, type, type_index); + begin, begin + desc->step - 1, type, type_index); if (type == MTRR_TYPE_WRBACK) type |= MTRR_FIXED_WRBACK_BITS; fixed_mtrr_types[type_index] = type; @@ -905,7 +905,7 @@ void mtrr_use_temp_range(uintptr_t begin, size_t size, int type) if (commit_var_mtrrs(&sol) < 0) printk(BIOS_WARNING, "Unable to insert temporary MTRR range: 0x%016llx - 0x%016llx size 0x%08llx type %d\n", - (long long)begin, (long long)begin + size, + (long long)begin, (long long)begin + size - 1, (long long)size, type); else need_restore_mtrr(); -- cgit v1.2.3