From 1ebbb165efe71e83fbf19a9ce6c4bf14e2448d81 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 28 May 2020 10:17:34 -0600 Subject: cpu/x86/mtrr: add x86_setup_mtrrs_with_detect_no_above_4gb() There's not a function that is the equivalent to x86_setup_mtrrs_with_detect() but not solving for above 4GiB. Provide x86_setup_mtrrs_with_detect_no_above_4gb() which is the equivalent to x86_setup_mtrrs_with_detect() but instructs the MTRR solver to not take into account memory above 4GiB. BUG=b:155426691 Signed-off-by: Aaron Durbin Change-Id: Ia1b5d67d6f139aaa929e03ddbc394d57dfb949e0 Reviewed-on: https://review.coreboot.org/c/coreboot/+/41897 Reviewed-by: Furquan Shaikh Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/cpu/x86/mtrr/mtrr.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c index 1f3765950389..77525a790712 100644 --- a/src/cpu/x86/mtrr/mtrr.c +++ b/src/cpu/x86/mtrr/mtrr.c @@ -774,7 +774,7 @@ void x86_setup_var_mtrrs(unsigned int address_bits, unsigned int above4gb) commit_var_mtrrs(sol); } -void x86_setup_mtrrs(void) +static void _x86_setup_mtrrs(unsigned int above4gb) { int address_size; @@ -782,14 +782,26 @@ void x86_setup_mtrrs(void) address_size = cpu_phys_address_size(); printk(BIOS_DEBUG, "CPU physical address size: %d bits\n", address_size); + x86_setup_var_mtrrs(address_size, above4gb); +} + +void x86_setup_mtrrs(void) +{ /* Always handle addresses above 4GiB. */ - x86_setup_var_mtrrs(address_size, 1); + _x86_setup_mtrrs(1); } void x86_setup_mtrrs_with_detect(void) { detect_var_mtrrs(); - x86_setup_mtrrs(); + /* Always handle addresses above 4GiB. */ + _x86_setup_mtrrs(1); +} + +void x86_setup_mtrrs_with_detect_no_above_4gb(void) +{ + detect_var_mtrrs(); + _x86_setup_mtrrs(0); } void x86_mtrr_check(void) -- cgit v1.2.3