diff options
| author | Liu, Zhiguang <Zhiguang.Liu@intel.com> | 2022-05-12 18:54:59 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2022-05-13 01:47:11 +0000 |
| commit | ef01d63ef3c9d2e7f39755b9c2b6bf40f6076ef3 (patch) | |
| tree | 5306af456b830062183f296833cc0ca5b183fbd3 /UefiPayloadPkg | |
| parent | 57ebb2994d8be4cc3235661ebad8ff3886de28a5 (diff) | |
| download | edk2-ef01d63ef3c9d2e7f39755b9c2b6bf40f6076ef3.tar.gz | |
UefiPayloadPkg: Connect all root bridge in PlatformBootManagerBeforeConsole
Some ConIn or ConOut device may not in the first root bridge, so connect all
root bridge before detect ConIn and ConOut device.
Reviewed-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
Diffstat (limited to 'UefiPayloadPkg')
| -rw-r--r-- | UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 | ||||
| -rw-r--r-- | UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c | 49 |
2 files changed, 15 insertions, 35 deletions
diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index acf2880d22..9f58c460cd 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -61,6 +61,7 @@ gEfiSmmAccess2ProtocolGuid
gUniversalPayloadPlatformBootManagerOverrideProtocolGuid
gEfiSerialIoProtocolGuid
+ gEfiPciRootBridgeIoProtocolGuid
[Pcd]
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c index 5aece6636f..e92d12e991 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c @@ -38,9 +38,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0 \
}
-#define gPciRootBridge \
- PNPID_DEVICE_PATH_NODE(0x0A03)
-
#define gPnp16550ComPort \
PNPID_DEVICE_PATH_NODE(0x0501)
@@ -64,19 +61,6 @@ ACPI_HID_DEVICE_PATH gPnpPs2KeyboardDeviceNode = gPnpPs2Keyboard; ACPI_HID_DEVICE_PATH gPnp16550ComPortDeviceNode = gPnp16550ComPort;
VENDOR_DEVICE_PATH gTerminalTypeDeviceNode = gPcAnsiTerminal;
-//
-// Predefined platform root bridge
-//
-PLATFORM_ROOT_BRIDGE_DEVICE_PATH gPlatformRootBridge0 = {
- gPciRootBridge,
- gEndEntire
-};
-
-EFI_DEVICE_PATH_PROTOCOL *gPlatformRootBridges[] = {
- (EFI_DEVICE_PATH_PROTOCOL *)&gPlatformRootBridge0,
- NULL
-};
-
BOOLEAN mDetectDisplayOnly;
/**
@@ -447,32 +431,24 @@ DetectAndPreparePlatformPciDevicePaths ( }
/**
- The function will connect root bridge
+ The function will connect one root bridge
- @return EFI_SUCCESS Connect RootBridge successfully.
+ @param[in] Handle - The root bridge handle
+ @param[in] Instance - The instance of the root bridge
+
+ @return EFI_SUCCESS Connect RootBridge successfully.
**/
EFI_STATUS
-ConnectRootBridge (
- VOID
+EFIAPI
+ConnectOneRootBridge (
+ IN EFI_HANDLE Handle,
+ IN VOID *Instance
)
{
EFI_STATUS Status;
- EFI_HANDLE RootHandle;
- //
- // Make all the PCI_IO protocols on PCI Seg 0 show up
- //
- Status = gBS->LocateDevicePath (
- &gEfiDevicePathProtocolGuid,
- &gPlatformRootBridges[0],
- &RootHandle
- );
- if (EFI_ERROR (Status)) {
- return Status;
- }
-
- Status = gBS->ConnectController (RootHandle, NULL, NULL, FALSE);
+ Status = gBS->ConnectController (Handle, NULL, NULL, FALSE);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -491,7 +467,10 @@ PlatformConsoleInit ( VOID
)
{
- ConnectRootBridge ();
+ VisitAllInstancesOfProtocol (
+ &gEfiPciRootBridgeIoProtocolGuid,
+ ConnectOneRootBridge
+ );
//
// Do platform specific PCI Device check and add them to ConOut, ConIn, ErrOut
|