OvmfPkg/PciHostBridgeLib: clear PCI aperture vars for (re)init

[mirror_edk2.git] / OvmfPkg / Library / PciHostBridgeLib / XenSupport.c

diff --git a/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c b/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c
index 21896637e051a1c2f4ef5348ef741289ec6b02f4..920417950ad93df3e9749f6ae7359d054af58820 100644 (file)
--- a/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c
+++ b/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c
@@ -30,7 +30,7 @@
 STATIC\r
 VOID\r
 PcatPciRootBridgeBarExisted (\r
-  IN  UINT64                         Address,\r
+  IN  UINTN                          Address,\r
   OUT UINT32                         *OriginalValue,\r
   OUT UINT32                         *Value\r
   )\r
@@ -180,7 +180,7 @@ ScanForRootBridges (
   UINT8      Device;\r
   UINT8      Function;\r
   UINTN      NumberOfDevices;\r
-  UINT64     Address;\r
+  UINTN      Address;\r
   PCI_TYPE01 Pci;\r
   UINT64     Attributes;\r
   UINT64     Base;\r
@@ -202,8 +202,13 @@ ScanForRootBridges (
   for (PrimaryBus = 0; PrimaryBus <= PCI_MAX_BUS; PrimaryBus = SubBus + 1) {\r
     SubBus = PrimaryBus;\r
     Attributes = 0;\r
+\r
+    ZeroMem (&Io, sizeof (Io));\r
+    ZeroMem (&Mem, sizeof (Mem));\r
+    ZeroMem (&MemAbove4G, sizeof (MemAbove4G));\r
+    ZeroMem (&PMem, sizeof (PMem));\r
+    ZeroMem (&PMemAbove4G, sizeof (PMemAbove4G));\r
     Io.Base = Mem.Base = MemAbove4G.Base = PMem.Base = PMemAbove4G.Base = MAX_UINT64;\r
-    Io.Limit = Mem.Limit = MemAbove4G.Limit = PMem.Limit = PMemAbove4G.Limit = 0;\r
     //\r
     // Scan all the PCI devices on the primary bus of the PCI root bridge\r
     //\r