[edk2-devel] [PATCH 07/16] UefiCpuPkg/MtrrUnitTest: Update UnitTestMtrrGetAllMtrrs().

[Yuanhao Xie]

Update UnitTestMtrrGetAllMtrrs() for the case that fixed MtrrLib
is not always supported

Signed-off-by: Yuanhao Xie <yuanhao.xie at intel.com>
Cc: Eric Dong <eric.dong at intel.com>
Cc: Rahul Kumar <rahul1.kumar at intel.com>
Cc: Gerd Hoffmann <kraxel at redhat.com>
Cc: Ray Ni <ray.ni at intel.com>
---
 UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 84 insertions(+), 15 deletions(-)

diff --git a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c
index 13cebee32b..de9db4fcb4 100644
--- a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c
+++ b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c
@@ -653,6 +653,52 @@ UnitTestMtrrGetFixedMtrr (
   return UNIT_TEST_PASSED;
 }
 
+/**
+  Set Random Variable and Fixed MTRRs Settings for
+  unit test of UnitTestMtrrGetAllMtrrs.
+
+  @param SystemParameter      System parameter that controls the MTRR registers initialization.
+  @param ExpectedMtrrs        Expected Fixed and Variable MTRRs.
+**/
+VOID
+SetRandomlyGeneratedMtrrSettings (
+  IN MTRR_LIB_SYSTEM_PARAMETER  *SystemParameter,
+  IN MTRR_SETTINGS              *ExpectedMtrrs
+  )
+{
+  UINT32                           Index;
+  UINTN                            MsrIndex;
+  UINTN                            ByteIndex;
+  UINT64                           MsrValue;
+  MSR_IA32_MTRR_DEF_TYPE_REGISTER  Default;
+
+  AsmWriteMsr64 (MSR_IA32_MTRR_DEF_TYPE, ExpectedMtrrs->MtrrDefType);
+  //
+  // Randomly generate Variable MTRR BASE/MASK for a specified type and write to MSR.
+  //
+  for (Index = 0; Index < SystemParameter->VariableMtrrCount; Index++) {
+    GenerateRandomMtrrPair (SystemParameter->PhysicalAddressBits, GenerateRandomCacheType (), &ExpectedMtrrs->Variables.Mtrr[Index], NULL);
+    AsmWriteMsr64 (MSR_IA32_MTRR_PHYSBASE0 + (Index << 1), ExpectedMtrrs->Variables.Mtrr[Index].Base);
+    AsmWriteMsr64 (MSR_IA32_MTRR_PHYSMASK0 + (Index << 1), ExpectedMtrrs->Variables.Mtrr[Index].Mask);
+  }
+
+  //
+  // Set Fixed MTRRs when the Fixed MTRRs is enabled and the MTRRs is supported.
+  //
+  Default.Uint64 = AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE);
+  if ((Default.Bits.FE == 1) && (SystemParameter->MtrrSupported == TRUE)) {
+    for (MsrIndex = 0; MsrIndex < ARRAY_SIZE (mFixedMtrrsIndex); MsrIndex++) {
+      MsrValue = 0;
+      for (ByteIndex = 0; ByteIndex < sizeof (UINT64); ByteIndex++) {
+        MsrValue = MsrValue | LShiftU64 (GenerateRandomCacheType (), ByteIndex * 8);
+      }
+
+      ExpectedMtrrs->Fixed.Mtrr[MsrIndex] = MsrValue;
+      AsmWriteMsr64 (mFixedMtrrsIndex[MsrIndex], MsrValue);
+    }
+  }
+}
+
 /**
   Unit test of MtrrLib service MtrrGetAllMtrrs()
 
@@ -669,28 +715,51 @@ UnitTestMtrrGetAllMtrrs (
   IN UNIT_TEST_CONTEXT  Context
   )
 {
-  MTRR_SETTINGS              *Result;
-  MTRR_SETTINGS              Mtrrs;
-  MTRR_SETTINGS              ExpectedMtrrs;
-  MTRR_VARIABLE_SETTING      VariableMtrr[MTRR_NUMBER_OF_VARIABLE_MTRR];
-  UINT32                     Index;
-  MTRR_LIB_SYSTEM_PARAMETER  SystemParameter;
-  MTRR_LIB_TEST_CONTEXT      *LocalContext;
+  MTRR_SETTINGS                    *Result;
+  MTRR_SETTINGS                    Mtrrs;
+  MTRR_SETTINGS                    ExpectedMtrrs;
+  MTRR_LIB_SYSTEM_PARAMETER        SystemParameter;
+  MTRR_LIB_TEST_CONTEXT            *LocalContext;
+  MSR_IA32_MTRR_DEF_TYPE_REGISTER  Default;
 
   LocalContext = (MTRR_LIB_TEST_CONTEXT *)Context;
 
   CopyMem (&SystemParameter, LocalContext->SystemParameter, sizeof (SystemParameter));
-  InitializeMtrrRegs (&SystemParameter);
 
-  for (Index = 0; Index < SystemParameter.VariableMtrrCount; Index++) {
-    GenerateRandomMtrrPair (SystemParameter.PhysicalAddressBits, GenerateRandomCacheType (), &VariableMtrr[Index], NULL);
-    AsmWriteMsr64 (MSR_IA32_MTRR_PHYSBASE0 + (Index << 1), VariableMtrr[Index].Base);
-    AsmWriteMsr64 (MSR_IA32_MTRR_PHYSMASK0 + (Index << 1), VariableMtrr[Index].Mask);
-  }
+  //
+  // For the case that Fixed MTRRs is NOT enabled
+  //
+  SystemParameter.MtrrSupported      = TRUE;
+  SystemParameter.FixedMtrrSupported = FALSE;
+  InitializeMtrrRegs (&SystemParameter);
+  Default.Uint64  = 0;
+  Default.Bits.E  = 1;
+  Default.Bits.FE = 0;
+  ZeroMem (&ExpectedMtrrs, sizeof (ExpectedMtrrs));
+  ExpectedMtrrs.MtrrDefType = Default.Uint64;
+  //
+  // Randomly generate expected MtrrSettings and set to MSR.
+  //
+  SetRandomlyGeneratedMtrrSettings (&SystemParameter, &ExpectedMtrrs);
+  Result = MtrrGetAllMtrrs (&Mtrrs);
+  UT_ASSERT_MEM_EQUAL (&ExpectedMtrrs.Fixed, &Mtrrs.Fixed, sizeof (MTRR_FIXED_SETTINGS));
+  UT_ASSERT_MEM_EQUAL (Mtrrs.Variables.Mtrr, ExpectedMtrrs.Variables.Mtrr, sizeof (MTRR_VARIABLE_SETTING) * (SystemParameter.VariableMtrrCount));
 
+  //
+  // For the case that Fixed MTRRs is enabled
+  //
+  SystemParameter.MtrrSupported      = TRUE;
+  SystemParameter.FixedMtrrSupported = TRUE;
+  InitializeMtrrRegs (&SystemParameter);
+  Default.Uint64  = 0;
+  Default.Bits.E  = 1;
+  Default.Bits.FE = 1;
+  ZeroMem (&ExpectedMtrrs, sizeof (ExpectedMtrrs));
+  ExpectedMtrrs.MtrrDefType = Default.Uint64;
+  SetRandomlyGeneratedMtrrSettings (&SystemParameter, &ExpectedMtrrs);
   Result = MtrrGetAllMtrrs (&Mtrrs);
-  UT_ASSERT_EQUAL ((UINTN)Result, (UINTN)&Mtrrs);
-  UT_ASSERT_MEM_EQUAL (Mtrrs.Variables.Mtrr, VariableMtrr, sizeof (MTRR_VARIABLE_SETTING) * SystemParameter.VariableMtrrCount);
+  UT_ASSERT_MEM_EQUAL (&ExpectedMtrrs.Fixed, &Mtrrs.Fixed, sizeof (MTRR_FIXED_SETTINGS));
+  UT_ASSERT_MEM_EQUAL (Mtrrs.Variables.Mtrr, ExpectedMtrrs.Variables.Mtrr, sizeof (MTRR_VARIABLE_SETTING) * (SystemParameter.VariableMtrrCount));
 
   //
   // Negative test case when MTRRs are not supported
-- 
2.36.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#108563): https://edk2.groups.io/g/devel/message/108563
Mute This Topic: https://groups.io/mt/101331025/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-