Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87615a34 authored by Matt Fleming's avatar Matt Fleming Committed by Ingo Molnar
Browse files

x86/efi: Force EFI reboot to process pending capsules 



If an EFI capsule has been sent to the firmware we must match the type
of EFI reset against that required by the capsule to ensure it is
processed correctly.

Force an EFI reboot if a capsule is pending for the next reset.

Signed-off-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Kweh Hock Leong <hock.leong.kweh@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: joeyli <jlee@suse.com>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/1461614832-17633-29-git-send-email-matt@codeblueprint.co.uk


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f0133f3c

arch/x86/kernel/reboot.c

+9 −0
Original line number Diff line number Diff line
@@ -535,6 +535,15 @@ static void native_machine_emergency_restart(void) 
	mode = reboot_mode == REBOOT_WARM ? 0x1234 : 0;

	*((unsigned short *)__va(0x472)) = mode;



	/*

	 * If an EFI capsule has been registered with the firmware then

	 * override the reboot= parameter.

	 */

	if (efi_capsule_pending(NULL)) {

		pr_info("EFI capsule is pending, forcing EFI reboot.\n");

		reboot_type = BOOT_EFI;

	}



	for (;;) {

		/* Could also try the reset bit in the Hammer NB */

		switch (reboot_type) {

include/linux/efi.h

+6 −0
Original line number Diff line number Diff line
@@ -1085,6 +1085,12 @@ static inline bool efi_enabled(int feature) 
}

static inline void

efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {}



static inline bool

efi_capsule_pending(int *reset_type)

{

	return false;

}

#endif



extern int efi_status_to_err(efi_status_t status);