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>
PCI Root Bridges. So it means platform needs install PCI Root Bridge IO protocol for each\r
PCI Root Bus and install PCI Host Bridge Resource Allocation Protocol.\r
\r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, 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
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;\r
+ EFI_STATUS Status;\r
+ EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;\r
+ EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRootBridgeIo;\r
\r
//\r
// Check RemainingDevicePath validation\r
ParentDevicePath\r
);\r
\r
+ Status = EFI_SUCCESS;\r
//\r
// Enumerate the entire host bridge\r
// After enumeration, a database that records all the device information will be created\r
//\r
//\r
- Status = PciEnumerator (Controller);\r
+ if (gFullEnumeration) {\r
+ //\r
+ // Get the rootbridge Io protocol to find the host bridge handle\r
+ //\r
+ Status = gBS->OpenProtocol (\r
+ Controller,\r
+ &gEfiPciRootBridgeIoProtocolGuid,\r
+ (VOID **) &PciRootBridgeIo,\r
+ gPciBusDriverBinding.DriverBindingHandle,\r
+ Controller,\r
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+ );\r
+\r
+ if (!EFI_ERROR (Status)) {\r
+ Status = PciEnumerator (Controller, PciRootBridgeIo->ParentHandle);\r
+ }\r
+ } else {\r
+ //\r
+ // If PCI bus has already done the full enumeration, never do it again\r
+ //\r
+ Status = PciEnumeratorLight (Controller);\r
+ }\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
//\r
StartPciDevices (Controller);\r
\r
+ gFullEnumeration = FALSE;\r
return EFI_SUCCESS;\r
}\r
\r
/** @file\r
PCI eunmeration implementation on entire PCI bus system for PCI Bus module.\r
\r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
This routine is used to enumerate entire pci bus system\r
in a given platform.\r
\r
- @param Controller Parent controller handle.\r
+ @param Controller Parent controller handle.\r
+ @param HostBridgeHandle Host bridge handle.\r
\r
@retval EFI_SUCCESS PCI enumeration finished successfully.\r
@retval other Some error occurred when enumerating the pci bus system.\r
**/\r
EFI_STATUS\r
PciEnumerator (\r
- IN EFI_HANDLE Controller\r
+ IN EFI_HANDLE Controller,\r
+ IN EFI_HANDLE HostBridgeHandle\r
)\r
{\r
- EFI_HANDLE HostBridgeHandle;\r
EFI_STATUS Status;\r
EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc;\r
- EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRootBridgeIo;\r
-\r
- //\r
- // If PCI bus has already done the full enumeration, never do it again\r
- //\r
- if (!gFullEnumeration) {\r
- return PciEnumeratorLight (Controller);\r
- }\r
-\r
- //\r
- // Get the rootbridge Io protocol to find the host bridge handle\r
- //\r
- Status = gBS->OpenProtocol (\r
- Controller,\r
- &gEfiPciRootBridgeIoProtocolGuid,\r
- (VOID **) &PciRootBridgeIo,\r
- gPciBusDriverBinding.DriverBindingHandle,\r
- Controller,\r
- EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
- );\r
-\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
-\r
- //\r
- // Get the host bridge handle\r
- //\r
- HostBridgeHandle = PciRootBridgeIo->ParentHandle;\r
\r
//\r
// Get the pci host bridge resource allocation protocol\r
return Status;\r
}\r
\r
- gFullEnumeration = FALSE;\r
-\r
Status = gBS->InstallProtocolInterface (\r
&HostBridgeHandle,\r
&gEfiPciEnumerationCompleteProtocolGuid,\r
/** @file\r
PCI bus enumeration logic function declaration for PCI bus module.\r
\r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, 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
This routine is used to enumerate entire pci bus system\r
in a given platform.\r
\r
- @param Controller Parent controller handle.\r
+ @param Controller Parent controller handle.\r
+ @param HostBridgeHandle Host bridge handle.\r
\r
@retval EFI_SUCCESS PCI enumeration finished successfully.\r
@retval other Some error occurred when enumerating the pci bus system.\r
**/\r
EFI_STATUS\r
PciEnumerator (\r
- IN EFI_HANDLE Controller\r
+ IN EFI_HANDLE Controller,\r
+ IN EFI_HANDLE HostBridgeHandle\r
);\r
\r
/**\r