Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

UefiCpuPkg/MtrrUnitTest: Update test to cover no-fixed-mtrr cases. 

Signed-off-by: Ray Ni <ray.ni@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
This commit is contained in:
Ray Ni 2022-09-29 16:19:26 +08:00 committed by mergify[bot]
parent 1ec374cb50
commit 5b76b4a9f9
2 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c
View File

@ -31,6 +31,11 @@ STATIC MTRR_LIB_SYSTEM_PARAMETER mSystemParameters[] = {
{ 48, TRUE, TRUE, CacheWriteProtected, 12 }, { 48, TRUE, TRUE, CacheWriteProtected, 12 },
{ 48, TRUE, TRUE, CacheWriteCombining, 12 }, { 48, TRUE, TRUE, CacheWriteCombining, 12 },
{ 48, TRUE, FALSE, CacheUncacheable, 12 },
{ 48, TRUE, FALSE, CacheWriteBack, 12 },
{ 48, TRUE, FALSE, CacheWriteThrough, 12 },
{ 48, TRUE, FALSE, CacheWriteProtected, 12 },
{ 48, TRUE, FALSE, CacheWriteCombining, 12 },
{ 48, TRUE, TRUE, CacheWriteBack, 12, 7}, // 7 bits for MKTME { 48, TRUE, TRUE, CacheWriteBack, 12, 7}, // 7 bits for MKTME
}; };

20
UefiCpuPkg/Library/MtrrLib/UnitTest/Support.c
View File

@ -43,7 +43,6 @@ Rand (
if (mRandomInput) { if (mRandomInput) {
return rand (); return rand ();
} else { } else {
DEBUG ((DEBUG_INFO, "random: %d\n", mNumberIndex));
return mNumbers[mNumberIndex++ % (mNumberCount - 1)]; return mNumbers[mNumberIndex++ % (mNumberCount - 1)];
} }
} }
@ -236,8 +235,11 @@ UnitTestMtrrLibAsmReadMsr64 (
{ {
UINT32 Index; UINT32 Index;
UT_ASSERT_EQUAL (mCpuidVersionInfoEdx.Bits.MTRR, 1);
for (Index = 0; Index < ARRAY_SIZE (mFixedMtrrsValue); Index++) { for (Index = 0; Index < ARRAY_SIZE (mFixedMtrrsValue); Index++) {
if (MsrIndex == mFixedMtrrsIndex[Index]) { if (MsrIndex == mFixedMtrrsIndex[Index]) {
UT_ASSERT_EQUAL (mMtrrCapMsr.Bits.FIX, 1);
return mFixedMtrrsValue[Index]; return mFixedMtrrsValue[Index];
} }
} }
@ -245,6 +247,7 @@ UnitTestMtrrLibAsmReadMsr64 (
if ((MsrIndex >= MSR_IA32_MTRR_PHYSBASE0) && if ((MsrIndex >= MSR_IA32_MTRR_PHYSBASE0) &&
(MsrIndex <= MSR_IA32_MTRR_PHYSMASK0 + (MTRR_NUMBER_OF_VARIABLE_MTRR << 1))) (MsrIndex <= MSR_IA32_MTRR_PHYSMASK0 + (MTRR_NUMBER_OF_VARIABLE_MTRR << 1)))
{ {
UT_ASSERT_TRUE (((MsrIndex - MSR_IA32_MTRR_PHYSBASE0) >> 1) < mMtrrCapMsr.Bits.VCNT);
if (MsrIndex % 2 == 0) { if (MsrIndex % 2 == 0) {
Index = (MsrIndex - MSR_IA32_MTRR_PHYSBASE0) >> 1; Index = (MsrIndex - MSR_IA32_MTRR_PHYSBASE0) >> 1;
return mVariableMtrrsPhysBase[Index].Uint64; return mVariableMtrrsPhysBase[Index].Uint64;
@ -299,8 +302,11 @@ UnitTestMtrrLibAsmWriteMsr64 (
{ {
UINT32 Index; UINT32 Index;
UT_ASSERT_EQUAL (mCpuidVersionInfoEdx.Bits.MTRR, 1);
for (Index = 0; Index < ARRAY_SIZE (mFixedMtrrsValue); Index++) { for (Index = 0; Index < ARRAY_SIZE (mFixedMtrrsValue); Index++) {
if (MsrIndex == mFixedMtrrsIndex[Index]) { if (MsrIndex == mFixedMtrrsIndex[Index]) {
UT_ASSERT_EQUAL (mMtrrCapMsr.Bits.FIX, 1);
mFixedMtrrsValue[Index] = Value; mFixedMtrrsValue[Index] = Value;
return Value; return Value;
} }
@ -309,6 +315,7 @@ UnitTestMtrrLibAsmWriteMsr64 (
if ((MsrIndex >= MSR_IA32_MTRR_PHYSBASE0) && if ((MsrIndex >= MSR_IA32_MTRR_PHYSBASE0) &&
(MsrIndex <= MSR_IA32_MTRR_PHYSMASK0 + (MTRR_NUMBER_OF_VARIABLE_MTRR << 1))) (MsrIndex <= MSR_IA32_MTRR_PHYSMASK0 + (MTRR_NUMBER_OF_VARIABLE_MTRR << 1)))
{ {
UT_ASSERT_TRUE (((MsrIndex - MSR_IA32_MTRR_PHYSBASE0) >> 1) < mMtrrCapMsr.Bits.VCNT);
if (MsrIndex % 2 == 0) { if (MsrIndex % 2 == 0) {
Index = (MsrIndex - MSR_IA32_MTRR_PHYSBASE0) >> 1; Index = (MsrIndex - MSR_IA32_MTRR_PHYSBASE0) >> 1;
mVariableMtrrsPhysBase[Index].Uint64 = Value; mVariableMtrrsPhysBase[Index].Uint64 = Value;
@ -321,6 +328,10 @@ UnitTestMtrrLibAsmWriteMsr64 (
} }
if (MsrIndex == MSR_IA32_MTRR_DEF_TYPE) { if (MsrIndex == MSR_IA32_MTRR_DEF_TYPE) {
if (((MSR_IA32_MTRR_DEF_TYPE_REGISTER *)&Value)->Bits.FE == 1) {
UT_ASSERT_EQUAL (mMtrrCapMsr.Bits.FIX, 1);
}
mDefTypeMsr.Uint64 = Value; mDefTypeMsr.Uint64 = Value;
return Value; return Value;
} }
@ -354,16 +365,11 @@ InitializeMtrrRegs (
for (Index = 0; Index < ARRAY_SIZE (mVariableMtrrsPhysBase); Index++) { for (Index = 0; Index < ARRAY_SIZE (mVariableMtrrsPhysBase); Index++) {
mVariableMtrrsPhysBase[Index].Uint64 = 0; mVariableMtrrsPhysBase[Index].Uint64 = 0;
mVariableMtrrsPhysBase[Index].Bits.Type = SystemParameter->DefaultCacheType;
mVariableMtrrsPhysBase[Index].Bits.Reserved1 = 0;
mVariableMtrrsPhysMask[Index].Uint64 = 0; mVariableMtrrsPhysMask[Index].Uint64 = 0;
mVariableMtrrsPhysMask[Index].Bits.V = 0;
mVariableMtrrsPhysMask[Index].Bits.Reserved1 = 0;
} }
mDefTypeMsr.Bits.E = 1; mDefTypeMsr.Bits.E = 1;
mDefTypeMsr.Bits.FE = 1; mDefTypeMsr.Bits.FE = 0;
mDefTypeMsr.Bits.Type = SystemParameter->DefaultCacheType; mDefTypeMsr.Bits.Type = SystemParameter->DefaultCacheType;
mDefTypeMsr.Bits.Reserved1 = 0; mDefTypeMsr.Bits.Reserved1 = 0;
mDefTypeMsr.Bits.Reserved2 = 0; mDefTypeMsr.Bits.Reserved2 = 0;