tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShellPkg/LoadPciRom: Fix the ConnectAll() implementation 

Old implementation depends on UefiHandleParsingLib and uses
incorrect Index to get handle type.
The simplest ConnectAll() implementation can be just to
locate all handles and call BS.ConnectController() for each
of them recursively. BS.ConnectController() does nothing
to the image handle. Such implementation is borrowed from
BDS core implementation.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
This commit is contained in:
Ruiyu Ni 2016-07-22 10:14:05 +08:00
parent 1b0319535b
commit fc41b97f12
1 changed files with 14 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c
View File

@ -26,7 +26,6 @@
@retval EFI_ABORTED The abort mechanism was received.
**/
EFI_STATUS
EFIAPI
LoadPciRomConnectAllDriversToAllControllers (
VOID
);
@ -377,98 +376,36 @@ LoadEfiDriversFromRomImage (
@retval EFI_ABORTED The abort mechanism was received.
**/
EFI_STATUS
EFIAPI
LoadPciRomConnectAllDriversToAllControllers (
VOID
)
{
EFI_STATUS Status;
UINTN AllHandleCount;
EFI_HANDLE *AllHandleBuffer;
UINTN Index;
UINTN HandleCount;
EFI_HANDLE *HandleBuffer;
UINTN *HandleType;
UINTN HandleIndex;
BOOLEAN Parent;
BOOLEAN Device;
UINTN Index;
Status = gBS->LocateHandleBuffer(
AllHandles,
NULL,
NULL,
&AllHandleCount,
&AllHandleBuffer
);
Status = gBS->LocateHandleBuffer (
AllHandles,
NULL,
NULL,
&HandleCount,
&HandleBuffer
);
if (EFI_ERROR (Status)) {
return Status;
}
for (Index = 0; Index < AllHandleCount; Index++) {
for (Index = 0; Index < HandleCount; Index++) {
if (ShellGetExecutionBreakFlag ()) {
Status = EFI_ABORTED;
goto Done;
break;
}
//
// Scan the handle database
//
Status = ParseHandleDatabaseByRelationshipWithType(
NULL,
AllHandleBuffer[Index],
&HandleCount,
&HandleBuffer,
&HandleType
);
/*
Status = LibScanHandleDatabase (
NULL,
NULL,
AllHandleBuffer[Index],
NULL,
&HandleCount,
&HandleBuffer,
&HandleType
);
*/
if (EFI_ERROR (Status)) {
goto Done;
}
Device = TRUE;
if ((HandleType[Index] & HR_DRIVER_BINDING_HANDLE) != 0) {
Device = FALSE;
}
if ((HandleType[Index] & HR_IMAGE_HANDLE) != 0) {
Device = FALSE;
}
if (Device) {
Parent = FALSE;
for (HandleIndex = 0; HandleIndex < HandleCount; HandleIndex++) {
if ((HandleType[HandleIndex] & HR_PARENT_HANDLE) != 0) {
Parent = TRUE;
}
}
if (!Parent) {
if ((HandleType[Index] & HR_DEVICE_HANDLE) != 0) {
Status = gBS->ConnectController (
AllHandleBuffer[Index],
NULL,
NULL,
TRUE
);
}
}
}
FreePool (HandleBuffer);
FreePool (HandleType);
gBS->ConnectController (HandleBuffer[Index], NULL, NULL, TRUE);
}
Done:
FreePool (AllHandleBuffer);
if (HandleBuffer != NULL) {
FreePool (HandleBuffer);
}
return Status;
}