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

[mirror_edk2.git] / OvmfPkg / Library / VirtioMmioDeviceLib / VirtioMmioDeviceFunctions.c

diff --git a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c
index 436da2a2b4977915d1474ec229180a14d3fce250..8bdf1e1fc3a64b928ec03caf94e59e254cda7e4a 100644 (file)
--- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c
+++ b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c
@@ -15,11 +15,12 @@
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioGetDeviceFeatures (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
-  OUT UINT64                *DeviceFeatures\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  OUT UINT64                 *DeviceFeatures\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
+  UINT32              LowBits, HighBits;\r
 \r
   if (DeviceFeatures == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -27,7 +28,15 @@ VirtioMmioGetDeviceFeatures (
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
-  *DeviceFeatures = VIRTIO_CFG_READ (Device, VIRTIO_MMIO_OFFSET_HOST_FEATURES);\r
+  if (Device->Version == VIRTIO_MMIO_DEVICE_VERSION_0_95) {\r
+    *DeviceFeatures = VIRTIO_CFG_READ (Device, VIRTIO_MMIO_OFFSET_HOST_FEATURES);\r
+  } else {\r
+    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_HOST_FEATURES_SEL, 0);\r
+    LowBits = VIRTIO_CFG_READ (Device, VIRTIO_MMIO_OFFSET_HOST_FEATURES);\r
+    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_HOST_FEATURES_SEL, 1);\r
+    HighBits        = VIRTIO_CFG_READ (Device, VIRTIO_MMIO_OFFSET_HOST_FEATURES);\r
+    *DeviceFeatures = LShiftU64 (HighBits, 32) | LowBits;\r
+  }\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -39,7 +48,7 @@ VirtioMmioGetQueueSize (
   OUT UINT16                  *QueueNumMax\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   if (QueueNumMax == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -59,7 +68,7 @@ VirtioMmioGetDeviceStatus (
   OUT UINT8                   *DeviceStatus\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   if (DeviceStatus == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -75,11 +84,11 @@ VirtioMmioGetDeviceStatus (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetQueueSize (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT16                  QueueSize\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -95,11 +104,11 @@ VirtioMmioSetQueueSize (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetDeviceStatus (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT8                   DeviceStatus\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -111,11 +120,11 @@ VirtioMmioSetDeviceStatus (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetQueueNotify (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT16                  QueueNotify\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -127,11 +136,11 @@ VirtioMmioSetQueueNotify (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetQueueAlignment (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT32                  Alignment\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -143,11 +152,11 @@ VirtioMmioSetQueueAlignment (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetPageSize (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT32                  PageSize\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   if (PageSize != EFI_PAGE_SIZE) {\r
     return EFI_UNSUPPORTED;\r
@@ -165,11 +174,11 @@ VirtioMmioSetPageSize (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetQueueSel (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT16                  Sel\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -190,36 +199,57 @@ VirtioMmioSetQueueAddress (
   IN UINT64                  RingBaseShift\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
-  UINT64 Address;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
+  UINT64              Address;\r
 \r
   ASSERT (RingBaseShift == 0);\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
   if (Device->Version == VIRTIO_MMIO_DEVICE_VERSION_0_95) {\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_PFN,\r
-      (UINT32)((UINTN)Ring->Base >> EFI_PAGE_SHIFT));\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_PFN,\r
+      (UINT32)((UINTN)Ring->Base >> EFI_PAGE_SHIFT)\r
+      );\r
   } else {\r
     VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_NUM, Device->QueueNum);\r
 \r
     Address = (UINTN)Ring->Base;\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_DESC_LO,\r
-                      (UINT32)Address);\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_DESC_HI,\r
-                      (UINT32)RShiftU64(Address, 32));\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_DESC_LO,\r
+      (UINT32)Address\r
+      );\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_DESC_HI,\r
+      (UINT32)RShiftU64 (Address, 32)\r
+      );\r
 \r
     Address = (UINTN)Ring->Avail.Flags;\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_AVAIL_LO,\r
-                      (UINT32)Address);\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_AVAIL_HI,\r
-                      (UINT32)RShiftU64(Address, 32));\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_AVAIL_LO,\r
+      (UINT32)Address\r
+      );\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_AVAIL_HI,\r
+      (UINT32)RShiftU64 (Address, 32)\r
+      );\r
 \r
     Address = (UINTN)Ring->Used.Flags;\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_USED_LO,\r
-                      (UINT32)Address);\r
-    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_USED_HI,\r
-                      (UINT32)RShiftU64(Address, 32));\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_USED_LO,\r
+      (UINT32)Address\r
+      );\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_QUEUE_USED_HI,\r
+      (UINT32)RShiftU64 (Address, 32)\r
+      );\r
 \r
     VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_QUEUE_READY, 1);\r
   }\r
@@ -230,19 +260,38 @@ VirtioMmioSetQueueAddress (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioSetGuestFeatures (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
   IN UINT64                  Features\r
   )\r
 {\r
-  VIRTIO_MMIO_DEVICE *Device;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
-  if (Features > MAX_UINT32) {\r
-    return EFI_UNSUPPORTED;\r
+  if (Device->Version == VIRTIO_MMIO_DEVICE_VERSION_0_95) {\r
+    if (Features > MAX_UINT32) {\r
+      return EFI_UNSUPPORTED;\r
+    }\r
+\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_GUEST_FEATURES,\r
+      (UINT32)Features\r
+      );\r
+  } else {\r
+    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_GUEST_FEATURES_SEL, 0);\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_GUEST_FEATURES,\r
+      (UINT32)Features\r
+      );\r
+    VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_GUEST_FEATURES_SEL, 1);\r
+    VIRTIO_CFG_WRITE (\r
+      Device,\r
+      VIRTIO_MMIO_OFFSET_GUEST_FEATURES,\r
+      (UINT32)RShiftU64 (Features, 32)\r
+      );\r
   }\r
-  VIRTIO_CFG_WRITE (Device, VIRTIO_MMIO_OFFSET_GUEST_FEATURES,\r
-    (UINT32)Features);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -250,14 +299,14 @@ VirtioMmioSetGuestFeatures (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioDeviceWrite (\r
-  IN VIRTIO_DEVICE_PROTOCOL *This,\r
-  IN UINTN                  FieldOffset,\r
-  IN UINTN                  FieldSize,\r
-  IN UINT64                 Value\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN UINTN                   FieldOffset,\r
+  IN UINTN                   FieldSize,\r
+  IN UINT64                  Value\r
   )\r
 {\r
-  UINTN                     DstBaseAddress;\r
-  VIRTIO_MMIO_DEVICE       *Device;\r
+  UINTN               DstBaseAddress;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -265,7 +314,8 @@ VirtioMmioDeviceWrite (
   // Double-check fieldsize\r
   //\r
   if ((FieldSize != 1) && (FieldSize != 2) &&\r
-      (FieldSize != 4) && (FieldSize != 8)) {\r
+      (FieldSize != 4) && (FieldSize != 8))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -273,13 +323,13 @@ VirtioMmioDeviceWrite (
   // Compute base address\r
   //\r
   DstBaseAddress = Device->BaseAddress +\r
-      VIRTIO_DEVICE_SPECIFIC_CONFIGURATION_OFFSET_MMIO + FieldOffset;\r
+                   VIRTIO_DEVICE_SPECIFIC_CONFIGURATION_OFFSET_MMIO + FieldOffset;\r
 \r
   //\r
   // The device-specific memory area of Virtio-MMIO can only be written in\r
   // byte accesses. This is not currently in the Virtio spec.\r
   //\r
-  MmioWriteBuffer8 (DstBaseAddress, FieldSize, (UINT8*)&Value);\r
+  MmioWriteBuffer8 (DstBaseAddress, FieldSize, (UINT8 *)&Value);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -287,15 +337,15 @@ VirtioMmioDeviceWrite (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioDeviceRead (\r
-  IN  VIRTIO_DEVICE_PROTOCOL    *This,\r
-  IN  UINTN                     FieldOffset,\r
-  IN  UINTN                     FieldSize,\r
-  IN  UINTN                     BufferSize,\r
-  OUT VOID                      *Buffer\r
+  IN  VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN  UINTN                   FieldOffset,\r
+  IN  UINTN                   FieldSize,\r
+  IN  UINTN                   BufferSize,\r
+  OUT VOID                    *Buffer\r
   )\r
 {\r
-  UINTN                     SrcBaseAddress;\r
-  VIRTIO_MMIO_DEVICE       *Device;\r
+  UINTN               SrcBaseAddress;\r
+  VIRTIO_MMIO_DEVICE  *Device;\r
 \r
   Device = VIRTIO_MMIO_DEVICE_FROM_VIRTIO_DEVICE (This);\r
 \r
@@ -308,7 +358,8 @@ VirtioMmioDeviceRead (
   // Double-check fieldsize\r
   //\r
   if ((FieldSize != 1) && (FieldSize != 2) &&\r
-      (FieldSize != 4) && (FieldSize != 8)) {\r
+      (FieldSize != 4) && (FieldSize != 8))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -316,7 +367,7 @@ VirtioMmioDeviceRead (
   // Compute base address\r
   //\r
   SrcBaseAddress = Device->BaseAddress +\r
-      VIRTIO_DEVICE_SPECIFIC_CONFIGURATION_OFFSET_MMIO + FieldOffset;\r
+                   VIRTIO_DEVICE_SPECIFIC_CONFIGURATION_OFFSET_MMIO + FieldOffset;\r
 \r
   //\r
   // The device-specific memory area of Virtio-MMIO can only be read in\r
@@ -335,7 +386,7 @@ VirtioMmioAllocateSharedPages (
   OUT VOID                    **HostAddress\r
   )\r
 {\r
-  VOID        *Buffer;\r
+  VOID  *Buffer;\r
 \r
   Buffer = AllocatePages (NumPages);\r
   if (Buffer == NULL) {\r
@@ -368,8 +419,8 @@ VirtioMmioMapSharedBuffer (
   OUT     VOID                    **Mapping\r
   )\r
 {\r
-  *DeviceAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) HostAddress;\r
-  *Mapping = NULL;\r
+  *DeviceAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)HostAddress;\r
+  *Mapping       = NULL;\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -377,8 +428,8 @@ VirtioMmioMapSharedBuffer (
 EFI_STATUS\r
 EFIAPI\r
 VirtioMmioUnmapSharedBuffer (\r
-  IN VIRTIO_DEVICE_PROTOCOL    *This,\r
-  IN VOID                      *Mapping\r
+  IN VIRTIO_DEVICE_PROTOCOL  *This,\r
+  IN VOID                    *Mapping\r
   )\r
 {\r
   return EFI_SUCCESS;\r