Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (743a4863) · Commits · 戴 / test

arch/arm64/kernel/setup.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -313,6 +313,7 @@ void __init setup_arch(char **cmdline_p)
		arm64_memblock_init();

		paging_init();
		efi_apply_persistent_mem_reservations();

		acpi_table_upgrade();

drivers/firmware/efi/arm-init.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -265,6 +265,10 @@ void __init efi_init(void)
		(params.mmap & ~PAGE_MASK)));

		init_screen_info();

		/* ARM does not permit early mappings to persist across paging_init() */
		if (IS_ENABLED(CONFIG_ARM))
		efi_memmap_unmap();
		}

		static int __init register_gop_device(void)

drivers/firmware/efi/arm-runtime.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ static int __init arm_enable_runtime_services(void)
		{
		u64 mapsize;

		if (!efi_enabled(EFI_BOOT) \|\| !efi_enabled(EFI_MEMMAP)) {
		if (!efi_enabled(EFI_BOOT)) {
		pr_info("EFI services will not be available.\n");
		return 0;
		}

drivers/firmware/efi/efi.c

+23 −12

Original line number	Diff line number	Diff line
		@@ -592,7 +592,11 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,

		early_memunmap(tbl, sizeof(*tbl));
		}
		return 0;
		}

		int __init efi_apply_persistent_mem_reservations(void)
		{
		if (efi.mem_reserve != EFI_INVALID_TABLE_ADDR) {
		unsigned long prsv = efi.mem_reserve;

		@@ -963,36 +967,43 @@ bool efi_is_table_address(unsigned long phys_addr)
		}

		static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock);
		static struct linux_efi_memreserve *efi_memreserve_root __ro_after_init;

		int efi_mem_reserve_persistent(phys_addr_t addr, u64 size)
		{
		struct linux_efi_memreserve rsv, parent;
		struct linux_efi_memreserve *rsv;

		if (efi.mem_reserve == EFI_INVALID_TABLE_ADDR)
		if (!efi_memreserve_root)
		return -ENODEV;

		rsv = kmalloc(sizeof(*rsv), GFP_KERNEL);
		rsv = kmalloc(sizeof(*rsv), GFP_ATOMIC);
		if (!rsv)
		return -ENOMEM;

		parent = memremap(efi.mem_reserve, sizeof(*rsv), MEMREMAP_WB);
		if (!parent) {
		kfree(rsv);
		return -ENOMEM;
		}

		rsv->base = addr;
		rsv->size = size;

		spin_lock(&efi_mem_reserve_persistent_lock);
		rsv->next = parent->next;
		parent->next = __pa(rsv);
		rsv->next = efi_memreserve_root->next;
		efi_memreserve_root->next = __pa(rsv);
		spin_unlock(&efi_mem_reserve_persistent_lock);

		memunmap(parent);
		return 0;
		}

		static int __init efi_memreserve_root_init(void)
		{
		if (efi.mem_reserve == EFI_INVALID_TABLE_ADDR)
		return -ENODEV;

		efi_memreserve_root = memremap(efi.mem_reserve,
		sizeof(*efi_memreserve_root),
		MEMREMAP_WB);
		if (!efi_memreserve_root)
		return -ENOMEM;
		return 0;
		}
		early_initcall(efi_memreserve_root_init);

		#ifdef CONFIG_KEXEC
		static int update_efi_random_seed(struct notifier_block *nb,

drivers/firmware/efi/libstub/arm-stub.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,9 @@ void install_memreserve_table(efi_system_table_t *sys_table_arg)
		efi_guid_t memreserve_table_guid = LINUX_EFI_MEMRESERVE_TABLE_GUID;
		efi_status_t status;

		if (IS_ENABLED(CONFIG_ARM))
		return;

		status = efi_call_early(allocate_pool, EFI_LOADER_DATA, sizeof(*rsv),
		(void **)&rsv);
		if (status != EFI_SUCCESS) {

Admin message