REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3394
The function MtrrLibInitializeMtrrMask is a private function in MtrrLib.c from UefiCpuPkg, and it can be replace with new API GetMaxPlatformAddressBits. Cc: Michael Kubacki <mikub...@linux.microsoft.com> Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> Signed-off-by: Zhiguang Liu <zhiguang....@intel.com> --- .../PrmSampleHardwareAccessModule.c | 18 ++---------------- .../PrmSampleHardwareAccessModule.inf | 1 + 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.c b/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.c index 1a1e735029..398497c3a9 100644 --- a/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.c +++ b/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.c @@ -13,6 +13,7 @@ #include <Library/BaseLib.h> #include <Library/MtrrLib.h> #include <Library/UefiLib.h> +#include <Library/CpuLib.h> #include <Register/Intel/ArchitecturalMsr.h> #include <Register/Intel/Cpuid.h> @@ -37,21 +38,6 @@ // extern CONST CHAR8 *mMtrrMemoryCacheTypeShortName[]; -/** - Initializes the valid bits mask and valid address mask for MTRRs. - - This function initializes the valid bits mask and valid address mask for MTRRs. - - @param[out] MtrrValidBitsMask The mask for the valid bit of the MTRR - @param[out] MtrrValidAddressMask The valid address mask for the MTRR - -**/ -VOID -MtrrLibInitializeMtrrMask ( - OUT UINT64 *MtrrValidBitsMask, - OUT UINT64 *MtrrValidAddressMask - ); - /** Convert variable MTRRs to a RAW MTRR_MEMORY_RANGE array. One MTRR_MEMORY_RANGE element is created for each MTRR setting. @@ -151,7 +137,7 @@ AccessAllMtrrs ( MtrrGetAllMtrrs (&LocalMtrrs); Mtrrs = &LocalMtrrs; - MtrrLibInitializeMtrrMask (&MtrrValidBitsMask, &MtrrValidAddressMask); + GetMaxPlatformAddressBits (&MtrrValidBitsMask, &MtrrValidAddressMask); Ranges[0].BaseAddress = 0; Ranges[0].Length = MtrrValidBitsMask + 1; Ranges[0].Type = MtrrGetDefaultMemoryType (); diff --git a/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.inf b/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.inf index 46d4a88185..b15da817c1 100644 --- a/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.inf +++ b/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.inf @@ -34,6 +34,7 @@ MtrrLib UefiDriverEntryPoint UefiLib + CpuLib [Depex] TRUE -- 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#105910): https://edk2.groups.io/g/devel/message/105910 Mute This Topic: https://groups.io/mt/99399600/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
