GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cpu/x86/mtrr/debug: make local MSR variables const

Browse source 
In the functions the local MSR variables are only written once by rdmsr
calls at the beginning of the function and then only read, so those can
be made const.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I1be6a5158c0c06abe128e9394d6001c40a8d4cbb
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78004
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
This commit is contained in:
Felix Held 2023-09-19 17:52:11 +02:00
parent 94b91c3ebb
commit 1663d188f3
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/cpu/x86/mtrr/debug.c
View file

@ -52,7 +52,7 @@ static void display_mtrr_fixed_types(uint64_t msr,
static void display_4k_mtrr(uint32_t msr_reg, uint32_t starting_address, static void display_4k_mtrr(uint32_t msr_reg, uint32_t starting_address,
const char *name) const char *name)
{ {
msr_t msr = rdmsr(msr_reg); const msr_t msr = rdmsr(msr_reg);
printk(BIOS_DEBUG, "0x%016llx: %s\n", msr.raw, name); printk(BIOS_DEBUG, "0x%016llx: %s\n", msr.raw, name);
display_mtrr_fixed_types(msr.raw, starting_address, 0x1000); display_mtrr_fixed_types(msr.raw, starting_address, 0x1000);
} }
@ -60,21 +60,21 @@ static void display_4k_mtrr(uint32_t msr_reg, uint32_t starting_address,
static void display_16k_mtrr(uint32_t msr_reg, uint32_t starting_address, static void display_16k_mtrr(uint32_t msr_reg, uint32_t starting_address,
const char *name) const char *name)
{ {
msr_t msr = rdmsr(msr_reg); const msr_t msr = rdmsr(msr_reg);
printk(BIOS_DEBUG, "0x%016llx: %s\n", msr.raw, name); printk(BIOS_DEBUG, "0x%016llx: %s\n", msr.raw, name);
display_mtrr_fixed_types(msr.raw, starting_address, 0x4000); display_mtrr_fixed_types(msr.raw, starting_address, 0x4000);
} }
static void display_64k_mtrr(void) static void display_64k_mtrr(void)
{ {
msr_t msr = rdmsr(MTRR_FIX_64K_00000); const msr_t msr = rdmsr(MTRR_FIX_64K_00000);
printk(BIOS_DEBUG, "0x%016llx: IA32_MTRR_FIX64K_00000\n", msr.raw); printk(BIOS_DEBUG, "0x%016llx: IA32_MTRR_FIX64K_00000\n", msr.raw);
display_mtrr_fixed_types(msr.raw, 0, 0x10000); display_mtrr_fixed_types(msr.raw, 0, 0x10000);
} }
static void display_mtrrcap(void) static void display_mtrrcap(void)
{ {
msr_t msr = rdmsr(MTRR_CAP_MSR); const msr_t msr = rdmsr(MTRR_CAP_MSR);
printk(BIOS_DEBUG, printk(BIOS_DEBUG,
"0x%08x%08x: IA32_MTRRCAP: %s%s%s%s%u variable MTRRs\n", "0x%08x%08x: IA32_MTRRCAP: %s%s%s%s%u variable MTRRs\n",
msr.hi, msr.lo, msr.hi, msr.lo,
@ -87,7 +87,7 @@ static void display_mtrrcap(void)
static void display_mtrr_def_type(void) static void display_mtrr_def_type(void)
{ {
msr_t msr = rdmsr(MTRR_DEF_TYPE_MSR); const msr_t msr = rdmsr(MTRR_DEF_TYPE_MSR);
printk(BIOS_DEBUG, "0x%016llx: IA32_MTRR_DEF_TYPE:%s%s %s\n", printk(BIOS_DEBUG, "0x%016llx: IA32_MTRR_DEF_TYPE:%s%s %s\n",
msr.raw, msr.raw,
(msr.raw & MTRR_DEF_TYPE_EN) ? " E," : "", (msr.raw & MTRR_DEF_TYPE_EN) ? " E," : "",
@ -102,8 +102,8 @@ static void display_variable_mtrr(int index, uint64_t address_mask)
uint64_t base_address; uint64_t base_address;
uint64_t length; uint64_t length;
uint64_t mask; uint64_t mask;
msr_t msr_a = rdmsr(msr_reg); const msr_t msr_a = rdmsr(msr_reg);
msr_t msr_m = rdmsr(msr_reg + 1); const msr_t msr_m = rdmsr(msr_reg + 1);
if (msr_m.raw & MTRR_PHYS_MASK_VALID) { if (msr_m.raw & MTRR_PHYS_MASK_VALID) {
base_address = (msr_a.raw & 0xfffffffffffff000ULL) base_address = (msr_a.raw & 0xfffffffffffff000ULL)