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

Ard Biesheuvel · Ingo Molnar · commit 582a32e70882 · 2019-02-16T15:02:03.000+01:00
This reverts commit eff8962, 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: Ard Biesheuvel <ard.biesheuvel@linaro.org> Acked-by: Will 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: Ingo Molnar <mingo@kernel.org>
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
@@ -313,7 +313,6 @@ void __init setup_arch(char **cmdline_p)
 	arm64_memblock_init();
 
 	paging_init();
-	efi_apply_persistent_mem_reservations();
 
 	acpi_table_upgrade();
 
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
@@ -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;
 
diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
@@ -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) {
diff --git a/include/linux/efi.h b/include/linux/efi.h
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -592,11 +592,7 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,`
`592`	`592`
`593`	`593`	`early_memunmap(tbl, sizeof(*tbl));`
`594`	`594`	`}`
`595`		`- return 0;`
`596`		`-}`
`597`	`595`
`598`		`-int __init efi_apply_persistent_mem_reservations(void)`
`599`		`-{`
`600`	`596`	`if (efi.mem_reserve != EFI_INVALID_TABLE_ADDR) {`
`601`	`597`	`unsigned long prsv = efi.mem_reserve;`
`602`	`598`
Original file line number	Diff line number	Diff line change
`@@ -1198,8 +1198,6 @@ static inline bool efi_enabled(int feature)`
`1198`	`1198`	`extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);`
`1199`	`1199`
`1200`	`1200`	`extern bool efi_is_table_address(unsigned long phys_addr);`
`1201`		`-`
`1202`		`-extern int efi_apply_persistent_mem_reservations(void);`
`1203`	`1201`	`#else`
`1204`	`1202`	`static inline bool efi_enabled(int feature)`
`1205`	`1203`	`{`
`@@ -1218,11 +1216,6 @@ static inline bool efi_is_table_address(unsigned long phys_addr)`
`1218`	`1216`	`{`
`1219`	`1217`	`return false;`
`1220`	`1218`	`}`
`1221`		`-`
`1222`		`-static inline int efi_apply_persistent_mem_reservations(void)`
`1223`		`-{`
`1224`		`- return 0;`
`1225`		`-}`
`1226`	`1219`	`#endif`
`1227`	`1220`
`1228`	`1221`	`extern int efi_status_to_err(efi_status_t status);`