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

Revert "boot: Use EFI_BOOT_MANAGER_POLICY_PROTOCOL to connect console devices"

Browse Source 
This reverts commit b99bf58118.

It seems that using this protocol on some firmwares to forcibly
initialize console devices may break handles (already opened file
handles and the device handle itself) that we rely on to access the
boot filesystem, making it impossible to load the selected entry.

It might be possible to get a new handle by querying for the device
handle by using its device path after calling into this protocol, but
this is untested. The firmware might also be so buggy that accessing
devices after using this protocol is impossible.

It seems prudent to revert this for now until some reliable way is found
to initialize console devices without introducing huge boot delays. Any
users on firmware where console devices cannot be accessed would have to
rely on disabling fastboot.

Fixes: #25737, #25846
This commit is contained in:
Jan Janssen 2022-12-23 14:14:53 +01:00 committed by Lennart Poettering
parent 8d41101a4a
commit f151abb0e5
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,20 +12,6 @@
#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;
@ -61,8 +47,6 @@ 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,22 +398,3 @@ 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