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

Commit 49817c33 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 changes in this cycle were:

   - Drop the unused EFI_SYSTEM_TABLES efi.flags bit and ensure the
     ARM/arm64 EFI System Table mapping is read-only (Ard Biesheuvel)

   - Add a comment to explain that one of the code paths in the x86/pat
     code is only executed for EFI boot (Matt Fleming)

   - Improve Secure Boot status checks on arm64 and handle unexpected
     errors (Linn Crosetto)

   - Remove the global EFI memory map variable 'memmap' as the same
     information is already available in efi::memmap (Matt Fleming)

   - Add EFI Memory Attribute table support for ARM/arm64 (Ard
     Biesheuvel)

   - Add EFI GOP framebuffer support for ARM/arm64 (Ard Biesheuvel)

   - Add EFI Bootloader Control driver for storing reboot(2) data in EFI
     variables for consumption by bootloaders (Jeremy Compostella)

   - Add Core EFI capsule support (Matt Fleming)

   - Add EFI capsule char driver (Kweh, Hock Leong)

   - Unify EFI memory map code for ARM and arm64 (Ard Biesheuvel)

   - Add generic EFI support for detecting when firmware corrupts CPU
     status register bits (like IRQ flags) when performing EFI runtime
     service calls (Mark Rutland)

  ... and other misc cleanups"

* 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
  efivarfs: Make efivarfs_file_ioctl() static
  efi: Merge boolean flag arguments
  efi/capsule: Move 'capsule' to the stack in efi_capsule_supported()
  efibc: Fix excessive stack footprint warning
  efi/capsule: Make efi_capsule_pending() lockless
  efi: Remove unnecessary (and buggy) .memmap initialization from the Xen EFI driver
  efi/runtime-wrappers: Remove ARCH_EFI_IRQ_FLAGS_MASK #ifdef
  x86/efi: Enable runtime call flag checking
  arm/efi: Enable runtime call flag checking
  arm64/efi: Enable runtime call flag checking
  efi/runtime-wrappers: Detect firmware IRQ flag corruption
  efi/runtime-wrappers: Remove redundant #ifdefs
  x86/efi: Move to generic {__,}efi_call_virt()
  arm/efi: Move to generic {__,}efi_call_virt()
  arm64/efi: Move to generic {__,}efi_call_virt()
  efi/runtime-wrappers: Add {__,}efi_call_virt() templates
  efi/arm-init: Reserve rather than unmap the memory map for ARM as well
  efi: Add misc char driver interface to update EFI firmware
  x86/efi: Force EFI reboot to process pending capsules
  efi: Add 'capsule' update support
  ...
parents 230e51f2 6c5450ef

arch/arm/include/asm/efi.h

+20 −17
Original line number Diff line number Diff line
@@ -17,34 +17,28 @@ 
#include <asm/mach/map.h>

#include <asm/mmu_context.h>

#include <asm/pgtable.h>

#include <asm/ptrace.h>



#ifdef CONFIG_EFI

void efi_init(void);



int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md);

int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md);



#define efi_call_virt(f, ...)						\

({									\

	efi_##f##_t *__f;						\

	efi_status_t __s;						\

									\

	efi_virtmap_load();						\

	__f = efi.systab->runtime->f;					\

	__s = __f(__VA_ARGS__);						\

	efi_virtmap_unload();						\

	__s;								\

})

#define arch_efi_call_virt_setup()	efi_virtmap_load()

#define arch_efi_call_virt_teardown()	efi_virtmap_unload()



#define __efi_call_virt(f, ...)						\

#define arch_efi_call_virt(f, args...)					\

({									\

	efi_##f##_t *__f;						\

									\

	efi_virtmap_load();						\

	__f = efi.systab->runtime->f;					\

	__f(__VA_ARGS__);						\

	efi_virtmap_unload();						\

	__f(args);							\

})



#define ARCH_EFI_IRQ_FLAGS_MASK \

	(PSR_J_BIT | PSR_E_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT | \

	 PSR_T_BIT | MODE_MASK)



static inline void efi_set_pgd(struct mm_struct *mm)

{

	check_and_switch_context(mm, NULL);
@@ -60,6 +54,15 @@ void efi_virtmap_unload(void); 
/* arch specific definitions used by the stub code */



#define efi_call_early(f, ...)		sys_table_arg->boottime->f(__VA_ARGS__)

#define __efi_call_early(f, ...)	f(__VA_ARGS__)

#define efi_is_64bit()			(false)



struct screen_info *alloc_screen_info(efi_system_table_t *sys_table_arg);

void free_screen_info(efi_system_table_t *sys_table, struct screen_info *si);



static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt)

{

}



/*

 * A reasonable upper bound for the uncompressed kernel size is 32 MBytes,

arch/arm/kernel/efi.c

+41 −0
Original line number Diff line number Diff line
@@ -11,6 +11,41 @@ 
#include <asm/mach/map.h>

#include <asm/mmu_context.h>



static int __init set_permissions(pte_t *ptep, pgtable_t token,

				  unsigned long addr, void *data)

{

	efi_memory_desc_t *md = data;

	pte_t pte = *ptep;



	if (md->attribute & EFI_MEMORY_RO)

		pte = set_pte_bit(pte, __pgprot(L_PTE_RDONLY));

	if (md->attribute & EFI_MEMORY_XP)

		pte = set_pte_bit(pte, __pgprot(L_PTE_XN));

	set_pte_ext(ptep, pte, PTE_EXT_NG);

	return 0;

}



int __init efi_set_mapping_permissions(struct mm_struct *mm,

				       efi_memory_desc_t *md)

{

	unsigned long base, size;



	base = md->virt_addr;

	size = md->num_pages << EFI_PAGE_SHIFT;



	/*

	 * We can only use apply_to_page_range() if we can guarantee that the

	 * entire region was mapped using pages. This should be the case if the

	 * region does not cover any naturally aligned SECTION_SIZE sized

	 * blocks.

	 */

	if (round_down(base + size, SECTION_SIZE) <

	    round_up(base, SECTION_SIZE) + SECTION_SIZE)

		return apply_to_page_range(mm, base, size, set_permissions, md);



	return 0;

}



int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md)

{

	struct map_desc desc = {
@@ -34,5 +69,11 @@ int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md) 
		desc.type = MT_DEVICE;



	create_mapping_late(mm, &desc, true);



	/*

	 * If stricter permissions were specified, apply them now.

	 */

	if (md->attribute & (EFI_MEMORY_RO | EFI_MEMORY_XP))

		return efi_set_mapping_permissions(mm, md);

	return 0;

}

arch/arm/kernel/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -883,7 +883,8 @@ static void __init request_standard_resources(const struct machine_desc *mdesc) 
		request_resource(&ioport_resource, &lp2);

}



#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)

#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) || \

    defined(CONFIG_EFI)

struct screen_info screen_info = {

 .orig_video_lines	= 30,

 .orig_video_cols	= 80,

arch/arm64/include/asm/efi.h

+22 −15
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <asm/io.h>

#include <asm/mmu_context.h>

#include <asm/neon.h>

#include <asm/ptrace.h>

#include <asm/tlbflush.h>



#ifdef CONFIG_EFI
@@ -14,32 +15,29 @@ extern void efi_init(void); 


int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md);



#define efi_call_virt(f, ...)						\

#define efi_set_mapping_permissions	efi_create_mapping



#define arch_efi_call_virt_setup()					\

({									\

	efi_##f##_t *__f;						\

	efi_status_t __s;						\

									\

	kernel_neon_begin();						\

	efi_virtmap_load();						\

	__f = efi.systab->runtime->f;					\

	__s = __f(__VA_ARGS__);						\

	efi_virtmap_unload();						\

	kernel_neon_end();						\

	__s;								\

})



#define __efi_call_virt(f, ...)						\

#define arch_efi_call_virt(f, args...)					\

({									\

	efi_##f##_t *__f;						\

									\

	kernel_neon_begin();						\

	efi_virtmap_load();						\

	__f = efi.systab->runtime->f;					\

	__f(__VA_ARGS__);						\

	__f(args);							\

})



#define arch_efi_call_virt_teardown()					\

({									\

	efi_virtmap_unload();						\

	kernel_neon_end();						\

})



#define ARCH_EFI_IRQ_FLAGS_MASK (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT)



/* arch specific definitions used by the stub code */



/*
@@ -51,6 +49,15 @@ int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md); 
#define MAX_FDT_OFFSET	SZ_512M



#define efi_call_early(f, ...)		sys_table_arg->boottime->f(__VA_ARGS__)

#define __efi_call_early(f, ...)	f(__VA_ARGS__)

#define efi_is_64bit()			(true)



#define alloc_screen_info(x...)		&screen_info

#define free_screen_info(x...)



static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt)

{

}



#define EFI_ALLOC_ALIGN		SZ_64K

arch/arm64/kernel/efi.c

+43 −14
Original line number Diff line number Diff line
@@ -17,22 +17,51 @@ 


#include <asm/efi.h>



int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md)

{

	pteval_t prot_val;



/*

 * Only regions of type EFI_RUNTIME_SERVICES_CODE need to be

 * executable, everything else can be mapped with the XN bits

	 * set.

 * set. Also take the new (optional) RO/XP bits into account.

 */

	if ((md->attribute & EFI_MEMORY_WB) == 0)

		prot_val = PROT_DEVICE_nGnRE;

	else if (md->type == EFI_RUNTIME_SERVICES_CODE ||

		 !PAGE_ALIGNED(md->phys_addr))

		prot_val = pgprot_val(PAGE_KERNEL_EXEC);

	else

		prot_val = pgprot_val(PAGE_KERNEL);

static __init pteval_t create_mapping_protection(efi_memory_desc_t *md)

{

	u64 attr = md->attribute;

	u32 type = md->type;



	if (type == EFI_MEMORY_MAPPED_IO)

		return PROT_DEVICE_nGnRE;



	if (WARN_ONCE(!PAGE_ALIGNED(md->phys_addr),

		      "UEFI Runtime regions are not aligned to 64 KB -- buggy firmware?"))

		/*

		 * If the region is not aligned to the page size of the OS, we

		 * can not use strict permissions, since that would also affect

		 * the mapping attributes of the adjacent regions.

		 */

		return pgprot_val(PAGE_KERNEL_EXEC);



	/* R-- */

	if ((attr & (EFI_MEMORY_XP | EFI_MEMORY_RO)) ==

	    (EFI_MEMORY_XP | EFI_MEMORY_RO))

		return pgprot_val(PAGE_KERNEL_RO);



	/* R-X */

	if (attr & EFI_MEMORY_RO)

		return pgprot_val(PAGE_KERNEL_ROX);



	/* RW- */

	if (attr & EFI_MEMORY_XP || type != EFI_RUNTIME_SERVICES_CODE)

		return pgprot_val(PAGE_KERNEL);



	/* RWX */

	return pgprot_val(PAGE_KERNEL_EXEC);

}



/* we will fill this structure from the stub, so don't put it in .bss */

struct screen_info screen_info __section(.data);



int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md)

{

	pteval_t prot_val = create_mapping_protection(md);



	create_pgd_mapping(mm, md->phys_addr, md->virt_addr,

			   md->num_pages << EFI_PAGE_SHIFT,