OvmfPkg/PciHostBridgeLib: Change InitRootBridge prototype

The patch re-factors the code without functionality impact.
Next patch will add code to support OVMF above Xen.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
index 9e014981875946e71650abab3b45bd0fa7cd600a..aeb0bdf84dcb7a9b7bb75b22f64322ac8b87eaf7 100644 (file)
--- a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
+++ b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
@@ -70,13 +70,20 @@ OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH mRootBridgeDevicePathTemplate = {
   }\r
 };\r
 \r
+STATIC PCI_ROOT_BRIDGE_APERTURE mNonExistAperture = { MAX_UINT64, 0 };\r
 \r
 /**\r
   Initialize a PCI_ROOT_BRIDGE structure.\r
 \r
-  param[in]  RootBusNumber     The bus number to store in RootBus.\r
+  @param[in]  Supports         Supported attributes.\r
 \r
-  param[in]  MaxSubBusNumber   The inclusive maximum bus number that can be\r
+  @param[in]  Attributes       Initial attributes.\r
+\r
+  @param[in]  AllocAttributes  Allocation attributes.\r
+\r
+  @param[in]  RootBusNumber    The bus number to store in RootBus.\r
+\r
+  @param[in]  MaxSubBusNumber  The inclusive maximum bus number that can be\r
                                assigned to any subordinate bus found behind any\r
                                PCI bridge hanging off this root bus.\r
 \r
@@ -85,7 +92,17 @@ OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH mRootBridgeDevicePathTemplate = {
                                RootBusNumber equals MaxSubBusNumber, then the\r
                                root bus has no room for subordinate buses.\r
 \r
-  param[out] RootBus           The PCI_ROOT_BRIDGE structure (allocated by the\r
+  @param[in]  Io               IO aperture.\r
+\r
+  @param[in]  Mem              MMIO aperture.\r
+\r
+  @param[in]  MemAbove4G       MMIO aperture above 4G.\r
+\r
+  @param[in]  PMem             Prefetchable MMIO aperture.\r
+\r
+  @param[in]  PMemAbove4G      Prefetchable MMIO aperture above 4G.\r
+\r
+  @param[out] RootBus          The PCI_ROOT_BRIDGE structure (allocated by the\r
                                caller) that should be filled in by this\r
                                function.\r
 \r
@@ -99,9 +116,17 @@ OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH mRootBridgeDevicePathTemplate = {
 STATIC\r
 EFI_STATUS\r
 InitRootBridge (\r
-  IN  UINT8           RootBusNumber,\r
-  IN  UINT8           MaxSubBusNumber,\r
-  OUT PCI_ROOT_BRIDGE *RootBus\r
+  IN  UINT64                   Supports,\r
+  IN  UINT64                   Attributes,\r
+  IN  UINT64                   AllocAttributes,\r
+  IN  UINT8                    RootBusNumber,\r
+  IN  UINT8                    MaxSubBusNumber,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE *Io,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE *Mem,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE *MemAbove4G,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE *PMem,\r
+  IN  PCI_ROOT_BRIDGE_APERTURE *PMemAbove4G,\r
+  OUT PCI_ROOT_BRIDGE          *RootBus\r
   )\r
 {\r
   OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH *DevicePath;\r
@@ -113,39 +138,19 @@ InitRootBridge (
 \r
   RootBus->Segment = 0;\r
 \r
-  RootBus->Supports   = EFI_PCI_ATTRIBUTE_IDE_PRIMARY_IO |\r
-                        EFI_PCI_ATTRIBUTE_IDE_SECONDARY_IO |\r
-                        EFI_PCI_ATTRIBUTE_ISA_IO_16 |\r
-                        EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO |\r
-                        EFI_PCI_ATTRIBUTE_VGA_MEMORY |\r
-                        EFI_PCI_ATTRIBUTE_VGA_IO_16  |\r
-                        EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO_16;\r
-  RootBus->Attributes = RootBus->Supports;\r
+  RootBus->Supports   = Supports;\r
+  RootBus->Attributes = Attributes;\r
 \r
   RootBus->DmaAbove4G = FALSE;\r
 \r
-  RootBus->AllocationAttributes = EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM;\r
-  RootBus->PMem.Base            = MAX_UINT64;\r
-  RootBus->PMem.Limit           = 0;\r
-  RootBus->PMemAbove4G.Base     = MAX_UINT64;\r
-  RootBus->PMemAbove4G.Limit    = 0;\r
-  RootBus->MemAbove4G.Base      = MAX_UINT64;\r
-  RootBus->MemAbove4G.Limit     = 0;\r
-\r
-  if (PcdGet64 (PcdPciMmio64Size) > 0) {\r
-    RootBus->AllocationAttributes |= EFI_PCI_HOST_BRIDGE_MEM64_DECODE;\r
-    RootBus->MemAbove4G.Base       = PcdGet64 (PcdPciMmio64Base);\r
-    RootBus->MemAbove4G.Limit      = PcdGet64 (PcdPciMmio64Base) +\r
-                                     (PcdGet64 (PcdPciMmio64Size) - 1);\r
-  }\r
-\r
+  RootBus->AllocationAttributes = AllocAttributes;\r
   RootBus->Bus.Base  = RootBusNumber;\r
   RootBus->Bus.Limit = MaxSubBusNumber;\r
-  RootBus->Io.Base   = PcdGet64 (PcdPciIoBase);\r
-  RootBus->Io.Limit  = PcdGet64 (PcdPciIoBase) + (PcdGet64 (PcdPciIoSize) - 1);\r
-  RootBus->Mem.Base  = PcdGet64 (PcdPciMmio32Base);\r
-  RootBus->Mem.Limit = PcdGet64 (PcdPciMmio32Base) +\r
-                       (PcdGet64 (PcdPciMmio32Size) - 1);\r
+  CopyMem (&RootBus->Io, Io, sizeof (*Io));\r
+  CopyMem (&RootBus->Mem, Mem, sizeof (*Mem));\r
+  CopyMem (&RootBus->MemAbove4G, MemAbove4G, sizeof (*MemAbove4G));\r
+  CopyMem (&RootBus->PMem, PMem, sizeof (*PMem));\r
+  CopyMem (&RootBus->PMemAbove4G, PMemAbove4G, sizeof (*PMemAbove4G));\r
 \r
   RootBus->NoExtendedConfigSpace = (PcdGet16 (PcdOvmfHostBridgePciDevId) !=\r
                                     INTEL_Q35_MCH_DEVICE_ID);\r
@@ -206,6 +211,34 @@ PciHostBridgeGetRootBridges (
   UINTN                Initialized;\r
   UINTN                LastRootBridgeNumber;\r
   UINTN                RootBridgeNumber;\r
+  UINT64               Attributes;\r
+  UINT64               AllocationAttributes;\r
+  PCI_ROOT_BRIDGE_APERTURE Io;\r
+  PCI_ROOT_BRIDGE_APERTURE Mem;\r
+  PCI_ROOT_BRIDGE_APERTURE MemAbove4G;\r
+\r
+  Attributes = EFI_PCI_ATTRIBUTE_IDE_PRIMARY_IO |\r
+    EFI_PCI_ATTRIBUTE_IDE_SECONDARY_IO |\r
+    EFI_PCI_ATTRIBUTE_ISA_IO_16 |\r
+    EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO |\r
+    EFI_PCI_ATTRIBUTE_VGA_MEMORY |\r
+    EFI_PCI_ATTRIBUTE_VGA_IO_16 |\r
+    EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO_16;\r
+\r
+  AllocationAttributes = EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM;\r
+  if (PcdGet64 (PcdPciMmio64Size) > 0) {\r
+    AllocationAttributes |= EFI_PCI_HOST_BRIDGE_MEM64_DECODE;\r
+    MemAbove4G.Base = PcdGet64 (PcdPciMmio64Base);\r
+    MemAbove4G.Limit = PcdGet64 (PcdPciMmio64Base) +\r
+                       PcdGet64 (PcdPciMmio64Size) - 1;\r
+  } else {\r
+    CopyMem (&MemAbove4G, &mNonExistAperture, sizeof (mNonExistAperture));\r
+  }\r
+\r
+  Io.Base = PcdGet64 (PcdPciIoBase);\r
+  Io.Limit = PcdGet64 (PcdPciIoBase) + (PcdGet64 (PcdPciIoSize) - 1);\r
+  Mem.Base = PcdGet64 (PcdPciMmio32Base);\r
+  Mem.Limit = PcdGet64 (PcdPciMmio32Base) + (PcdGet64 (PcdPciMmio32Size) - 1);\r
 \r
   *Count = 0;\r
 \r
@@ -266,8 +299,19 @@ PciHostBridgeGetRootBridges (
       // because now we know how big a bus number range *that* one has, for any\r
       // subordinate buses that might exist behind PCI bridges hanging off it.\r
       //\r
-      Status = InitRootBridge ((UINT8)LastRootBridgeNumber,\r
-                 (UINT8)(RootBridgeNumber - 1), &Bridges[Initialized]);\r
+      Status = InitRootBridge (\r
+        Attributes,\r
+        Attributes,\r
+        AllocationAttributes,\r
+        (UINT8) LastRootBridgeNumber,\r
+        (UINT8) (RootBridgeNumber - 1),\r
+        &Io,\r
+        &Mem,\r
+        &MemAbove4G,\r
+        &mNonExistAperture,\r
+        &mNonExistAperture,\r
+        &Bridges[Initialized]\r
+        );\r
       if (EFI_ERROR (Status)) {\r
         goto FreeBridges;\r
       }\r
@@ -280,8 +324,19 @@ PciHostBridgeGetRootBridges (
   // Install the last root bus (which might be the only, ie. main, root bus, if\r
   // we've found no extra root buses).\r
   //\r
-  Status = InitRootBridge ((UINT8)LastRootBridgeNumber, PCI_MAX_BUS,\r
-             &Bridges[Initialized]);\r
+  Status = InitRootBridge (\r
+    Attributes,\r
+    Attributes,\r
+    AllocationAttributes,\r
+    (UINT8) LastRootBridgeNumber,\r
+    PCI_MAX_BUS,\r
+    &Io,\r
+    &Mem,\r
+    &MemAbove4G,\r
+    &mNonExistAperture,\r
+    &mNonExistAperture,\r
+    &Bridges[Initialized]\r
+    );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeBridges;\r
   }\r