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: Matt 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: Ingo Molnar <mingo@kernel.org>
This commit is contained in:

committed by
Ingo Molnar

parent
f0133f3c5b
commit
87615a34d5
@@ -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) {
|
||||
|
Reference in New Issue
Block a user