OvmfPkg/QemuFlashFvbServicesRuntimeDxe: use Mmio helper to clear enc mask

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3275

Use the MemEncryptSevClearMmioPageEncMask() to clear memory encryption mask
for the Mmio address range.

Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Min Xu <min.m.xu@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Erdem Aktas <erdemaktas@google.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
Message-Id: <20210519181949.6574-12-brijesh.singh@amd.com>

diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c
index 1f285e008372b069dd26bf991342ff247d26abb0..ab40087a8408624a828c54041ce1cc027e328bda 100644 (file)
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c
@@ -205,11 +205,10 @@ MarkIoMemoryRangeForRuntimeAccess (
   // memory range.\r
   //\r
   if (MemEncryptSevIsEnabled ()) {\r
-    Status = MemEncryptSevClearPageEncMask (\r
+    Status = MemEncryptSevClearMmioPageEncMask (\r
                0,\r
                BaseAddress,\r
-               EFI_SIZE_TO_PAGES (Length),\r
-               FALSE\r
+               EFI_SIZE_TO_PAGES (Length)\r
                );\r
     ASSERT_EFI_ERROR (Status);\r
   }\r

diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c
index 7eb80bfeffae591dcc1506b0a46a4962beb08006..ea75b489c7fd403af366c1be3004efd8cdea584f 100644 (file)
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c
@@ -38,11 +38,10 @@ QemuFlashBeforeProbe (
   // C-bit on flash ranges from SMM page table.\r
   //\r
 \r
-  Status = MemEncryptSevClearPageEncMask (\r
+  Status = MemEncryptSevClearMmioPageEncMask (\r
              0,\r
              BaseAddress,\r
-             EFI_SIZE_TO_PAGES (FdBlockSize * FdBlockCount),\r
-             FALSE\r
+             EFI_SIZE_TO_PAGES (FdBlockSize * FdBlockCount)\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
 }\r