OvmfPkg/IoMmuDxe: rename HostAddress to CryptedAddress in MAP_INFO

As a continuation of the last patch, clarify that the area pointed-to by
"HostAddress" is encrypted and hidden from the hypervisor.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Brijesh Singh <brijesh.singh@amd.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Brijesh Singh <brijesh.singh@amd.com>
Reviewed-by: Brijesh Singh <brijesh.singh@amd.com>

diff --git a/OvmfPkg/IoMmuDxe/AmdSevIoMmu.c b/OvmfPkg/IoMmuDxe/AmdSevIoMmu.c
index fcb7bcfaecc2fed3be771bcff7a310d068ddd804..dfad2cbb569d1180c700465dea7c9d298e728bef 100644 (file)
--- a/OvmfPkg/IoMmuDxe/AmdSevIoMmu.c
+++ b/OvmfPkg/IoMmuDxe/AmdSevIoMmu.c
@@ -24,7 +24,7 @@ typedef struct {
   EDKII_IOMMU_OPERATION                     Operation;\r
   UINTN                                     NumberOfBytes;\r
   UINTN                                     NumberOfPages;\r
-  EFI_PHYSICAL_ADDRESS                      HostAddress;\r
+  EFI_PHYSICAL_ADDRESS                      CryptedAddress;\r
   EFI_PHYSICAL_ADDRESS                      PlainTextAddress;\r
 } MAP_INFO;\r
 \r
@@ -144,7 +144,7 @@ IoMmuMap (
   MapInfo->Operation         = Operation;\r
   MapInfo->NumberOfBytes     = *NumberOfBytes;\r
   MapInfo->NumberOfPages     = EFI_SIZE_TO_PAGES (MapInfo->NumberOfBytes);\r
-  MapInfo->HostAddress       = PhysicalAddress;\r
+  MapInfo->CryptedAddress    = PhysicalAddress;\r
   MapInfo->PlainTextAddress  = DmaMemoryTop;\r
 \r
   //\r
@@ -182,7 +182,7 @@ IoMmuMap (
       Operation == EdkiiIoMmuOperationBusMasterRead64) {\r
     CopyMem (\r
       (VOID *) (UINTN) MapInfo->PlainTextAddress,\r
-      (VOID *) (UINTN) MapInfo->HostAddress,\r
+      (VOID *) (UINTN) MapInfo->CryptedAddress,\r
       MapInfo->NumberOfBytes\r
       );\r
   }\r
@@ -199,10 +199,10 @@ IoMmuMap (
 \r
   DEBUG ((\r
     DEBUG_VERBOSE,\r
-    "%a PlainText 0x%Lx Host 0x%Lx Pages 0x%Lx Bytes 0x%Lx\n",\r
+    "%a PlainText 0x%Lx Crypted 0x%Lx Pages 0x%Lx Bytes 0x%Lx\n",\r
     __FUNCTION__,\r
     MapInfo->PlainTextAddress,\r
-    MapInfo->HostAddress,\r
+    MapInfo->CryptedAddress,\r
     MapInfo->NumberOfPages,\r
     MapInfo->NumberOfBytes\r
     ));\r
@@ -255,7 +255,7 @@ IoMmuUnmap (
   if (MapInfo->Operation == EdkiiIoMmuOperationBusMasterWrite ||\r
       MapInfo->Operation == EdkiiIoMmuOperationBusMasterWrite64) {\r
     CopyMem (\r
-      (VOID *) (UINTN) MapInfo->HostAddress,\r
+      (VOID *) (UINTN) MapInfo->CryptedAddress,\r
       (VOID *) (UINTN) MapInfo->PlainTextAddress,\r
       MapInfo->NumberOfBytes\r
       );\r
@@ -263,10 +263,10 @@ IoMmuUnmap (
 \r
   DEBUG ((\r
     DEBUG_VERBOSE,\r
-    "%a PlainText 0x%Lx Host 0x%Lx Pages 0x%Lx Bytes 0x%Lx\n",\r
+    "%a PlainText 0x%Lx Crypted 0x%Lx Pages 0x%Lx Bytes 0x%Lx\n",\r
     __FUNCTION__,\r
     MapInfo->PlainTextAddress,\r
-    MapInfo->HostAddress,\r
+    MapInfo->CryptedAddress,\r
     MapInfo->NumberOfPages,\r
     MapInfo->NumberOfBytes\r
     ));\r