diff options
| author | Abdul Lateef Attar <AbdulLateef.Attar@amd.com> | 2023-07-12 14:24:21 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-07-17 09:43:43 +0000 |
| commit | 4d1014093fbf1ae2788caaad8e70eabb15720ce4 (patch) | |
| tree | 333077c30e9c594d791154daa2f128330a30736f | |
| parent | 39ded59c09a38cb17cee498fca9f390c4deca98a (diff) | |
| download | edk2-4d1014093fbf1ae2788caaad8e70eabb15720ce4.tar.gz edk2-4d1014093fbf1ae2788caaad8e70eabb15720ce4.tar.bz2 edk2-4d1014093fbf1ae2788caaad8e70eabb15720ce4.zip | |
UefiCpuPkg: Uses gMmst in MmSaveStateLib
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4182
Use gMmst instead of gSmst.
Replace SmmServicesTableLib with MmServicesTableLib.
Cc: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Abner Chang <abner.chang@amd.com>
Signed-off-by: Abdul Lateef Attar <AbdulLateef.Attar@amd.com>
6 files changed, 10 insertions, 10 deletions
diff --git a/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c b/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c index 9fed52896f..3315a6cc44 100644 --- a/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c +++ b/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c @@ -108,7 +108,7 @@ MmSaveStateReadRegister ( UINT8 DataWidth;
// Read CPU State
- CpuSaveState = (AMD_SMRAM_SAVE_STATE_MAP *)gSmst->CpuSaveState[CpuIndex];
+ CpuSaveState = (AMD_SMRAM_SAVE_STATE_MAP *)gMmst->CpuSaveState[CpuIndex];
// Check for special EFI_MM_SAVE_STATE_REGISTER_LMA
if (Register == EFI_MM_SAVE_STATE_REGISTER_LMA) {
@@ -226,7 +226,7 @@ MmSaveStateWriteRegister ( return EFI_NOT_FOUND;
}
- CpuSaveState = gSmst->CpuSaveState[CpuIndex];
+ CpuSaveState = gMmst->CpuSaveState[CpuIndex];
//
// Do not write non-writable SaveState, because it will cause exception.
diff --git a/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf b/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf index 5c0685f283..dcee6c401d 100644 --- a/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf +++ b/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf @@ -31,4 +31,4 @@ BaseLib
BaseMemoryLib
DebugLib
- SmmServicesTableLib
+ MmServicesTableLib
diff --git a/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c b/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c index fd321bb571..c2ccd65b1d 100644 --- a/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c +++ b/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c @@ -296,7 +296,7 @@ MmSaveStateWriteRegister ( return EFI_NOT_FOUND;
}
- CpuSaveState = gSmst->CpuSaveState[CpuIndex];
+ CpuSaveState = gMmst->CpuSaveState[CpuIndex];
//
// Do not write non-writable SaveState, because it will cause exception.
diff --git a/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf b/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf index b92dfa6432..b7fd4078f5 100644 --- a/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf +++ b/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf @@ -31,4 +31,4 @@ BaseLib
BaseMemoryLib
DebugLib
- SmmServicesTableLib
+ MmServicesTableLib
diff --git a/UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h b/UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h index c3499cbb3b..6c7e8abd5f 100644 --- a/UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h +++ b/UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h @@ -14,7 +14,7 @@ #include <Protocol/MmCpu.h>
#include <Library/DebugLib.h>
#include <Library/MmSaveStateLib.h>
-#include <Library/SmmServicesTableLib.h>
+#include <Library/MmServicesTableLib.h>
#include <Library/BaseMemoryLib.h>
// Macro used to simplify the lookup table entries of type CPU_MM_SAVE_STATE_REGISTER_RANGE
diff --git a/UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c b/UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c index 09c6c3f96f..f66245b82c 100644 --- a/UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c +++ b/UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c @@ -99,8 +99,8 @@ MmSaveStateReadRegisterByIndex ( //
// Write return buffer
//
- ASSERT (gSmst->CpuSaveState[CpuIndex] != NULL);
- CopyMem (Buffer, (UINT8 *)gSmst->CpuSaveState[CpuIndex] + mCpuWidthOffset[RegisterIndex].Offset32, Width);
+ ASSERT (gMmst->CpuSaveState[CpuIndex] != NULL);
+ CopyMem (Buffer, (UINT8 *)gMmst->CpuSaveState[CpuIndex] + mCpuWidthOffset[RegisterIndex].Offset32, Width);
} else {
//
// If 64-bit mode width is zero, then the specified register can not be accessed
@@ -119,12 +119,12 @@ MmSaveStateReadRegisterByIndex ( //
// Write lower 32-bits of return buffer
//
- CopyMem (Buffer, (UINT8 *)gSmst->CpuSaveState[CpuIndex] + mCpuWidthOffset[RegisterIndex].Offset64Lo, MIN (4, Width));
+ CopyMem (Buffer, (UINT8 *)gMmst->CpuSaveState[CpuIndex] + mCpuWidthOffset[RegisterIndex].Offset64Lo, MIN (4, Width));
if (Width > 4) {
//
// Write upper 32-bits of return buffer
//
- CopyMem ((UINT8 *)Buffer + 4, (UINT8 *)gSmst->CpuSaveState[CpuIndex] + mCpuWidthOffset[RegisterIndex].Offset64Hi, Width - 4);
+ CopyMem ((UINT8 *)Buffer + 4, (UINT8 *)gMmst->CpuSaveState[CpuIndex] + mCpuWidthOffset[RegisterIndex].Offset64Hi, Width - 4);
}
}
|