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

Commit a2303849 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 biggest change in this cycle were SGI/UV related changes that
  clean up and fix UV boot quirks and problems.

  There's also various smaller cleanups and refinements"

* 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi: Reorganize the GUID table to make it easier to read
  x86/efi: Remove the unused efi_get_time() function
  x86/efi: Update efi_thunk() to use the the arch_efi_call_virt*() macros
  x86/uv: Update uv_bios_call() to use efi_call_virt_pointer()
  efi: Convert efi_call_virt() to efi_call_virt_pointer()
  x86/efi: Remove unused variable 'efi'
  efi: Document #define FOO_PROTOCOL_GUID layout
  efibc: Report more information in the error messages
parents df00ccca 7fb2b43c

arch/arm/include/asm/efi.h

+2 −2
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 
#define arch_efi_call_virt_setup()	efi_virtmap_load()

#define arch_efi_call_virt_teardown()	efi_virtmap_unload()



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

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

({									\

	efi_##f##_t *__f;						\

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

	__f = p->f;							\

	__f(args);							\

})

arch/arm64/include/asm/efi.h

+2 −2
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md); 
	efi_virtmap_load();						\

})



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

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

({									\

	efi_##f##_t *__f;						\

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

	__f = p->f;							\

	__f(args);							\

})

arch/x86/boot/compressed/eboot.c

+0 −2
Original line number Diff line number Diff line
@@ -757,7 +757,6 @@ struct boot_params *make_boot_params(struct efi_config *c) 
	struct boot_params *boot_params;

	struct apm_bios_info *bi;

	struct setup_header *hdr;

	struct efi_info *efi;

	efi_loaded_image_t *image;

	void *options, *handle;

	efi_guid_t proto = LOADED_IMAGE_PROTOCOL_GUID;
@@ -800,7 +799,6 @@ struct boot_params *make_boot_params(struct efi_config *c) 
	memset(boot_params, 0x0, 0x4000);



	hdr = &boot_params->hdr;

	efi = &boot_params->efi_info;

	bi = &boot_params->apm_bios_info;



	/* Copy the second sector to boot_params */

arch/x86/include/asm/efi.h

+4 −5
Original line number Diff line number Diff line
@@ -41,10 +41,9 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...); 
/*

 * Wrap all the virtual calls in a way that forces the parameters on the stack.

 */

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

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

({									\

	((efi_##f##_t __attribute__((regparm(0)))*)			\

		efi.systab->runtime->f)(args);				\

	((efi_##f##_t __attribute__((regparm(0)))*) p->f)(args);	\

})



#define efi_ioremap(addr, size, type, attr)	ioremap_cache(addr, size)
@@ -81,8 +80,8 @@ struct efi_scratch { 
	}								\

})



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

	efi_call((void *)efi.systab->runtime->f, args)			\

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

	efi_call((void *)p->f, args)					\



#define arch_efi_call_virt_teardown()					\

({									\

arch/x86/platform/efi/efi.c

+0 −15
Original line number Diff line number Diff line
@@ -98,21 +98,6 @@ static efi_status_t __init phys_efi_set_virtual_address_map( 
	return status;

}



void efi_get_time(struct timespec *now)

{

	efi_status_t status;

	efi_time_t eft;

	efi_time_cap_t cap;



	status = efi.get_time(&eft, &cap);

	if (status != EFI_SUCCESS)

		pr_err("Oops: efitime: can't read time!\n");



	now->tv_sec = mktime(eft.year, eft.month, eft.day, eft.hour,

			     eft.minute, eft.second);

	now->tv_nsec = 0;

}



void __init efi_find_mirror(void)

{

	efi_memory_desc_t *md;