OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones

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

diff --git a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
index aeb0bdf84dcb7a9b7bb75b22f64322ac8b87eaf7..e850f7d183eeefab8ffeef317f74556055a64318 100644 (file)
--- a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
+++ b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
@@ -4,13 +4,7 @@
   Copyright (C) 2016, Red Hat, Inc.\r
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
-  This program and the accompanying materials are licensed and made available\r
-  under the terms and conditions of the BSD License which accompanies this\r
-  distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php.\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT\r
-  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 #include <PiDxe.h>\r
@@ -28,6 +22,7 @@
 #include <Library/PciHostBridgeLib.h>\r
 #include <Library/PciLib.h>\r
 #include <Library/QemuFwCfgLib.h>\r
+#include "PciHostBridge.h"\r
 \r
 \r
 #pragma pack(1)\r
@@ -113,7 +108,6 @@ STATIC PCI_ROOT_BRIDGE_APERTURE mNonExistAperture = { MAX_UINT64, 0 };
 \r
   @retval EFI_OUT_OF_RESOURCES  Memory allocation failed.\r
 **/\r
-STATIC\r
 EFI_STATUS\r
 InitRootBridge (\r
   IN  UINT64                   Supports,\r
@@ -158,13 +152,13 @@ InitRootBridge (
   DevicePath = AllocateCopyPool (sizeof mRootBridgeDevicePathTemplate,\r
                  &mRootBridgeDevicePathTemplate);\r
   if (DevicePath == NULL) {\r
-    DEBUG ((EFI_D_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));\r
+    DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   DevicePath->AcpiDevicePath.UID = RootBusNumber;\r
   RootBus->DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)DevicePath;\r
 \r
-  DEBUG ((EFI_D_INFO,\r
+  DEBUG ((DEBUG_INFO,\r
     "%a: populated root bus %d, with room for %d subordinate bus(es)\n",\r
     __FUNCTION__, RootBusNumber, MaxSubBusNumber - RootBusNumber));\r
   return EFI_SUCCESS;\r
@@ -217,6 +211,14 @@ PciHostBridgeGetRootBridges (
   PCI_ROOT_BRIDGE_APERTURE Mem;\r
   PCI_ROOT_BRIDGE_APERTURE MemAbove4G;\r
 \r
+  if (PcdGetBool (PcdPciDisableBusEnumeration)) {\r
+    return ScanForRootBridges (Count);\r
+  }\r
+\r
+  ZeroMem (&Io, sizeof (Io));\r
+  ZeroMem (&Mem, sizeof (Mem));\r
+  ZeroMem (&MemAbove4G, sizeof (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
@@ -254,11 +256,11 @@ PciHostBridgeGetRootBridges (
     QemuFwCfgReadBytes (FwCfgSize, &ExtraRootBridges);\r
 \r
     if (ExtraRootBridges > PCI_MAX_BUS) {\r
-      DEBUG ((EFI_D_ERROR, "%a: invalid count of extra root buses (%Lu) "\r
+      DEBUG ((DEBUG_ERROR, "%a: invalid count of extra root buses (%Lu) "\r
         "reported by QEMU\n", __FUNCTION__, ExtraRootBridges));\r
       return NULL;\r
     }\r
-    DEBUG ((EFI_D_INFO, "%a: %Lu extra root buses reported by QEMU\n",\r
+    DEBUG ((DEBUG_INFO, "%a: %Lu extra root buses reported by QEMU\n",\r
       __FUNCTION__, ExtraRootBridges));\r
   }\r
 \r
@@ -267,7 +269,7 @@ PciHostBridgeGetRootBridges (
   //\r
   Bridges = AllocatePool ((1 + (UINTN)ExtraRootBridges) * sizeof *Bridges);\r
   if (Bridges == NULL) {\r
-    DEBUG ((EFI_D_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));\r
+    DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));\r
     return NULL;\r
   }\r
   Initialized = 0;\r
@@ -407,24 +409,22 @@ PciHostBridgeResourceConflict (
 {\r
   EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor;\r
   UINTN                             RootBridgeIndex;\r
-  DEBUG ((EFI_D_ERROR, "PciHostBridge: Resource conflict happens!\n"));\r
+  DEBUG ((DEBUG_ERROR, "PciHostBridge: Resource conflict happens!\n"));\r
 \r
   RootBridgeIndex = 0;\r
   Descriptor = (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *) Configuration;\r
   while (Descriptor->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR) {\r
-    DEBUG ((EFI_D_ERROR, "RootBridge[%d]:\n", RootBridgeIndex++));\r
+    DEBUG ((DEBUG_ERROR, "RootBridge[%d]:\n", RootBridgeIndex++));\r
     for (; Descriptor->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR; Descriptor++) {\r
       ASSERT (Descriptor->ResType <\r
-              (sizeof (mPciHostBridgeLibAcpiAddressSpaceTypeStr) /\r
-               sizeof (mPciHostBridgeLibAcpiAddressSpaceTypeStr[0])\r
-               )\r
+              ARRAY_SIZE (mPciHostBridgeLibAcpiAddressSpaceTypeStr)\r
               );\r
-      DEBUG ((EFI_D_ERROR, " %s: Length/Alignment = 0x%lx / 0x%lx\n",\r
+      DEBUG ((DEBUG_ERROR, " %s: Length/Alignment = 0x%lx / 0x%lx\n",\r
               mPciHostBridgeLibAcpiAddressSpaceTypeStr[Descriptor->ResType],\r
               Descriptor->AddrLen, Descriptor->AddrRangeMax\r
               ));\r
       if (Descriptor->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM) {\r
-        DEBUG ((EFI_D_ERROR, "     Granularity/SpecificFlag = %ld / %02x%s\n",\r
+        DEBUG ((DEBUG_ERROR, "     Granularity/SpecificFlag = %ld / %02x%s\n",\r
                 Descriptor->AddrSpaceGranularity, Descriptor->SpecificFlag,\r
                 ((Descriptor->SpecificFlag &\r
                   EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE\r