MdeModulePkg/PciBus: Fix bug that doesn't produce BusOverride

It's a regression of below commit:
SHA-1: 8be37a5cee700777ca8e8e8a34cc2225b21931a7
* MdeModulePkg/SecurityStubDxe: Defer 3rd party image before EndOfDxe

When PciBus driver fails to load the Option ROM, it doesn't produce
BusOverride protocol. It was a correct behavior before the above
commit. But due to the above commit, BusOverride protocol never is
produced by PciBus driver.

The patch fixes this issue using the following solution:
1. PciBus records the image device path when LoadImage fails.
2. Override.GetDriver() tries to look for the image handle using
   the stored image device path.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
index 5da094f582c90aa4e3802150ecb5f6bbca8ae0f7..97608bfcf2458d4c792c52c4ec4934f68897bce7 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
@@ -2,7 +2,7 @@
 #  The PCI bus driver will probe all PCI devices and allocate MMIO and IO space for these devices.\r
 #  Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable hot plug supporting.\r
 #\r
-#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -96,6 +96,7 @@
   gEfiIncompatiblePciDeviceSupportProtocolGuid    ## SOMETIMES_CONSUMES\r
   gEfiLoadFile2ProtocolGuid                       ## SOMETIMES_PRODUCES\r
   gEdkiiIoMmuProtocolGuid                         ## SOMETIMES_CONSUMES\r
+  gEfiLoadedImageDevicePathProtocolGuid           ## CONSUMES\r
 \r
 [FeaturePcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport      ## CONSUMES\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.c
index 97f45e42d0d08e37a22408a854d0754e58050390..e8fae17e8bfb6d4137031e75674d276b143bff75 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.c
@@ -1,7 +1,7 @@
 /** @file\r
   Functions implementation for Bus Specific Driver Override protoocl.\r
 \r
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2017, 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
@@ -28,6 +28,56 @@ InitializePciDriverOverrideInstance (
   PciIoDevice->PciDriverOverride.GetDriver = GetDriver;\r
 }\r
 \r
+/**\r
+  Find the image handle whose path equals to ImagePath.\r
+\r
+  @param ImagePath   Image path.\r
+\r
+  @return Image handle.\r
+**/\r
+EFI_HANDLE\r
+LocateImageHandle (\r
+  IN EFI_DEVICE_PATH_PROTOCOL   *ImagePath\r
+  )\r
+{\r
+  EFI_STATUS                    Status;\r
+  EFI_HANDLE                    *Handles;\r
+  UINTN                         Index;\r
+  UINTN                         HandleNum;\r
+  EFI_DEVICE_PATH_PROTOCOL      *DevicePath;\r
+  UINTN                         ImagePathSize;\r
+  EFI_HANDLE                    ImageHandle;\r
+\r
+  Status = gBS->LocateHandleBuffer (\r
+                  ByProtocol,\r
+                  &gEfiLoadedImageDevicePathProtocolGuid,\r
+                  NULL,\r
+                  &HandleNum,\r
+                  &Handles\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    return NULL;\r
+  }\r
+\r
+  ImageHandle   = NULL;\r
+  ImagePathSize = GetDevicePathSize (ImagePath);\r
+\r
+  for (Index = 0; Index < HandleNum; Index++) {\r
+    Status = gBS->HandleProtocol (Handles[Index], &gEfiLoadedImageDevicePathProtocolGuid, (VOID **) &DevicePath);\r
+    if (EFI_ERROR (Status)) {\r
+      continue;\r
+    }\r
+    if ((ImagePathSize == GetDevicePathSize (DevicePath)) &&\r
+        (CompareMem (ImagePath, DevicePath, ImagePathSize) == 0)\r
+        ) {\r
+      ImageHandle = Handles[Index];\r
+      break;\r
+    }\r
+  }\r
+\r
+  FreePool (Handles);\r
+  return ImageHandle;\r
+}\r
 \r
 /**\r
   Uses a bus specific algorithm to retrieve a driver image handle for a controller.\r
@@ -53,49 +103,60 @@ GetDriver (
   )\r
 {\r
   PCI_IO_DEVICE             *PciIoDevice;\r
-  LIST_ENTRY                *CurrentLink;\r
-  PCI_DRIVER_OVERRIDE_LIST  *Node;\r
+  LIST_ENTRY                *Link;\r
+  PCI_DRIVER_OVERRIDE_LIST  *Override;\r
+  BOOLEAN                   ReturnNext;\r
 \r
+  Override    = NULL;\r
   PciIoDevice = PCI_IO_DEVICE_FROM_PCI_DRIVER_OVERRIDE_THIS (This);\r
+  ReturnNext  = (BOOLEAN) (*DriverImageHandle == NULL);\r
+  for ( Link = GetFirstNode (&PciIoDevice->OptionRomDriverList)\r
+      ; !IsNull (&PciIoDevice->OptionRomDriverList, Link)\r
+      ; Link = GetNextNode (&PciIoDevice->OptionRomDriverList, Link)\r
+      ) {\r
 \r
-  CurrentLink = PciIoDevice->OptionRomDriverList.ForwardLink;\r
-\r
-  while (CurrentLink != NULL && CurrentLink != &PciIoDevice->OptionRomDriverList) {\r
-\r
-    Node = DRIVER_OVERRIDE_FROM_LINK (CurrentLink);\r
-\r
-    if (*DriverImageHandle == NULL) {\r
+    Override = DRIVER_OVERRIDE_FROM_LINK (Link);\r
 \r
-      *DriverImageHandle = Node->DriverImageHandle;\r
-      return EFI_SUCCESS;\r
-    }\r
-\r
-    if (*DriverImageHandle == Node->DriverImageHandle) {\r
-\r
-      if (CurrentLink->ForwardLink == &PciIoDevice->OptionRomDriverList ||\r
-          CurrentLink->ForwardLink == NULL) {\r
-        return EFI_NOT_FOUND;\r
+    if (ReturnNext) {\r
+      if (Override->DriverImageHandle == NULL) {\r
+        Override->DriverImageHandle = LocateImageHandle (Override->DriverImagePath);\r
       }\r
 \r
-      //\r
-      // Get next node\r
-      //\r
-      Node                = DRIVER_OVERRIDE_FROM_LINK (CurrentLink->ForwardLink);\r
-      *DriverImageHandle  = Node->DriverImageHandle;\r
-      return EFI_SUCCESS;\r
+      if (Override->DriverImageHandle == NULL) {\r
+        //\r
+        // The Option ROM identified by Override->DriverImagePath is not loaded.\r
+        //\r
+        continue;\r
+      } else {\r
+        *DriverImageHandle = Override->DriverImageHandle;\r
+        return EFI_SUCCESS;\r
+      }\r
     }\r
 \r
-    CurrentLink = CurrentLink->ForwardLink;\r
+    if (*DriverImageHandle == Override->DriverImageHandle) {\r
+      ReturnNext = TRUE;\r
+    }\r
   }\r
 \r
-  return EFI_INVALID_PARAMETER;\r
+  ASSERT (IsNull (&PciIoDevice->OptionRomDriverList, Link));\r
+  //\r
+  // ReturnNext indicates a handle match happens.\r
+  // If all nodes are checked without handle match happening,\r
+  // the DriverImageHandle should be a invalid handle.\r
+  //\r
+  if (ReturnNext) {\r
+    return EFI_NOT_FOUND;\r
+  } else {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
 }\r
 \r
 /**\r
   Add an overriding driver image.\r
 \r
   @param PciIoDevice        Instance of PciIo device.\r
-  @param DriverImageHandle  new added driver image.\r
+  @param DriverImageHandle  Image handle of newly added driver image.\r
+  @param DriverImagePath    Device path of newly added driver image.\r
 \r
   @retval EFI_SUCCESS          Successfully added driver.\r
   @retval EFI_OUT_OF_RESOURCES No memory resource for new driver instance.\r
@@ -104,40 +165,30 @@ GetDriver (
 **/\r
 EFI_STATUS\r
 AddDriver (\r
-  IN PCI_IO_DEVICE     *PciIoDevice,\r
-  IN EFI_HANDLE        DriverImageHandle\r
+  IN PCI_IO_DEVICE            *PciIoDevice,\r
+  IN EFI_HANDLE               DriverImageHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL *DriverImagePath\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_LOADED_IMAGE_PROTOCOL     *LoadedImage;\r
-  PE_COFF_LOADER_IMAGE_CONTEXT  ImageContext;\r
   PCI_DRIVER_OVERRIDE_LIST      *Node;\r
 \r
-  Status = gBS->HandleProtocol (DriverImageHandle, &gEfiLoadedImageProtocolGuid, (VOID **) &LoadedImage);\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
+  //\r
+  // Caller should pass in either Image Handle or Image Path, but not both.\r
+  //\r
+  ASSERT ((DriverImageHandle == NULL) || (DriverImagePath == NULL));\r
 \r
-  Node = AllocatePool (sizeof (PCI_DRIVER_OVERRIDE_LIST));\r
+  Node = AllocateZeroPool (sizeof (PCI_DRIVER_OVERRIDE_LIST));\r
   if (Node == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   Node->Signature         = DRIVER_OVERRIDE_SIGNATURE;\r
   Node->DriverImageHandle = DriverImageHandle;\r
+  Node->DriverImagePath   = DuplicateDevicePath (DriverImagePath);\r
 \r
-  InsertTailList (&PciIoDevice->OptionRomDriverList, &(Node->Link));\r
+  InsertTailList (&PciIoDevice->OptionRomDriverList, &Node->Link);\r
 \r
   PciIoDevice->BusOverride  = TRUE;\r
-\r
-  ImageContext.Handle    = LoadedImage->ImageBase;\r
-  ImageContext.ImageRead = PeCoffLoaderImageReadFromMemory;\r
-\r
-  //\r
-  // Get information about the image\r
-  //\r
-  PeCoffLoaderGetImageInfo (&ImageContext);\r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h
index bf8efff8f1ef2dff76aea56cae63ba63798c9329..f0679c51ec68905fa403f2deb33107b0f97170a9 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h
@@ -1,7 +1,7 @@
 /** @file\r
   Functions declaration for Bus Specific Driver Override protoocl.\r
 \r
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2017, 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
@@ -22,9 +22,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // PCI driver override driver image list\r
 //\r
 typedef struct {\r
-  UINT32          Signature;\r
-  LIST_ENTRY      Link;\r
-  EFI_HANDLE      DriverImageHandle;\r
+  UINT32                   Signature;\r
+  LIST_ENTRY               Link;\r
+  EFI_HANDLE               DriverImageHandle;\r
+  EFI_DEVICE_PATH_PROTOCOL *DriverImagePath;\r
 } PCI_DRIVER_OVERRIDE_LIST;\r
 \r
 \r
@@ -46,7 +47,8 @@ InitializePciDriverOverrideInstance (
   Add an overriding driver image.\r
 \r
   @param PciIoDevice        Instance of PciIo device.\r
-  @param DriverImageHandle  new added driver image.\r
+  @param DriverImageHandle  Image handle of newly added driver image.\r
+  @param DriverImagePath    Device path of newly added driver image.\r
 \r
   @retval EFI_SUCCESS          Successfully added driver.\r
   @retval EFI_OUT_OF_RESOURCES No memory resource for new driver instance.\r
@@ -55,8 +57,9 @@ InitializePciDriverOverrideInstance (
 **/\r
 EFI_STATUS\r
 AddDriver (\r
-  IN PCI_IO_DEVICE     *PciIoDevice,\r
-  IN EFI_HANDLE        DriverImageHandle\r
+  IN PCI_IO_DEVICE            *PciIoDevice,\r
+  IN EFI_HANDLE               DriverImageHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL *DriverImagePath\r
   );\r
 \r
 \r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
index 4382d79c2d9737a7a6cda8ba57737a4d62ffa640..d390bb655a3986caec145226043a57bd4d4deb44 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
@@ -753,13 +753,19 @@ ProcessOpRomImage (
                     BufferSize,\r
                     &ImageHandle\r
                     );\r
-\r
-    FreePool (PciOptionRomImageDevicePath);\r
-\r
-    if (!EFI_ERROR (Status)) {\r
+    if (EFI_ERROR (Status)) {\r
+      //\r
+      // Record the Option ROM Image device path when LoadImage fails.\r
+      // PciOverride.GetDriver() will try to look for the Image Handle using the device path later.\r
+      //\r
+      AddDriver (PciDevice, NULL, PciOptionRomImageDevicePath);\r
+    } else {\r
       Status = gBS->StartImage (ImageHandle, NULL, NULL);\r
       if (!EFI_ERROR (Status)) {\r
-        AddDriver (PciDevice, ImageHandle);\r
+        //\r
+        // Record the Option ROM Image Handle\r
+        //\r
+        AddDriver (PciDevice, ImageHandle, NULL);\r
         PciRomAddImageMapping (\r
           ImageHandle,\r
           PciDevice->PciRootBridgeIo->SegmentNumber,\r
@@ -772,6 +778,7 @@ ProcessOpRomImage (
         RetStatus = EFI_SUCCESS;\r
       }\r
     }\r
+    FreePool (PciOptionRomImageDevicePath);\r
 \r
 NextImage:\r
     RomBarOffset += ImageSize;\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
index fc6f5792939f6b4a487a52a818756ce7a59ca642..aa7cfec2326f31c5cbb87d3ab2fd6bdc6f7664ab 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
@@ -129,7 +129,7 @@ PciRomGetImageMapping (
         mRomImageTable[Index].Func == PciIoDevice->FunctionNumber    ) {\r
 \r
       if (mRomImageTable[Index].ImageHandle != NULL) {\r
-        AddDriver (PciIoDevice, mRomImageTable[Index].ImageHandle);\r
+        AddDriver (PciIoDevice, mRomImageTable[Index].ImageHandle, NULL);\r
       }\r
       PciIoDevice->PciIo.RomImage = mRomImageTable[Index].RomImage;\r
       PciIoDevice->PciIo.RomSize  = mRomImageTable[Index].RomSize;\r