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

Commit d69ca6ba authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/32: Move early_init() in a separate file 



In preparation of KASAN, move early_init() into a separate
file in order to allow deactivation of KASAN for that function.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 06923916

arch/powerpc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ extra-y += vmlinux.lds 


obj-$(CONFIG_RELOCATABLE)	+= reloc_$(BITS).o



obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o

obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o early_32.o

obj-$(CONFIG_PPC64)		+= dma-iommu.o iommu.o

obj-$(CONFIG_KGDB)		+= kgdb.o

obj-$(CONFIG_BOOTX_TEXT)	+= btext.o

arch/powerpc/kernel/early_32.c

0 → 100644
+36 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



/*

 * Early init before relocation

 */



#include <linux/init.h>

#include <linux/kernel.h>

#include <asm/setup.h>

#include <asm/sections.h>

#include <asm/asm-prototypes.h>



/*

 * We're called here very early in the boot.

 *

 * Note that the kernel may be running at an address which is different

 * from the address that it was linked at, so we must use RELOC/PTRRELOC

 * to access static data (including strings).  -- paulus

 */

notrace unsigned long __init early_init(unsigned long dt_ptr)

{

	unsigned long offset = reloc_offset();



	/* First zero the BSS -- use memset_io, some platforms don't have caches on yet */

	memset_io((void __iomem *)PTRRELOC(&__bss_start), 0, __bss_stop - __bss_start);



	/*

	 * Identify the CPU type and fix up code sections

	 * that depend on which cpu we have.

	 */

	identify_cpu(offset, mfspr(SPRN_PVR));



	apply_feature_fixups();



	return KERNELBASE + offset;

}

arch/powerpc/kernel/setup_32.c

+0 −28
Original line number Diff line number Diff line
@@ -63,34 +63,6 @@ unsigned int DMA_MODE_WRITE; 
EXPORT_SYMBOL(DMA_MODE_READ);

EXPORT_SYMBOL(DMA_MODE_WRITE);



/*

 * We're called here very early in the boot.

 *

 * Note that the kernel may be running at an address which is different

 * from the address that it was linked at, so we must use RELOC/PTRRELOC

 * to access static data (including strings).  -- paulus

 */

notrace unsigned long __init early_init(unsigned long dt_ptr)

{

	unsigned long offset = reloc_offset();



	/* First zero the BSS -- use memset_io, some platforms don't have

	 * caches on yet */

	memset_io((void __iomem *)PTRRELOC(&__bss_start), 0,

			__bss_stop - __bss_start);



	/*

	 * Identify the CPU type and fix up code sections

	 * that depend on which cpu we have.

	 */

	identify_cpu(offset, mfspr(SPRN_PVR));



	apply_feature_fixups();



	return KERNELBASE + offset;

}





/*

 * This is run before start_kernel(), the kernel has been relocated

 * and we are running with enough of the MMU enabled to have our