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

Commit 582a32e7 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

efi/arm: Revert "Defer persistent reservations until after paging_init()" 



This reverts commit eff89628, which
deferred the processing of persistent memory reservations to a point
where the memory may have already been allocated and overwritten,
defeating the purpose.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20190215123333.21209-3-ard.biesheuvel@linaro.org


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

arch/arm64/kernel/setup.c

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



	paging_init();

	efi_apply_persistent_mem_reservations();



	acpi_table_upgrade();

drivers/firmware/efi/efi.c

+0 −4
Original line number Diff line number Diff line
@@ -592,11 +592,7 @@ 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;

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

+0 −3
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ 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) {

include/linux/efi.h

+0 −7
Original line number Diff line number Diff line
@@ -1198,8 +1198,6 @@ static inline bool efi_enabled(int feature) 
extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);



extern bool efi_is_table_address(unsigned long phys_addr);



extern int efi_apply_persistent_mem_reservations(void);

#else

static inline bool efi_enabled(int feature)

{
@@ -1218,11 +1216,6 @@ static inline bool efi_is_table_address(unsigned long phys_addr) 
{

	return false;

}



static inline int efi_apply_persistent_mem_reservations(void)

{

	return 0;

}

#endif



extern int efi_status_to_err(efi_status_t status);