From 083e273bbc566e579c2003ab38feb0564066414c Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 28 Apr 2025 14:01:17 +0100 Subject: [PATCH] [efi] Add ability to reboot to firmware setup menu Add the ability to reboot to the firmware setup menu (if supported) by setting the relevant value in the OsIndications variable. Signed-off-by: Michael Brown --- src/hci/commands/reboot_cmd.c | 6 ++++++ src/include/ipxe/reboot.h | 1 + src/interface/efi/efi_reboot.c | 23 +++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/src/hci/commands/reboot_cmd.c b/src/hci/commands/reboot_cmd.c index f34468401..5d4e151b8 100644 --- a/src/hci/commands/reboot_cmd.c +++ b/src/hci/commands/reboot_cmd.c @@ -38,12 +38,16 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); struct reboot_options { /** Perform a warm reboot */ int warm; + /** Reboot to firmware setup */ + int setup; }; /** "reboot" option list */ static struct option_descriptor reboot_opts[] = { OPTION_DESC ( "warm", 'w', no_argument, struct reboot_options, warm, parse_flag ), + OPTION_DESC ( "setup", 's', no_argument, + struct reboot_options, setup, parse_flag ), }; /** "reboot" command descriptor */ @@ -69,6 +73,8 @@ static int reboot_exec ( int argc, char **argv ) { /* Reboot system */ if ( opts.warm ) flags |= REBOOT_WARM; + if ( opts.setup ) + flags |= REBOOT_SETUP; reboot ( flags ); return 0; diff --git a/src/include/ipxe/reboot.h b/src/include/ipxe/reboot.h index 2d8dadeca..cfd5b546d 100644 --- a/src/include/ipxe/reboot.h +++ b/src/include/ipxe/reboot.h @@ -56,6 +56,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); void reboot ( int flags ); #define REBOOT_WARM 0x00000001 /**< Perform a warm reboot */ +#define REBOOT_SETUP 0x00000002 /**< Reboot to firmware setup */ /** * Power off system diff --git a/src/interface/efi/efi_reboot.c b/src/interface/efi/efi_reboot.c index eb389a4b1..7ed9f5c84 100644 --- a/src/interface/efi/efi_reboot.c +++ b/src/interface/efi/efi_reboot.c @@ -31,7 +31,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); */ #include +#include #include +#include #include /** @@ -41,7 +43,28 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); */ static void efi_reboot ( int flags ) { EFI_RUNTIME_SERVICES *rs = efi_systab->RuntimeServices; + static CHAR16 wname[] = EFI_OS_INDICATIONS_VARIABLE_NAME; + UINT64 osind; + UINT32 attrs; EFI_RESET_TYPE type; + EFI_STATUS efirc; + int rc; + + /* Request boot to firmware setup, if applicable */ + if ( flags & REBOOT_SETUP ) { + osind = EFI_OS_INDICATIONS_BOOT_TO_FW_UI; + attrs = ( EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS | + EFI_VARIABLE_NON_VOLATILE ); + if ( ( efirc = rs->SetVariable ( wname, &efi_global_variable, + attrs, sizeof ( osind ), + &osind ) ) != 0 ) { + rc = -EEFI ( efirc ); + DBGC ( efi_systab, "EFI could not set %ls: %s\n", + wname, strerror ( rc ) ); + /* Continue to reboot anyway */ + } + } /* Use runtime services to reset system */ type = ( ( flags & REBOOT_WARM ) ? EfiResetWarm : EfiResetCold ); -- 2.47.2