Commit 71eb40fc authored Nov 29, 2019 by Christophe Leroy Committed by Michael Ellerman Dec 05, 2019

powerpc/kasan: Fix boot failure with RELOCATABLE && FSL_BOOKE



When enabling CONFIG_RELOCATABLE and CONFIG_KASAN on FSL_BOOKE,
the kernel doesn't boot.

relocate_init() requires KASAN early shadow area to be set up because
it needs access to the device tree through generic functions.

Call kasan_early_init() before calling relocate_init()

Reported-by: Lexi Shao <shaolexi@huawei.com>
Fixes: 2edb16ef ("powerpc/32: Add KASAN support")
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/b58426f1664a4b344ff696d18cacf3b3e8962111.1575036985.git.christophe.leroy@c-s.fr

parent 63de3747

arch/powerpc/kernel/head_fsl_booke.S

+3 −3

Original line number	Diff line number	Diff line
		@@ -240,6 +240,9 @@ set_ivor:

		bl early_init

		#ifdef CONFIG_KASAN
		bl kasan_early_init
		#endif
		#ifdef CONFIG_RELOCATABLE
		mr r3,r30
		mr r4,r31
		@@ -266,9 +269,6 @@ set_ivor:
		/*
		* Decide what sort of machine this is and initialize the MMU.
		*/
		#ifdef CONFIG_KASAN
		bl kasan_early_init
		#endif
		mr r3,r30
		mr r4,r31
		bl machine_init