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

Commit c8f5ed6e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull EFI updates from Ingo Molnar:
 "The main EFI changes in this cycle were:

   - Use 32-bit alignment for efi_guid_t

   - Allow the SetVirtualAddressMap() call to be omitted

   - Implement earlycon=efifb based on existing earlyprintk code

   - Various minor fixes and code cleanups from Sai, Ard and me"

* 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi: Fix build error due to enum collision between efi.h and ima.h
  efi/x86: Convert x86 EFI earlyprintk into generic earlycon implementation
  x86: Make ARCH_USE_MEMREMAP_PROT a generic Kconfig symbol
  efi/arm/arm64: Allow SetVirtualAddressMap() to be omitted
  efi: Replace GPL license boilerplate with SPDX headers
  efi/fdt: Apply more cleanups
  efi: Use 32-bit alignment for efi_guid_t
  efi/memattr: Don't bail on zero VA if it equals the region's PA
  x86/efi: Mark can_free_region() as an __init function
parents 3717f613 5c418dc7

Documentation/admin-guide/kernel-parameters.txt

+7 −1
Original line number Diff line number Diff line
@@ -1078,9 +1078,15 @@ 
			specified address. The serial port must already be

			setup and configured. Options are not yet supported.



		efifb,[options]

			Start an early, unaccelerated console on the EFI

			memory mapped framebuffer (if available). On cache

			coherent non-x86 systems that use system memory for

			the framebuffer, pass the 'ram' option so that it is

			mapped with the correct attributes.



	earlyprintk=	[X86,SH,ARM,M68k,S390]

			earlyprintk=vga

			earlyprintk=efi

			earlyprintk=sclp

			earlyprintk=xen

			earlyprintk=serial[,ttySn[,baudrate]]

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -895,6 +895,9 @@ config HAVE_ARCH_PREL32_RELOCATIONS 
	  architectures, and don't require runtime relocation on relocatable

	  kernels.



config ARCH_USE_MEMREMAP_PROT

	bool



source "kernel/gcov/Kconfig"



source "scripts/gcc-plugins/Kconfig"

arch/x86/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -1510,6 +1510,7 @@ config AMD_MEM_ENCRYPT 
	bool "AMD Secure Memory Encryption (SME) support"

	depends on X86_64 && CPU_SUP_AMD

	select DYNAMIC_PHYSICAL_MASK

	select ARCH_USE_MEMREMAP_PROT

	---help---

	  Say yes to enable support for the encryption of system memory.

	  This requires an AMD processor that supports Secure Memory
@@ -1529,10 +1530,6 @@ config AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT 
	  If set to N, then the encryption of system memory can be

	  activated with the mem_encrypt=on command line option.



config ARCH_USE_MEMREMAP_PROT

	def_bool y

	depends on AMD_MEM_ENCRYPT



# Common NUMA Features

config NUMA

	bool "Numa Memory Allocation and Scheduler Support"

arch/x86/Kconfig.debug

+0 −10
Original line number Diff line number Diff line
@@ -40,16 +40,6 @@ config EARLY_PRINTK_DBGP 
	  with klogd/syslogd or the X server. You should normally say N here,

	  unless you want to debug such a crash. You need usb debug device.



config EARLY_PRINTK_EFI

	bool "Early printk via the EFI framebuffer"

	depends on EFI && EARLY_PRINTK

	select FONT_SUPPORT

	---help---

	  Write kernel log output directly into the EFI framebuffer.



	  This is useful for kernel debugging when your machine crashes very

	  early before the console code is initialized.



config EARLY_PRINTK_USB_XDBC

	bool "Early printk via the xHCI debug port"

	depends on EARLY_PRINTK && PCI

arch/x86/include/asm/efi.h

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ static inline bool efi_runtime_supported(void) 
	return false;

}



extern struct console early_efi_console;

extern void parse_efi_setup(u64 phys_addr, u32 data_len);



extern void efifb_setup_from_dmi(struct screen_info *si, const char *opt);