OvmfPkg/Platform: unfix PcdPciExpressBaseAddress

Will be set by FdtPciHostBridgeLib, so it can't be an fixed when we
want use that library.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/PlatformInitLib/MemDetect.c
index 4c1dedf863c38c97fbefc0644bfdea0686e001ec..83a7b6726bb74ae941aac289be64c5127d456950 100644 (file)
--- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c
+++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c
@@ -61,8 +61,8 @@ PlatformQemuUc32BaseInitialization (
     // [PcdPciExpressBaseAddress, 4GB) range require a very small number of\r
     // variable MTRRs (preferably 1 or 2).\r
     //\r
-    ASSERT (FixedPcdGet64 (PcdPciExpressBaseAddress) <= MAX_UINT32);\r
-    PlatformInfoHob->Uc32Base = (UINT32)FixedPcdGet64 (PcdPciExpressBaseAddress);\r
+    ASSERT (PcdGet64 (PcdPciExpressBaseAddress) <= MAX_UINT32);\r
+    PlatformInfoHob->Uc32Base = (UINT32)PcdGet64 (PcdPciExpressBaseAddress);\r
     return;\r
   }\r
 \r

diff --git a/OvmfPkg/Library/PlatformInitLib/Platform.c b/OvmfPkg/Library/PlatformInitLib/Platform.c
index 101074f6100d34e08077549d1da09f0bec7d41b4..60a30a01f3b51c500913dc600ab18df9cb8fe8e1 100644 (file)
--- a/OvmfPkg/Library/PlatformInitLib/Platform.c
+++ b/OvmfPkg/Library/PlatformInitLib/Platform.c
@@ -154,7 +154,7 @@ PlatformMemMapInitialization (
     // The MMCONFIG area is expected to fall between the top of low RAM and\r
     // the base of the 32-bit PCI host aperture.\r
     //\r
-    PciExBarBase = FixedPcdGet64 (PcdPciExpressBaseAddress);\r
+    PciExBarBase = PcdGet64 (PcdPciExpressBaseAddress);\r
     ASSERT (TopOfLowRam <= PciExBarBase);\r
     ASSERT (PciExBarBase <= MAX_UINT32 - SIZE_256MB);\r
     PciBase = (UINT32)(PciExBarBase + SIZE_256MB);\r
@@ -278,7 +278,7 @@ PciExBarInitialization (
   // determined in AddressWidthInitialization(), i.e., 36 bits, will suffice\r
   // for DXE's page tables to cover the MMCONFIG area.\r
   //\r
-  PciExBarBase.Uint64 = FixedPcdGet64 (PcdPciExpressBaseAddress);\r
+  PciExBarBase.Uint64 = PcdGet64 (PcdPciExpressBaseAddress);\r
   ASSERT ((PciExBarBase.Uint32[1] & MCH_PCIEXBAR_HIGHMASK) == 0);\r
   ASSERT ((PciExBarBase.Uint32[0] & MCH_PCIEXBAR_LOWMASK) == 0);\r
 \r

diff --git a/OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf b/OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf
index d0fab5cc1f4f7599bfd0997c6d61fc4c5ac4a9c5..d2a0bec43452f7fa5095f2b682a55b450a76368a 100644 (file)
--- a/OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf
+++ b/OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf
@@ -54,8 +54,10 @@
 [LibraryClasses.X64]\r
   TdxLib\r
 \r
-[FixedPcd]\r
+[Pcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress\r
+\r
+[FixedPcd]\r
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase\r
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaSize\r
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase\r

diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
index 00372fa0ebb5def61873b9c088550a5a8de72f1c..3cd83e6ec3e592952b942e4cf22a22a4733e864a 100644 (file)
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
@@ -95,6 +95,7 @@
   gUefiOvmfPkgTokenSpaceGuid.PcdXenPvhStartOfDayStructPtr\r
   gUefiOvmfPkgTokenSpaceGuid.PcdXenPvhStartOfDayStructPtrSize\r
   gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved\r
@@ -118,7 +119,6 @@
 [FixedPcd]\r
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfCpuidBase\r
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfCpuidSize\r
-  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress\r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS\r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory\r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType\r