From e01742bf3df1d1d7f74c4f5beac4b1a50110d9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Wed, 28 Jun 2023 06:16:27 +0300 Subject: [PATCH] cpu/x86: Reduce scope of MTRR functions used locally MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic00358ee5b05d011a95d85ec355adef71c39a529 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/76193 Reviewed-by: Elyes Haouas Tested-by: build bot (Jenkins) --- src/cpu/x86/mtrr/mtrr.c | 4 ++-- src/include/cpu/x86/mtrr.h | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c index d156d4112d..a3a89fe0cd 100644 --- a/src/cpu/x86/mtrr/mtrr.c +++ b/src/cpu/x86/mtrr/mtrr.c @@ -346,13 +346,13 @@ static void commit_fixed_mtrrs(void) fixed_mtrrs_hide_amd_rwdram(); } -void x86_setup_fixed_mtrrs_no_enable(void) +static void x86_setup_fixed_mtrrs_no_enable(void) { calc_fixed_mtrrs(); commit_fixed_mtrrs(); } -void x86_setup_fixed_mtrrs(void) +static void x86_setup_fixed_mtrrs(void) { x86_setup_fixed_mtrrs_no_enable(); diff --git a/src/include/cpu/x86/mtrr.h b/src/include/cpu/x86/mtrr.h index 298947a982..5741afbb2d 100644 --- a/src/include/cpu/x86/mtrr.h +++ b/src/include/cpu/x86/mtrr.h @@ -95,9 +95,7 @@ void enable_fixed_mtrr(void); void fixed_mtrrs_expose_amd_rwdram(void); /* Hide Rd/WrDram bits and allow modification for AMD. */ void fixed_mtrrs_hide_amd_rwdram(void); -void x86_setup_fixed_mtrrs(void); -/* Set up fixed MTRRs but do not enable them. */ -void x86_setup_fixed_mtrrs_no_enable(void); + void x86_mtrr_check(void); /* Insert a temporary MTRR range for the duration of coreboot's runtime.