Commit 47c33a09 authored by Sai Praneeth Prakhya's avatar Sai Praneeth Prakhya Committed by Ingo Molnar
Browse files

x86/efi: Move efi_<reserve/free>_boot_services() to arch/x86 



efi_<reserve/free>_boot_services() are x86 specific quirks and as such
should be in asm/efi.h, so move them from linux/efi.h. Also, call
efi_free_boot_services() from __efi_enter_virtual_mode() as it is x86
specific call and ideally shouldn't be part of init/main.c

Signed-off-by: default avatarSai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arend van Spriel <arend.vanspriel@broadcom.com>
Cc: Bhupesh Sharma <bhsharma@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Eric Snowberg <eric.snowberg@oracle.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Joe Perches <joe@perches.com>
Cc: Jon Hunter <jonathanh@nvidia.com>
Cc: Julien Thierry <julien.thierry@arm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Nathan Chancellor <natechancellor@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: YiFei Zhu <zhuyifei1999@gmail.com>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20181129171230.18699-7-ard.biesheuvel@linaro.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 08cfb38f

arch/x86/include/asm/efi.h

+2 −0
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ extern int __init efi_reuse_config(u64 tables, int nr_tables); 
extern void efi_delete_dummy_variable(void);

extern void efi_switch_mm(struct mm_struct *mm);

extern void efi_recover_from_page_fault(unsigned long phys_addr);

extern void efi_free_boot_services(void);

extern void efi_reserve_boot_services(void);



struct efi_setup_data {

	u64 fw_vendor;

arch/x86/platform/efi/efi.c

+2 −0
Original line number Diff line number Diff line
@@ -993,6 +993,8 @@ static void __init __efi_enter_virtual_mode(void) 
		panic("EFI call to SetVirtualAddressMap() failed!");

	}



	efi_free_boot_services();



	/*

	 * Now that EFI is in virtual mode, update the function

	 * pointers in the runtime service table to the new virtual addresses.

include/linux/efi.h

+0 −3
Original line number Diff line number Diff line
@@ -1000,13 +1000,11 @@ extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg); 
extern void efi_gettimeofday (struct timespec64 *ts);

extern void efi_enter_virtual_mode (void);	/* switch EFI to virtual mode, if possible */

#ifdef CONFIG_X86

extern void efi_free_boot_services(void);

extern efi_status_t efi_query_variable_store(u32 attributes,

					     unsigned long size,

					     bool nonblocking);

extern void efi_find_mirror(void);

#else

static inline void efi_free_boot_services(void) {}



static inline efi_status_t efi_query_variable_store(u32 attributes,

						    unsigned long size,
@@ -1046,7 +1044,6 @@ extern void efi_mem_reserve(phys_addr_t addr, u64 size); 
extern int efi_mem_reserve_persistent(phys_addr_t addr, u64 size);

extern void efi_initialize_iomem_resources(struct resource *code_resource,

		struct resource *data_resource, struct resource *bss_resource);

extern void efi_reserve_boot_services(void);

extern int efi_get_fdt_params(struct efi_fdt_params *params);

extern struct kobject *efi_kobj;

init/main.c

+0 −4
Original line number Diff line number Diff line
@@ -737,10 +737,6 @@ asmlinkage __visible void __init start_kernel(void) 
	arch_post_acpi_subsys_init();

	sfi_init_late();



	if (efi_enabled(EFI_RUNTIME_SERVICES)) {

		efi_free_boot_services();

	}



	/* Do the rest non-__init'ed, we're now alive */

	arch_call_rest_init();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE