Changeset 76313 in vbox for trunk/src/VBox

Timestamp:

Dec 20, 2018 1:18:51 PM (6 years ago)

Author:

vboxsync

Message:

EFI: Adopted EDK2 patch (commit edf289685b9244d27602addd9ea5d933fade839f) to fix a hang in LocatePciExpressCapabilityRegBlock() if PCIe device is found behind a non-PCIe bridge.

File:

• trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c

@@ -2 +2 @@
   PCI command register operations supporting functions implementation for PCI Bus module.
 
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -201 +201 @@
   )
 {
-  UINT32  CapabilityPtr;
-  UINT32  CapabilityEntry;
-  UINT16  CapabilityID;
+  EFI_STATUS           Status;
+  UINT32               CapabilityPtr;
+  UINT32               CapabilityEntry;
+  UINT16               CapabilityID;
 
   //
@@ -223 +224 @@
     //
     CapabilityPtr &= 0xFFC;
-    PciIoDevice->PciIo.Pci.Read (
-                             &PciIoDevice->PciIo,
-                             EfiPciIoWidthUint32,
-                             CapabilityPtr,
-                             1,
-                             &CapabilityEntry
-                             );
+    Status = PciIoDevice->PciIo.Pci.Read (
+                                      &PciIoDevice->PciIo,
+                                      EfiPciIoWidthUint32,
+                                      CapabilityPtr,
+                                      1,
+                                      &CapabilityEntry
+                                      );
+    if (EFI_ERROR (Status)) {
+      break;
+    }
 
     CapabilityID = (UINT16) CapabilityEntry;