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

Commit da6a97bf authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Michael Ellerman
Browse files

powerpc: Move epapr_paravirt_early_init() to early_init_devtree() 



The function is called by both 32-bit and 64-bit early setup right
after early_init_devtree(). All it does is run yet another early
DT parser which is precisely what early_init_devtree() is about,
so move it in there.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 63c254a5

arch/powerpc/kernel/prom.c

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include <asm/opal.h>

#include <asm/fadump.h>

#include <asm/debug.h>

#include <asm/epapr_hcalls.h>



#include <mm/mmu_decl.h>
@@ -739,6 +740,7 @@ void __init early_init_devtree(void *params) 
	/* Scan and build the list of machine check recoverable ranges */

	of_scan_flat_dt(early_init_dt_scan_recoverable_ranges, NULL);

#endif

	epapr_paravirt_early_init();



	DBG(" <- early_init_devtree()\n");

}

arch/powerpc/kernel/setup_32.c

+0 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <asm/serial.h>

#include <asm/udbg.h>

#include <asm/mmu_context.h>

#include <asm/epapr_hcalls.h>

#include <asm/code-patching.h>



#define DBG(fmt...)
@@ -125,8 +124,6 @@ notrace void __init machine_init(u64 dt_ptr) 
	/* Do some early initialization based on the flat device tree */

	early_init_devtree(__va(dt_ptr));



	epapr_paravirt_early_init();



	early_init_mmu();



	probe_machine();

arch/powerpc/kernel/setup_64.c

+0 −3
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ 
#include <asm/code-patching.h>

#include <asm/kvm_ppc.h>

#include <asm/hugetlb.h>

#include <asm/epapr_hcalls.h>

#include <asm/livepatch.h>



#ifdef DEBUG
@@ -270,8 +269,6 @@ void __init early_setup(unsigned long dt_ptr) 
	 */

	early_init_devtree(__va(dt_ptr));



	epapr_paravirt_early_init();



	/* Now we know the logical id of our boot cpu, setup the paca. */

	setup_paca(&paca[boot_cpuid]);

	fixup_boot_paca();