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

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

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

   - further EFI code generalization to make it more workable for ARM64
   - various extensions, such as 64-bit framebuffer address support,
     UEFI v2.5 EFI_PROPERTIES_TABLE support
   - code modularization simplifications and cleanups
   - new debugging parameters
   - various fixes and smaller additions"

* 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
  efi: Fix warning of int-to-pointer-cast on x86 32-bit builds
  efi: Use correct type for struct efi_memory_map::phys_map
  x86/efi: Fix kernel panic when CONFIG_DEBUG_VIRTUAL is enabled
  efi: Add "efi_fake_mem" boot option
  x86/efi: Rename print_efi_memmap() to efi_print_memmap()
  efi: Auto-load the efi-pstore module
  efi: Introduce EFI_NX_PE_DATA bit and set it from properties table
  efi: Add support for UEFIv2.5 Properties table
  efi: Add EFI_MEMORY_MORE_RELIABLE support to efi_md_typeattr_format()
  efifb: Add support for 64-bit frame buffer addresses
  efi/arm64: Clean up efi_get_fdt_params() interface
  arm64: Use core efi=debug instead of uefi_debug command line parameter
  efi/x86: Move efi=debug option parsing to core
  drivers/firmware: Make efi/esrt.c driver explicitly non-modular
  efi: Use the generic efi.memmap instead of 'memmap'
  acpi/apei: Use appropriate pgprot_t to map GHES memory
  arm64, acpi/apei: Implement arch_apei_get_mem_attributes()
  arm64/mm: Add PROT_DEVICE_nGnRnE and PROT_NORMAL_WT
  acpi, x86: Implement arch_apei_get_mem_attributes()
  efi, x86: Rearrange efi_mem_attributes()
  ...
parents 7eeef2ab 78b9bc94

Documentation/arm/uefi.txt

+0 −2
Original line number Diff line number Diff line
@@ -60,5 +60,3 @@ linux,uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format. 
--------------------------------------------------------------------------------

linux,uefi-stub-kern-ver  | string | Copy of linux_banner from build.

--------------------------------------------------------------------------------
 


For verbose debug messages, specify 'uefi_debug' on the kernel command line.

Documentation/kernel-parameters.txt

+15 −0
Original line number Diff line number Diff line
@@ -1094,6 +1094,21 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			you are really sure that your UEFI does sane gc and

			fulfills the spec otherwise your board may brick.



	efi_fake_mem=	nn[KMG]@ss[KMG]:aa[,nn[KMG]@ss[KMG]:aa,..] [EFI; X86]

			Add arbitrary attribute to specific memory range by

			updating original EFI memory map.

			Region of memory which aa attribute is added to is

			from ss to ss+nn.

			If efi_fake_mem=2G@4G:0x10000,2G@0x10a0000000:0x10000

			is specified, EFI_MEMORY_MORE_RELIABLE(0x10000)

			attribute is added to range 0x100000000-0x180000000 and

			0x10a0000000-0x1120000000.



			Using this parameter you can do debugging of EFI memmap

			related feature. For example, you can do debugging of

			Address Range Mirroring feature even if your box

			doesn't support it.



	eisa_irq_edge=	[PARISC,HW]

			See header of drivers/parisc/eisa.c.

arch/arm64/include/asm/acpi.h

+5 −0
Original line number Diff line number Diff line
@@ -92,4 +92,9 @@ static inline const char *acpi_get_enable_method(int cpu) 
{

	return acpi_psci_present() ? "psci" : NULL;

}



#ifdef	CONFIG_ACPI_APEI

pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr);

#endif



#endif /*_ASM_ACPI_H*/

arch/arm64/include/asm/memory.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
#define MT_DEVICE_GRE		2

#define MT_NORMAL_NC		3

#define MT_NORMAL		4

#define MT_NORMAL_WT		5



/*

 * Memory types for Stage-2 translation

arch/arm64/include/asm/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -60,8 +60,10 @@ extern void __pgd_error(const char *file, int line, unsigned long val); 
#define PROT_DEFAULT		(PTE_TYPE_PAGE | PTE_AF | PTE_SHARED)

#define PROT_SECT_DEFAULT	(PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S)



#define PROT_DEVICE_nGnRnE	(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_ATTRINDX(MT_DEVICE_nGnRnE))

#define PROT_DEVICE_nGnRE	(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_ATTRINDX(MT_DEVICE_nGnRE))

#define PROT_NORMAL_NC		(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_ATTRINDX(MT_NORMAL_NC))

#define PROT_NORMAL_WT		(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_ATTRINDX(MT_NORMAL_WT))

#define PROT_NORMAL		(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_ATTRINDX(MT_NORMAL))



#define PROT_SECT_DEVICE_nGnRE	(PROT_SECT_DEFAULT | PMD_SECT_PXN | PMD_SECT_UXN | PMD_ATTRINDX(MT_DEVICE_nGnRE))

CRA Git | Maintained and supported by SUSTech CRA and CCSE