OvmfPkg/AmdSevDxe: use MemEncryptSevClearMmioPageEncMask() to clear EncMask

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

Use the MemEncryptSevClearMmioPageEncMask() to clear memory encryption mask
for the Mmio and NonExistent 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-11-brijesh.singh@amd.com>

diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c
index 689bfb376d03904ad50bfe37a23acee2f20a5af3..80831b81facfc2244e746bafb292357194190c15 100644 (file)
--- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c
+++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c
@@ -53,11 +53,10 @@ AmdSevDxeEntryPoint (
       Desc = &AllDescMap[Index];\r
       if (Desc->GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo ||\r
           Desc->GcdMemoryType == EfiGcdMemoryTypeNonExistent) {\r
-        Status = MemEncryptSevClearPageEncMask (\r
+        Status = MemEncryptSevClearMmioPageEncMask (\r
                    0,\r
                    Desc->BaseAddress,\r
-                   EFI_SIZE_TO_PAGES (Desc->Length),\r
-                   FALSE\r
+                   EFI_SIZE_TO_PAGES (Desc->Length)\r
                    );\r
         ASSERT_EFI_ERROR (Status);\r
       }\r
@@ -73,11 +72,10 @@ AmdSevDxeEntryPoint (
   // the range.\r
   //\r
   if (PcdGet16 (PcdOvmfHostBridgePciDevId) == INTEL_Q35_MCH_DEVICE_ID) {\r
-    Status = MemEncryptSevClearPageEncMask (\r
+    Status = MemEncryptSevClearMmioPageEncMask (\r
                0,\r
                FixedPcdGet64 (PcdPciExpressBaseAddress),\r
-               EFI_SIZE_TO_PAGES (SIZE_256MB),\r
-               FALSE\r
+               EFI_SIZE_TO_PAGES (SIZE_256MB)\r
                );\r
 \r
     ASSERT_EFI_ERROR (Status);\r