OvmfPkg/QemuFwCfgLib: Add option to dynamic alloc FW_CFG_DMA Access

[mirror_edk2.git] / OvmfPkg / Library / QemuFwCfgLib / QemuFwCfgLib.c

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
index 7744873217fe8bbbb8826afa6d696bcb7b87be35..73a19772bee1624f4df690272d365842ff46e70e 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
@@ -42,7 +42,7 @@ QemuFwCfgSelectItem (
   )\r
 {\r
   DEBUG ((EFI_D_INFO, "Select Item: 0x%x\n", (UINT16)(UINTN) QemuFwCfgItem));\r
-  IoWrite16 (0x510, (UINT16)(UINTN) QemuFwCfgItem);\r
+  IoWrite16 (FW_CFG_IO_SELECTOR, (UINT16)(UINTN) QemuFwCfgItem);\r
 }\r
 \r
 \r
@@ -68,7 +68,8 @@ InternalQemuFwCfgDmaBytes (
   IN     UINT32   Control\r
   )\r
 {\r
-  volatile FW_CFG_DMA_ACCESS Access;\r
+  volatile FW_CFG_DMA_ACCESS LocalAccess;\r
+  volatile FW_CFG_DMA_ACCESS *Access;\r
   UINT32                     AccessHigh, AccessLow;\r
   UINT32                     Status;\r
 \r
@@ -79,9 +80,11 @@ InternalQemuFwCfgDmaBytes (
     return;\r
   }\r
 \r
-  Access.Control = SwapBytes32 (Control);\r
-  Access.Length  = SwapBytes32 (Size);\r
-  Access.Address = SwapBytes64 ((UINTN)Buffer);\r
+  Access = &LocalAccess;\r
+\r
+  Access->Control = SwapBytes32 (Control);\r
+  Access->Length  = SwapBytes32 (Size);\r
+  Access->Address = SwapBytes64 ((UINTN)Buffer);\r
 \r
   //\r
   // Delimit the transfer from (a) modifications to Access, (b) in case of a\r
@@ -92,10 +95,10 @@ InternalQemuFwCfgDmaBytes (
   //\r
   // Start the transfer.\r
   //\r
-  AccessHigh = (UINT32)RShiftU64 ((UINTN)&Access, 32);\r
-  AccessLow  = (UINT32)(UINTN)&Access;\r
-  IoWrite32 (0x514, SwapBytes32 (AccessHigh));\r
-  IoWrite32 (0x518, SwapBytes32 (AccessLow));\r
+  AccessHigh = (UINT32)RShiftU64 ((UINTN)Access, 32);\r
+  AccessLow  = (UINT32)(UINTN)Access;\r
+  IoWrite32 (FW_CFG_IO_DMA_ADDRESS,     SwapBytes32 (AccessHigh));\r
+  IoWrite32 (FW_CFG_IO_DMA_ADDRESS + 4, SwapBytes32 (AccessLow));\r
 \r
   //\r
   // Don't look at Access.Control before starting the transfer.\r
@@ -106,7 +109,7 @@ InternalQemuFwCfgDmaBytes (
   // Wait for the transfer to complete.\r
   //\r
   do {\r
-    Status = SwapBytes32 (Access.Control);\r
+    Status = SwapBytes32 (Access->Control);\r
     ASSERT ((Status & FW_CFG_DMA_CTL_ERROR) == 0);\r
   } while (Status != 0);\r
 \r
@@ -135,7 +138,7 @@ InternalQemuFwCfgReadBytes (
     InternalQemuFwCfgDmaBytes ((UINT32)Size, Buffer, FW_CFG_DMA_CTL_READ);\r
     return;\r
   }\r
-  IoReadFifo8 (0x511, Size, Buffer);\r
+  IoReadFifo8 (FW_CFG_IO_DATA, Size, Buffer);\r
 }\r
 \r
 \r
@@ -187,7 +190,7 @@ QemuFwCfgWriteBytes (
       InternalQemuFwCfgDmaBytes ((UINT32)Size, Buffer, FW_CFG_DMA_CTL_WRITE);\r
       return;\r
     }\r
-    IoWriteFifo8 (0x511, Size, Buffer);\r
+    IoWriteFifo8 (FW_CFG_IO_DATA, Size, Buffer);\r
   }\r
 }\r
 \r
@@ -230,7 +233,7 @@ QemuFwCfgSkipBytes (
   //\r
   while (Size > 0) {\r
     ChunkSize = MIN (Size, sizeof SkipBuffer);\r
-    IoReadFifo8 (0x511, ChunkSize, SkipBuffer);\r
+    IoReadFifo8 (FW_CFG_IO_DATA, ChunkSize, SkipBuffer);\r
     Size -= ChunkSize;\r
   }\r
 }\r
@@ -368,31 +371,3 @@ QemuFwCfgFindFile (
 \r
   return RETURN_NOT_FOUND;\r
 }\r
-\r
-\r
-/**\r
-  Determine if S3 support is explicitly enabled.\r
-\r
-  @retval  TRUE   if S3 support is explicitly enabled.\r
-           FALSE  otherwise. This includes unavailability of the firmware\r
-                  configuration interface.\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-QemuFwCfgS3Enabled (\r
-  VOID\r
-  )\r
-{\r
-  RETURN_STATUS        Status;\r
-  FIRMWARE_CONFIG_ITEM FwCfgItem;\r
-  UINTN                FwCfgSize;\r
-  UINT8                SystemStates[6];\r
-\r
-  Status = QemuFwCfgFindFile ("etc/system-states", &FwCfgItem, &FwCfgSize);\r
-  if (Status != RETURN_SUCCESS || FwCfgSize != sizeof SystemStates) {\r
-    return FALSE;\r
-  }\r
-  QemuFwCfgSelectItem (FwCfgItem);\r
-  QemuFwCfgReadBytes (sizeof SystemStates, SystemStates);\r
-  return (BOOLEAN) (SystemStates[3] & BIT7);\r
-}\r