From 9c6f3545aee0808b78a0ad4480b6eb9d24989dc1 Mon Sep 17 00:00:00 2001 From: Ray Ni Date: Mon, 13 Jul 2020 15:55:32 +0800 Subject: [PATCH] UefiCpuPkg/MtrrLib: Remove unnecessary API MtrrSetFixedMtrr() REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2849 MtrrSetFixedMtrr() sets all the fixed MTRR settings. But in fact MtrrSetAllMtrrs() is always used by callers to set all MTRR settings including the fixed and variable ones. The patch removes the unnecessary API MtrrSetFixedMtrr() to simplify the MtrrLib API. There is no code in edk2 and edk2-platforms repo that calls MtrrSetFixedMtrr(). Signed-off-by: Ray Ni Reviewed-by: Eric Dong Reviewed-by: Laszlo Ersek Cc: Rahul Kumar --- UefiCpuPkg/Include/Library/MtrrLib.h | 15 -------------- UefiCpuPkg/Library/MtrrLib/MtrrLib.c | 29 ---------------------------- 2 files changed, 44 deletions(-) diff --git a/UefiCpuPkg/Include/Library/MtrrLib.h b/UefiCpuPkg/Include/Library/MtrrLib.h index 0bc69e235c..9110787067 100644 --- a/UefiCpuPkg/Include/Library/MtrrLib.h +++ b/UefiCpuPkg/Include/Library/MtrrLib.h @@ -200,21 +200,6 @@ MtrrGetFixedMtrr ( ); -/** - This function sets fixed MTRRs - - @param[in] FixedSettings A buffer holding fixed MTRRs content. - - @return The pointer of FixedSettings - -**/ -MTRR_FIXED_SETTINGS* -EFIAPI -MtrrSetFixedMtrr ( - IN MTRR_FIXED_SETTINGS *FixedSettings - ); - - /** This function gets the content in all MTRRs (variable and fixed) diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c index 8b54f2c03b..ceab7a065f 100644 --- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c +++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c @@ -2580,35 +2580,6 @@ MtrrSetFixedMtrrWorker ( } -/** - This function sets fixed MTRRs - - @param[in] FixedSettings A buffer to hold fixed MTRRs content. - - @retval The pointer of FixedSettings - -**/ -MTRR_FIXED_SETTINGS* -EFIAPI -MtrrSetFixedMtrr ( - IN MTRR_FIXED_SETTINGS *FixedSettings - ) -{ - MTRR_CONTEXT MtrrContext; - - if (!IsMtrrSupported ()) { - return FixedSettings; - } - - MtrrLibPreMtrrChange (&MtrrContext); - MtrrSetFixedMtrrWorker (FixedSettings); - MtrrLibPostMtrrChange (&MtrrContext); - MtrrDebugPrintAllMtrrs (); - - return FixedSettings; -} - - /** This function gets the content in all MTRRs (variable and fixed)