From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 25 May 2020 13:11:14 +0000 (+0200)
Subject: Merge tag 'efi-changes-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d1343da330f6ff3f40abf1f360d4701af784b85a;p=linux.git

Merge tag 'efi-changes-for-v5.8' of git://git./linux/kernel/git/efi/efi into efi/core

More EFI changes for v5.8:

 - Rename pr_efi/pr_efi_err to efi_info/efi_err, and use them consistently
 - Simplify and unify initrd loading
 - Parse the builtin command line on x86 (if provided)
 - Implement printk() support, including support for wide character strings
 - Some fixes for issues introduced by the first batch of v5.8 changes
 - Fix a missing prototypes warning
 - Simplify GDT handling in early mixed mode thunking code
 - Some other minor fixes and cleanups

Conflicts:
	drivers/firmware/efi/libstub/efistub.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

d1343da330f6ff3f40abf1f360d4701af784b85a
diff --cc drivers/firmware/efi/libstub/efistub.h
index 7ebc248486d17,03f74608b963b..bcd8c0a785f0e
--- a/drivers/firmware/efi/libstub/efistub.h
+++ b/drivers/firmware/efi/libstub/efistub.h
@@@ -102,19 -114,16 +114,29 @@@ void efi_set_u64_split(u64 data, u32 *l
  #define EFI_LOCATE_BY_REGISTER_NOTIFY		1
  #define EFI_LOCATE_BY_PROTOCOL			2
  
+ /*
+  * boottime->stall takes the time period in microseconds
+  */
+ #define EFI_USEC_PER_SEC		1000000
+ 
+ /*
+  * boottime->set_timer takes the time in 100ns units
+  */
+ #define EFI_100NSEC_PER_USEC	((u64)10)
+ 
 +/*
 + * An efi_boot_memmap is used by efi_get_memory_map() to return the
 + * EFI memory map in a dynamically allocated buffer.
 + *
 + * The buffer allocated for the EFI memory map includes extra room for
 + * a minimum of EFI_MMAP_NR_SLACK_SLOTS additional EFI memory descriptors.
 + * This facilitates the reuse of the EFI memory map buffer when a second
 + * call to ExitBootServices() is needed because of intervening changes to
 + * the EFI memory map. Other related structures, e.g. x86 e820ext, need
 + * to factor in this headroom requirement as well.
 + */
 +#define EFI_MMAP_NR_SLACK_SLOTS	8
 +
  struct efi_boot_memmap {
  	efi_memory_desc_t	**map;
  	unsigned long		*map_size;