svn commit: r317652 - head/sys/boot/efi/loader

Toomas Soome tsoome at FreeBSD.org
Mon May 1 16:56:36 UTC 2017


Author: tsoome
Date: Mon May  1 16:56:34 2017
New Revision: 317652
URL: https://svnweb.freebsd.org/changeset/base/317652

Log:
  loader.efi: ResetSystem does not use data with EFI_SUCCESS
  
  The current reboot command in efi/loader/main.c is passing extra data with
  ResetSystem, however, UEFI spec 2.6, page 265 does state:
  
  "ResetData is only valid if ResetStatus is something other than EFI_SUCCESS
  unless the ResetType is EfiResetPlatformSpecific where a minimum amount of
  ResetData is always required."
  
  Therefore we should use DataSize 0 and ResetData NULL - those are two last
  arguments for the call.
  
  Reviewed by:	emaste
  Differential Revision:	https://reviews.freebsd.org/D10562

Modified:
  head/sys/boot/efi/loader/main.c

Modified: head/sys/boot/efi/loader/main.c
==============================================================================
--- head/sys/boot/efi/loader/main.c	Mon May  1 16:32:28 2017	(r317651)
+++ head/sys/boot/efi/loader/main.c	Mon May  1 16:56:34 2017	(r317652)
@@ -507,8 +507,7 @@ command_reboot(int argc, char *argv[])
 		if (devsw[i]->dv_cleanup != NULL)
 			(devsw[i]->dv_cleanup)();
 
-	RS->ResetSystem(EfiResetCold, EFI_SUCCESS, 23,
-	    (CHAR16 *)"Reboot from the loader");
+	RS->ResetSystem(EfiResetCold, EFI_SUCCESS, 0, NULL);
 
 	/* NOTREACHED */
 	return (CMD_ERROR);


More information about the svn-src-all mailing list