UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / OvmfPkg / QemuFlashFvbServicesRuntimeDxe / FwBlockServiceDxe.c

diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c
index e60978fa127badc228ada22a22f4d8fc05ab53a0..61e1f2e196e5c264de935223f67c5aa20a8e8786 100644 (file)
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c
@@ -24,12 +24,12 @@
 \r
 VOID\r
 InstallProtocolInterfaces (\r
-  IN EFI_FW_VOL_BLOCK_DEVICE *FvbDevice\r
+  IN EFI_FW_VOL_BLOCK_DEVICE  *FvbDevice\r
   )\r
 {\r
-  EFI_STATUS                         Status;\r
-  EFI_HANDLE                         FwbHandle;\r
-  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *OldFwbInterface;\r
+  EFI_STATUS                          Status;\r
+  EFI_HANDLE                          FwbHandle;\r
+  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *OldFwbInterface;\r
 \r
   ASSERT (!FeaturePcdGet (PcdSmmSmramRequire));\r
 \r
@@ -37,14 +37,17 @@ InstallProtocolInterfaces (
   // Find a handle with a matching device path that has supports FW Block\r
   // protocol\r
   //\r
-  Status = gBS->LocateDevicePath (&gEfiFirmwareVolumeBlockProtocolGuid,\r
-                  &FvbDevice->DevicePath, &FwbHandle);\r
+  Status = gBS->LocateDevicePath (\r
+                  &gEfiFirmwareVolumeBlockProtocolGuid,\r
+                  &FvbDevice->DevicePath,\r
+                  &FwbHandle\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     //\r
     // LocateDevicePath fails so install a new interface and device path\r
     //\r
     FwbHandle = NULL;\r
-    DEBUG ((EFI_D_INFO, "Installing QEMU flash FVB\n"));\r
+    DEBUG ((DEBUG_INFO, "Installing QEMU flash FVB\n"));\r
     Status = gBS->InstallMultipleProtocolInterfaces (\r
                     &FwbHandle,\r
                     &gEfiFirmwareVolumeBlockProtocolGuid,\r
@@ -61,11 +64,11 @@ InstallProtocolInterfaces (
     Status = gBS->HandleProtocol (\r
                     FwbHandle,\r
                     &gEfiFirmwareVolumeBlockProtocolGuid,\r
-                    (VOID**)&OldFwbInterface\r
+                    (VOID **)&OldFwbInterface\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
-    DEBUG ((EFI_D_INFO, "Reinstalling FVB for QEMU flash region\n"));\r
+    DEBUG ((DEBUG_INFO, "Reinstalling FVB for QEMU flash region\n"));\r
     Status = gBS->ReinstallProtocolInterface (\r
                     FwbHandle,\r
                     &gEfiFirmwareVolumeBlockProtocolGuid,\r
@@ -81,14 +84,14 @@ InstallProtocolInterfaces (
   }\r
 }\r
 \r
-\r
 STATIC\r
 VOID\r
 EFIAPI\r
 FvbVirtualAddressChangeEvent (\r
-  IN EFI_EVENT        Event,\r
-  IN VOID             *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
+\r
 /*++\r
 \r
   Routine Description:\r
@@ -107,39 +110,38 @@ FvbVirtualAddressChangeEvent (
 \r
 --*/\r
 {\r
-  EFI_FW_VOL_INSTANCE *FwhInstance;\r
-  UINTN               Index;\r
+  EFI_FW_VOL_INSTANCE  *FwhInstance;\r
+  UINTN                Index;\r
 \r
   FwhInstance = mFvbModuleGlobal->FvInstance;\r
-  EfiConvertPointer (0x0, (VOID **) &mFvbModuleGlobal->FvInstance);\r
+  EfiConvertPointer (0x0, (VOID **)&mFvbModuleGlobal->FvInstance);\r
 \r
   //\r
   // Convert the base address of all the instances\r
   //\r
-  Index       = 0;\r
+  Index = 0;\r
   while (Index < mFvbModuleGlobal->NumFv) {\r
-    EfiConvertPointer (0x0, (VOID **) &FwhInstance->FvBase);\r
+    EfiConvertPointer (0x0, (VOID **)&FwhInstance->FvBase);\r
     FwhInstance = (EFI_FW_VOL_INSTANCE *)\r
-      (\r
-        (UINTN) ((UINT8 *) FwhInstance) +\r
-        FwhInstance->VolumeHeader.HeaderLength +\r
-        (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
-      );\r
+                  (\r
+                   (UINTN)((UINT8 *)FwhInstance) +\r
+                   FwhInstance->VolumeHeader.HeaderLength +\r
+                   (sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER))\r
+                  );\r
     Index++;\r
   }\r
 \r
-  EfiConvertPointer (0x0, (VOID **) &mFvbModuleGlobal);\r
+  EfiConvertPointer (0x0, (VOID **)&mFvbModuleGlobal);\r
   QemuFlashConvertPointers ();\r
 }\r
 \r
-\r
 VOID\r
 InstallVirtualAddressChangeHandler (\r
   VOID\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  EFI_EVENT  VirtualAddressChangeEvent;\r
+  EFI_STATUS  Status;\r
+  EFI_EVENT   VirtualAddressChangeEvent;\r
 \r
   Status = gBS->CreateEventEx (\r
                   EVT_NOTIFY_SIGNAL,\r
@@ -154,12 +156,12 @@ InstallVirtualAddressChangeHandler (
 \r
 EFI_STATUS\r
 MarkIoMemoryRangeForRuntimeAccess (\r
-  IN EFI_PHYSICAL_ADDRESS                BaseAddress,\r
-  IN UINTN                               Length\r
+  IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
+  IN UINTN                 Length\r
   )\r
 {\r
-  EFI_STATUS                          Status;\r
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR     GcdDescriptor;\r
+  EFI_STATUS                       Status;\r
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  GcdDescriptor;\r
 \r
   //\r
   // Mark flash region as runtime memory\r
@@ -205,11 +207,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
@@ -222,24 +223,24 @@ SetPcdFlashNvStorageBaseAddresses (
   VOID\r
   )\r
 {\r
-  RETURN_STATUS PcdStatus;\r
+  RETURN_STATUS  PcdStatus;\r
 \r
   //\r
   // Set several PCD values to point to flash\r
   //\r
   PcdStatus = PcdSet64S (\r
-    PcdFlashNvStorageVariableBase64,\r
-    (UINTN) PcdGet32 (PcdOvmfFlashNvStorageVariableBase)\r
-    );\r
+                PcdFlashNvStorageVariableBase64,\r
+                (UINTN)PcdGet32 (PcdOvmfFlashNvStorageVariableBase)\r
+                );\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
   PcdStatus = PcdSet32S (\r
-    PcdFlashNvStorageFtwWorkingBase,\r
-    PcdGet32 (PcdOvmfFlashNvStorageFtwWorkingBase)\r
-    );\r
+                PcdFlashNvStorageFtwWorkingBase,\r
+                PcdGet32 (PcdOvmfFlashNvStorageFtwWorkingBase)\r
+                );\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
   PcdStatus = PcdSet32S (\r
-    PcdFlashNvStorageFtwSpareBase,\r
-    PcdGet32 (PcdOvmfFlashNvStorageFtwSpareBase)\r
-    );\r
+                PcdFlashNvStorageFtwSpareBase,\r
+                PcdGet32 (PcdOvmfFlashNvStorageFtwSpareBase)\r
+                );\r
   ASSERT_RETURN_ERROR (PcdStatus);\r
 }\r