shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-13 13:17:43 +03:00
Code

Merge pull request #25541 from medhefgo/boot-reconnect

Browse Source 
boot: Fix huge boot delay
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-12-02 14:37:17 +01:00 committed by GitHub
commit 6accdcc547
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/boot/efi/boot.c
View File

@ -2638,12 +2638,6 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
/* Uncomment the next line if you need to wait for debugger. */
// debug_break();
/* The firmware may skip initializing some devices for the sake of a faster boot. This is especially
* true for fastboot enabled firmwares. But this means that things we use like input devices or the
* xbootldr partition may not be available yet. Reconnect all drivers should hopefully make the
* firmware initialize everything we need. */
(void) reconnect_all_drivers();
err = BS->OpenProtocol(image,
&LoadedImageProtocol,
(void **)&loaded_image,

16
src/boot/efi/console.c
View File

@ -12,6 +12,20 @@
#define VERTICAL_MAX_OK 1080
#define VIEWPORT_RATIO 10
static EFI_STATUS console_connect(void) {
EFI_BOOT_MANAGER_POLICY_PROTOCOL *boot_policy;
EFI_STATUS err;
/* This should make console devices appear/fully initialize on fastboot firmware. */
err = BS->LocateProtocol(
&(EFI_GUID) EFI_BOOT_MANAGER_POLICY_PROTOCOL_GUID, NULL, (void **) &boot_policy);
if (err != EFI_SUCCESS)
return err;
return boot_policy->ConnectDeviceClass(boot_policy, &(EFI_GUID) EFI_BOOT_MANAGER_POLICY_CONSOLE_GUID);
}
static inline void event_closep(EFI_EVENT *event) {
if (!*event)
return;
@ -47,6 +61,8 @@ EFI_STATUS console_key_read(uint64_t *key, uint64_t timeout_usec) {
assert(key);
if (!checked) {
console_connect();
/* Get the *first* TextInputEx device.*/
err = BS->LocateProtocol(&SimpleTextInputExProtocol, NULL, (void **) &extraInEx);
if (err != EFI_SUCCESS || BS->CheckEvent(extraInEx->WaitForKeyEx) == EFI_INVALID_PARAMETER)

19
src/boot/efi/missing_efi.h
View File

@ -398,3 +398,22 @@ typedef struct {
void *StdErr;
} EFI_SHELL_PARAMETERS_PROTOCOL;
#endif
#ifndef EFI_BOOT_MANAGER_POLICY_PROTOCOL_GUID
#define EFI_BOOT_MANAGER_POLICY_PROTOCOL_GUID \
{ 0xFEDF8E0C, 0xE147, 0x11E3, { 0x99, 0x03, 0xB8, 0xE8, 0x56, 0x2C, 0xBA, 0xFA } }
#define EFI_BOOT_MANAGER_POLICY_CONSOLE_GUID \
{ 0xCAB0E94C, 0xE15F, 0x11E3, { 0x91, 0x8D, 0xB8, 0xE8, 0x56, 0x2C, 0xBA, 0xFA } }
typedef struct EFI_BOOT_MANAGER_POLICY_PROTOCOL EFI_BOOT_MANAGER_POLICY_PROTOCOL;
struct EFI_BOOT_MANAGER_POLICY_PROTOCOL {
UINT64 Revision;
EFI_STATUS (EFIAPI *ConnectDevicePath)(
EFI_BOOT_MANAGER_POLICY_PROTOCOL *This,
EFI_DEVICE_PATH *DevicePath,
BOOLEAN Recursive);
EFI_STATUS (EFIAPI *ConnectDeviceClass)(
EFI_BOOT_MANAGER_POLICY_PROTOCOL *This,
EFI_GUID *Class);
};
#endif

4
src/boot/efi/part-discovery.c
View File

@ -202,6 +202,10 @@ static EFI_STATUS find_device(const EFI_GUID *type, EFI_HANDLE *device, EFI_DEVI
if (err != EFI_SUCCESS)
return err;
/* The drivers for other partitions on this drive may not be initialized on fastboot firmware, so we
* have to ask the firmware to do just that. */
(void) BS->ConnectController(disk_handle, NULL, NULL, true);
err = BS->HandleProtocol(disk_handle, &BlockIoProtocol, (void **)&block_io);
if (err != EFI_SUCCESS)
return err;

4
src/boot/efi/vmm.c
View File

@ -83,6 +83,10 @@ EFI_STATUS vmm_open(EFI_HANDLE *ret_vmm_dev, EFI_FILE **ret_vmm_dir) {
assert(ret_vmm_dev);
assert(ret_vmm_dir);
/* Make sure all file systems have been initialized. Only do this in VMs as this is slow
* on some real firmwares. */
(void) reconnect_all_drivers();
/* find all file system handles */
err = BS->LocateHandleBuffer(ByProtocol, &FileSystemProtocol, NULL, &n_handles, &handles);
if (err != EFI_SUCCESS)