From 509e6b5a034f0e121c6de9bedd08532bf54cc4f7 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek@redhat.com>
Date: Tue, 21 Feb 2017 14:43:00 +0100
Subject: [PATCH] OvmfPkg/QemuFwCfg: introduce FW_CFG_IO_DATA, adapt the
 package

Introduce the FW_CFG_IO_DATA macro for IO Port 0x511 (the Data Register),
and update all references in OvmfPkg.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Suggested-by: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
---
 OvmfPkg/Include/IndustryStandard/QemuFwCfg.h | 1 +
 OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c  | 6 +++---
 OvmfPkg/SmmControl2Dxe/SmiFeatures.c         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/OvmfPkg/Include/IndustryStandard/QemuFwCfg.h b/OvmfPkg/Include/IndustryStandard/QemuFwCfg.h
index 776bfe88ae..5da6b456fe 100644
--- a/OvmfPkg/Include/IndustryStandard/QemuFwCfg.h
+++ b/OvmfPkg/Include/IndustryStandard/QemuFwCfg.h
@@ -47,6 +47,7 @@
 // platforms (Ia32 and X64).
 //
 #define FW_CFG_IO_SELECTOR    0x510
+#define FW_CFG_IO_DATA        0x511
 
 //
 // Numerically defined keys.
diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
index 1387ea85f3..d79d0a444c 100644
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
@@ -135,7 +135,7 @@ InternalQemuFwCfgReadBytes (
     InternalQemuFwCfgDmaBytes ((UINT32)Size, Buffer, FW_CFG_DMA_CTL_READ);
     return;
   }
-  IoReadFifo8 (0x511, Size, Buffer);
+  IoReadFifo8 (FW_CFG_IO_DATA, Size, Buffer);
 }
 
 
@@ -187,7 +187,7 @@ QemuFwCfgWriteBytes (
       InternalQemuFwCfgDmaBytes ((UINT32)Size, Buffer, FW_CFG_DMA_CTL_WRITE);
       return;
     }
-    IoWriteFifo8 (0x511, Size, Buffer);
+    IoWriteFifo8 (FW_CFG_IO_DATA, Size, Buffer);
   }
 }
 
@@ -230,7 +230,7 @@ QemuFwCfgSkipBytes (
   //
   while (Size > 0) {
     ChunkSize = MIN (Size, sizeof SkipBuffer);
-    IoReadFifo8 (0x511, ChunkSize, SkipBuffer);
+    IoReadFifo8 (FW_CFG_IO_DATA, ChunkSize, SkipBuffer);
     Size -= ChunkSize;
   }
 }
diff --git a/OvmfPkg/SmmControl2Dxe/SmiFeatures.c b/OvmfPkg/SmmControl2Dxe/SmiFeatures.c
index 352ffa0173..73c29848b3 100644
--- a/OvmfPkg/SmmControl2Dxe/SmiFeatures.c
+++ b/OvmfPkg/SmmControl2Dxe/SmiFeatures.c
@@ -303,7 +303,7 @@ SaveSmiFeatures (
                      S3SaveState,                    // This
                      EFI_BOOT_SCRIPT_IO_POLL_OPCODE, // OpCode
                      EfiBootScriptWidthUint8,        // Width
-                     (UINT64)(UINTN)0x511,           // Address
+                     (UINT64)(UINTN)FW_CFG_IO_DATA,  // Address
                      &FeaturesOkData,                // Data
                      &FeaturesOkMask,                // DataMask
                      MAX_UINT64                      // Delay
-- 
2.39.2