MdeModulePkg/PciBusDxe: catch unimplemented extended config space reads

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

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c
index 0bc1fbfefffe7b778642f90700b0a5fdc44f60e2..6283d602207cb09d89d8330d52fde94ac3d7c152 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c
@@ -1,14 +1,8 @@
 /** @file\r
   PCI command register operations supporting functions implementation for PCI Bus module.\r
 \r
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this 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,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -75,12 +69,12 @@ PciOperateRegister (
 }\r
 \r
 /**\r
-  Check the cpability supporting by given device.\r
+  Check the capability supporting by given device.\r
 \r
   @param PciIoDevice   Pointer to instance of PCI_IO_DEVICE.\r
 \r
-  @retval TRUE         Cpability supportted.\r
-  @retval FALSE        Cpability not supportted.\r
+  @retval TRUE         Capability supported.\r
+  @retval FALSE        Capability not supported.\r
 \r
 **/\r
 BOOLEAN\r
@@ -103,7 +97,7 @@ PciCapabilitySupport (
   @param Offset            A pointer to the offset returned.\r
   @param NextRegBlock      A pointer to the next block returned.\r
 \r
-  @retval EFI_SUCCESS      Successfuly located capability register block.\r
+  @retval EFI_SUCCESS      Successfully located capability register block.\r
   @retval EFI_UNSUPPORTED  Pci device does not support capability.\r
   @retval EFI_NOT_FOUND    Pci device support but can not find register block.\r
 \r
@@ -121,7 +115,7 @@ LocateCapabilityRegBlock (
   UINT8   CapabilityID;\r
 \r
   //\r
-  // To check the cpability of this device supports\r
+  // To check the capability of this device supports\r
   //\r
   if (!PciCapabilitySupport (PciIoDevice)) {\r
     return EFI_UNSUPPORTED;\r
@@ -195,7 +189,7 @@ LocateCapabilityRegBlock (
   @param Offset            A pointer to the offset returned.\r
   @param NextRegBlock      A pointer to the next block returned.\r
 \r
-  @retval EFI_SUCCESS      Successfuly located capability register block.\r
+  @retval EFI_SUCCESS      Successfully located capability register block.\r
   @retval EFI_UNSUPPORTED  Pci device does not support capability.\r
   @retval EFI_NOT_FOUND    Pci device support but can not find register block.\r
 \r
@@ -242,6 +236,19 @@ LocatePciExpressCapabilityRegBlock (
       break;\r
     }\r
 \r
+    if (CapabilityEntry == MAX_UINT32) {\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "%a: [%02x|%02x|%02x] failed to access config space at offset 0x%x\n",\r
+        __FUNCTION__,\r
+        PciIoDevice->BusNumber,\r
+        PciIoDevice->DeviceNumber,\r
+        PciIoDevice->FunctionNumber,\r
+        CapabilityPtr\r
+        ));\r
+      break;\r
+    }\r
+\r
     CapabilityID = (UINT16) CapabilityEntry;\r
 \r
     if (CapabilityID == CapId) {\r