From d67edcae6e9d438f2e60f6b67d97a7d3f09cb18b Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Tue, 13 Nov 2018 19:28:07 +0100 Subject: soc/intel/common: Bring DISPLAY_MTRRS into the light Initially, I wanted to move only the Kconfig DISPLAY_MTRRS into the "Debug" menu. It turned out, though, that the code looks rather generic. No need to hide it in soc/intel/. To not bloat src/Kconfig up any further, start a new `Kconfig.debug` hierarchy just for debug options. If somebody wants to review the code if it's 100% generic, we could even get rid of HAVE_DISPLAY_MTRRS. Change-Id: Ibd0a64121bd6e4ab5d7fd835f3ac25d3f5011f24 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/29684 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/cpu/x86/mtrr/earlymtrr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/cpu/x86/mtrr/earlymtrr.c') diff --git a/src/cpu/x86/mtrr/earlymtrr.c b/src/cpu/x86/mtrr/earlymtrr.c index 4ee54a370f..02ad85f321 100644 --- a/src/cpu/x86/mtrr/earlymtrr.c +++ b/src/cpu/x86/mtrr/earlymtrr.c @@ -20,13 +20,11 @@ */ int get_free_var_mtrr(void) { - msr_t msr, maskm; + msr_t maskm; int vcnt; int i; - /* Read MTRRCap and get vcnt - variable memory type ranges. */ - msr = rdmsr(MTRR_CAP_MSR); - vcnt = msr.lo & 0xff; + vcnt = get_var_mtrr_count(); /* Identify the first var mtrr which is not valid. */ for (i = 0; i < vcnt; i++) { -- cgit v1.2.3