EDK2/edk2-rk3588
1
0
Fork 0
mirror of https://github.com/edk2-porting/edk2-rk3588.git synced 2026-01-04 16:29:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Silicon/Rockchip: Connect OHCI and SD/eMMC boot device before console

Browse Source 
This fixes:
 - USB 1.1 devices (keyboard) not working until the BDS timeout
 - NVRAM vars on SD/eMMC not being dumped in time when the boot process isn't interrupted
This commit is contained in:
Mario Bălănică
2023-07-07 21:52:54 +03:00
parent 01d7159814
commit 37d0c718ff
2 changed files with 81 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
edk2-rockchip/Silicon/Rockchip/Library/PlatformBootManagerLib/PlatformBm.c
View File

@@ -20,6 +20,7 @@
#include <Library/UefiBootManagerLib.h>
#include <Library/UefiLib.h>
#include <Library/UefiRuntimeServicesTableLib.h>
#include <Library/RkAtagsLib.h>
#include <Protocol/BootManagerPolicy.h>
#include <Protocol/DevicePath.h>
#include <Protocol/EsrtManagement.h>
@@ -308,6 +309,68 @@ IsUsbHost (
return FALSE;
}
/**
This FILTER_FUNCTION checks if the Block I/O protocol handle
corresponds to that of the boot SD/eMMC device.
This code is almost identical to FvbCheckIsBootDevice from RkFvbDxe.
**/
STATIC
BOOLEAN
EFIAPI
IsSdBootBlockIo (
IN EFI_HANDLE Handle,
IN CONST CHAR16 *ReportText
)
{
EFI_STATUS Status;
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
EFI_HANDLE DeviceHandle;
NON_DISCOVERABLE_DEVICE *Device;
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor;
RKATAG_BOOTDEV *BootDevice;
BootDevice = RkAtagsGetBootDev ();
if (BootDevice == NULL) {
return FALSE;
}
DevicePath = DevicePathFromHandle (Handle);
if (DevicePath->Type != HARDWARE_DEVICE_PATH
|| DevicePath->SubType != HW_VENDOR_DP) {
return FALSE;
}
Status = gBS->LocateDevicePath (&gEdkiiNonDiscoverableDeviceProtocolGuid,
&DevicePath, &DeviceHandle);
if (EFI_ERROR (Status)) {
return FALSE;
}
Status = gBS->HandleProtocol (DeviceHandle,
&gEdkiiNonDiscoverableDeviceProtocolGuid, (VOID **) &Device);
if (EFI_ERROR (Status)) {
return FALSE;
}
Descriptor = &Device->Resources[0];
if (Descriptor->Desc != ACPI_ADDRESS_SPACE_DESCRIPTOR ||
Descriptor->ResType != ACPI_ADDRESS_SPACE_TYPE_MEM) {
return FALSE;
}
if (BootDevice->DevType == RkAtagBootDevTypeEmmc) {
return Descriptor->AddrRangeMin == PcdGet32 (PcdDwcSdhciBaseAddress);
}
if (BootDevice->DevType == RkAtagBootDevTypeSd0) {
return Descriptor->AddrRangeMin == PcdGet32 (PcdRkSdmmcBaseAddress);
}
return FALSE;
}
/**
This CALLBACK_FUNCTION attempts to connect a handle non-recursively, asking
the matching driver to produce all first-level child handles.
@@ -833,6 +896,19 @@ PlatformBootManagerBeforeConsole (
//
FilterAndProcess (&gEdkiiNonDiscoverableDeviceProtocolGuid, IsUsbHost, Connect);
//
// Connect USB OHCI controller(s)
//
FilterAndProcess (&gOhciDeviceProtocol, NULL, Connect);
//
// Connect the Block I/O device produced by the SD/eMMC device that
// booted UEFI. We don't want BDS to ignore this device as it would
// prevent RkFvbDxe from detecting it and dumping the NVRAM variables
// in time.
//
FilterAndProcess (&gEfiBlockIoProtocolGuid, IsSdBootBlockIo, Connect);
//
// Add the hardcoded short-form USB keyboard device path to ConIn.
//