UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / PciBusDxe / PciEnumeratorSupport.c

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index eb250f6f7b622405b13e31894e27e26345c7577a..6594b8eae83f71f0a2583154e58b7d215db6e9ac 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -3,6 +3,7 @@
 \r
 Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
+Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -227,13 +228,15 @@ PciSearchDevice (
 \r
   DEBUG ((\r
     DEBUG_INFO,\r
-    "PciBus: Discovered %s @ [%02x|%02x|%02x]\n",\r
+    "PciBus: Discovered %s @ [%02x|%02x|%02x]  [VID = 0x%x, DID = 0x%0x]\n",\r
     IS_PCI_BRIDGE (Pci) ?     L"PPB" :\r
     IS_CARDBUS_BRIDGE (Pci) ? L"P2C" :\r
     L"PCI",\r
     Bus,\r
     Device,\r
-    Func\r
+    Func,\r
+    Pci->Hdr.VendorId,\r
+    Pci->Hdr.DeviceId\r
     ));\r
 \r
   if (!IS_PCI_BRIDGE (Pci)) {\r
@@ -2286,6 +2289,7 @@ CreatePciIoDevice (
                          &Data32\r
                          );\r
       if ((Data32 & EFI_PCIE_CAPABILITY_DEVICE_CAPABILITIES_2_ARI_FORWARDING) != 0) {\r
+        PciIoDevice->IsAriEnabled = TRUE;\r
         //\r
         // ARI forward support in bridge, so enable it.\r
         //\r
@@ -2425,7 +2429,7 @@ CreatePciIoDevice (
         //\r
         // Calculate ReservedBusNum for this PF\r
         //\r
-        PciIoDevice->ReservedBusNum = (UINT16)(EFI_PCI_BUS_OF_RID (LastVF) - Bus + 1);\r
+        PciIoDevice->ReservedBusNum = (UINT16)(EFI_PCI_BUS_OF_RID (LastVF) - Bus);\r
       }\r
 \r
       DEBUG ((\r