Commit 3940cf0b 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 development cycle were:

   - Implement EFI dev path parser and other changes to fully support
     thunderbolt devices on Apple Macbooks (Lukas Wunner)

   - Add RNG seeding via the EFI stub, on ARM/arm64 (Ard Biesheuvel)

   - Expose EFI framebuffer configuration to user-space, to improve
     tooling (Peter Jones)

   - Misc fixes and cleanups (Ivan Hu, Wei Yongjun, Yisheng Xie, Dan
     Carpenter, Roy Franz)"

* 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/libstub: Make efi_random_alloc() allocate below 4 GB on 32-bit
  thunderbolt: Compile on x86 only
  thunderbolt, efi: Fix Kconfig dependencies harder
  thunderbolt, efi: Fix Kconfig dependencies
  thunderbolt: Use Device ROM retrieved from EFI
  x86/efi: Retrieve and assign Apple device properties
  efi: Allow bitness-agnostic protocol calls
  efi: Add device path parser
  efi/arm*/libstub: Invoke EFI_RNG_PROTOCOL to seed the UEFI RNG table
  efi/libstub: Add random.c to ARM build
  efi: Add support for seeding the RNG from a UEFI config table
  MAINTAINERS: Add ARM and arm64 EFI specific files to EFI subsystem
  efi/libstub: Fix allocation size calculations
  efi/efivar_ssdt_load: Don't return success on allocation failure
  efifb: Show framebuffer layout as device attributes
  efi/efi_test: Use memdup_user() as a cleanup
  efi/efi_test: Fix uninitialized variable 'rv'
  efi/efi_test: Fix uninitialized variable 'datasize'
  efi/arm*: Fix efi_init() error handling
  efi: Remove unused include of <linux/version.h>
parents 9ad1aeec 018edcfa

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -1062,6 +1062,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	dscc4.setup=	[NET]



	dump_apple_properties	[X86]

			Dump name and content of EFI device properties on

			x86 Macs.  Useful for driver authors to determine

			what data is available or for reverse-engineering.



	dyndbg[="val"]		[KNL,DYNAMIC_DEBUG]

	module.dyndbg[="val"]

			Enable debug messages at boot time.  See

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -4645,12 +4645,14 @@ L: linux-efi@vger.kernel.org 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git

S:	Maintained

F:	Documentation/efi-stub.txt

F:	arch/ia64/kernel/efi.c

F:	arch/*/kernel/efi.c

F:	arch/x86/boot/compressed/eboot.[ch]

F:	arch/x86/include/asm/efi.h

F:	arch/*/include/asm/efi.h

F:	arch/x86/platform/efi/

F:	drivers/firmware/efi/

F:	include/linux/efi*.h

F:	arch/arm/boot/compressed/efi-header.S

F:	arch/arm64/kernel/efi-entry.S



EFI VARIABLE FILESYSTEM

M:	Matthew Garrett <matthew.garrett@nebula.com>

arch/arm/include/asm/efi.h

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ void efi_virtmap_unload(void); 
#define __efi_call_early(f, ...)	f(__VA_ARGS__)

#define efi_is_64bit()			(false)



#define efi_call_proto(protocol, f, instance, ...)			\

	((protocol##_t *)instance)->f(instance, ##__VA_ARGS__)



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);

arch/arm64/include/asm/efi.h

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 
#define __efi_call_early(f, ...)	f(__VA_ARGS__)

#define efi_is_64bit()			(true)



#define efi_call_proto(protocol, f, instance, ...)			\

	((protocol##_t *)instance)->f(instance, ##__VA_ARGS__)



#define alloc_screen_info(x...)		&screen_info

#define free_screen_info(x...)

arch/x86/boot/compressed/eboot.c

+65 −0
Original line number Diff line number Diff line
@@ -537,6 +537,69 @@ free_handle: 
	efi_call_early(free_pool, pci_handle);

}



static void retrieve_apple_device_properties(struct boot_params *boot_params)

{

	efi_guid_t guid = APPLE_PROPERTIES_PROTOCOL_GUID;

	struct setup_data *data, *new;

	efi_status_t status;

	u32 size = 0;

	void *p;



	status = efi_call_early(locate_protocol, &guid, NULL, &p);

	if (status != EFI_SUCCESS)

		return;



	if (efi_table_attr(apple_properties_protocol, version, p) != 0x10000) {

		efi_printk(sys_table, "Unsupported properties proto version\n");

		return;

	}



	efi_call_proto(apple_properties_protocol, get_all, p, NULL, &size);

	if (!size)

		return;



	do {

		status = efi_call_early(allocate_pool, EFI_LOADER_DATA,

					size + sizeof(struct setup_data), &new);

		if (status != EFI_SUCCESS) {

			efi_printk(sys_table,

					"Failed to alloc mem for properties\n");

			return;

		}



		status = efi_call_proto(apple_properties_protocol, get_all, p,

					new->data, &size);



		if (status == EFI_BUFFER_TOO_SMALL)

			efi_call_early(free_pool, new);

	} while (status == EFI_BUFFER_TOO_SMALL);



	new->type = SETUP_APPLE_PROPERTIES;

	new->len  = size;

	new->next = 0;



	data = (struct setup_data *)(unsigned long)boot_params->hdr.setup_data;

	if (!data)

		boot_params->hdr.setup_data = (unsigned long)new;

	else {

		while (data->next)

			data = (struct setup_data *)(unsigned long)data->next;

		data->next = (unsigned long)new;

	}

}



static void setup_quirks(struct boot_params *boot_params)

{

	efi_char16_t const apple[] = { 'A', 'p', 'p', 'l', 'e', 0 };

	efi_char16_t *fw_vendor = (efi_char16_t *)(unsigned long)

		efi_table_attr(efi_system_table, fw_vendor, sys_table);



	if (!memcmp(fw_vendor, apple, sizeof(apple))) {

		if (IS_ENABLED(CONFIG_APPLE_PROPERTIES))

			retrieve_apple_device_properties(boot_params);

	}

}



static efi_status_t

setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height)

{
@@ -1098,6 +1161,8 @@ struct boot_params *efi_main(struct efi_config *c, 


	setup_efi_pci(boot_params);



	setup_quirks(boot_params);



	status = efi_call_early(allocate_pool, EFI_LOADER_DATA,

				sizeof(*gdt), (void **)&gdt);

	if (status != EFI_SUCCESS) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE