MdeModulePkg/PciBusDxe: reference gFullEnumeration in one file

The patch is just a code cleanup with no functionality impact.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
(cherry picked from commit 2632981783683f5c37b430c3e8ac2df067810d3a)

3 files changed, 38 insertions, 42 deletions

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c
index 950cacc..3bb5099 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c
@@ -8,7 +8,7 @@
   PCI Root Bridges. So it means platform needs install PCI Root Bridge IO protocol for each

   PCI Root Bus and install PCI Host Bridge Resource Allocation Protocol.

 

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2018, 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

 which accompanies this distribution.  The full text of the license may be found at

@@ -240,8 +240,9 @@ PciBusDriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath

   )

 {

-  EFI_STATUS                Status;

-  EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;

+  EFI_STATUS                      Status;

+  EFI_DEVICE_PATH_PROTOCOL        *ParentDevicePath;

+  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRootBridgeIo;

 

   //

   // Check RemainingDevicePath validation

@@ -321,12 +322,34 @@ PciBusDriverBindingStart (
     ParentDevicePath

     );

 

+  Status = EFI_SUCCESS;

   //

   // Enumerate the entire host bridge

   // After enumeration, a database that records all the device information will be created

   //

   //

-  Status = PciEnumerator (Controller);

+  if (gFullEnumeration) {

+    //

+    // Get the rootbridge Io protocol to find the host bridge handle

+    //

+    Status = gBS->OpenProtocol (

+                    Controller,

+                    &gEfiPciRootBridgeIoProtocolGuid,

+                    (VOID **) &PciRootBridgeIo,

+                    gPciBusDriverBinding.DriverBindingHandle,

+                    Controller,

+                    EFI_OPEN_PROTOCOL_GET_PROTOCOL

+                    );

+

+    if (!EFI_ERROR (Status)) {

+      Status = PciEnumerator (Controller, PciRootBridgeIo->ParentHandle);

+    }

+  } else {

+    //

+    // If PCI bus has already done the full enumeration, never do it again

+    //

+    Status = PciEnumeratorLight (Controller);

+  }

 

   if (EFI_ERROR (Status)) {

     return Status;

@@ -337,6 +360,7 @@ PciBusDriverBindingStart (
   //

   StartPciDevices (Controller);

 

+  gFullEnumeration = FALSE;

   return EFI_SUCCESS;

 }

 

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
index d311447..f6aa327 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
@@ -1,7 +1,7 @@
 /** @file

   PCI eunmeration implementation on entire PCI bus system for PCI Bus module.

 

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

@@ -19,7 +19,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   This routine is used to enumerate entire pci bus system

   in a given platform.

 

-  @param Controller  Parent controller handle.

+  @param Controller          Parent controller handle.

+  @param HostBridgeHandle    Host bridge handle.

 

   @retval EFI_SUCCESS    PCI enumeration finished successfully.

   @retval other          Some error occurred when enumerating the pci bus system.

@@ -27,41 +28,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/

 EFI_STATUS

 PciEnumerator (

-  IN EFI_HANDLE                    Controller

+  IN EFI_HANDLE                    Controller,

+  IN EFI_HANDLE                    HostBridgeHandle

   )

 {

-  EFI_HANDLE                                        HostBridgeHandle;

   EFI_STATUS                                        Status;

   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL  *PciResAlloc;

-  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL                   *PciRootBridgeIo;

-

-  //

-  // If PCI bus has already done the full enumeration, never do it again

-  //

-  if (!gFullEnumeration) {

-    return PciEnumeratorLight (Controller);

-  }

-

-  //

-  // Get the rootbridge Io protocol to find the host bridge handle

-  //

-  Status = gBS->OpenProtocol (

-                  Controller,

-                  &gEfiPciRootBridgeIoProtocolGuid,

-                  (VOID **) &PciRootBridgeIo,

-                  gPciBusDriverBinding.DriverBindingHandle,

-                  Controller,

-                  EFI_OPEN_PROTOCOL_GET_PROTOCOL

-                  );

-

-  if (EFI_ERROR (Status)) {

-    return Status;

-  }

-

-  //

-  // Get the host bridge handle

-  //

-  HostBridgeHandle = PciRootBridgeIo->ParentHandle;

 

   //

   // Get the pci host bridge resource allocation protocol

@@ -132,8 +104,6 @@ PciEnumerator (
     return Status;

   }

 

-  gFullEnumeration = FALSE;

-

   Status = gBS->InstallProtocolInterface (

                   &HostBridgeHandle,

                   &gEfiPciEnumerationCompleteProtocolGuid,

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h
index 46f5661..2df1fb0 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h
@@ -1,7 +1,7 @@
 /** @file

   PCI bus enumeration logic function declaration for PCI bus module.

 

-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2018, 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

 which accompanies this distribution.  The full text of the license may be found at

@@ -21,7 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   This routine is used to enumerate entire pci bus system

   in a given platform.

 

-  @param Controller  Parent controller handle.

+  @param Controller          Parent controller handle.

+  @param HostBridgeHandle    Host bridge handle.

 

   @retval EFI_SUCCESS    PCI enumeration finished successfully.

   @retval other          Some error occurred when enumerating the pci bus system.

@@ -29,7 +30,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/

 EFI_STATUS

 PciEnumerator (

-  IN EFI_HANDLE                    Controller

+  IN EFI_HANDLE                    Controller,

+  IN EFI_HANDLE                    HostBridgeHandle

   );

 

 /**