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

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

powerpc: Factor do_feature_fixup calls 



32 and 64-bit do a similar set of calls early on, we move it all to
a single common function to make the boot code more readable.

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

arch/powerpc/include/asm/feature-fixups.h

+4 −0
Original line number Diff line number Diff line
@@ -184,4 +184,8 @@ label##3: \ 
	FTR_ENTRY_OFFSET label##1b-label##3b;		\

	.popsection;



#ifndef __ASSEMBLY__

void apply_feature_fixups(void);

#endif



#endif /* __ASM_POWERPC_FEATURE_FIXUPS_H */

arch/powerpc/include/asm/synch.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
extern unsigned int __start___lwsync_fixup, __stop___lwsync_fixup;

extern void do_lwsync_fixups(unsigned long value, void *fixup_start,

			     void *fixup_end);

extern void do_final_fixups(void);



static inline void eieio(void)

{

arch/powerpc/kernel/setup_32.c

+2 −15
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ int ucache_bsize; 
notrace unsigned long __init early_init(unsigned long dt_ptr)

{

	unsigned long offset = reloc_offset();

	struct cpu_spec *spec;



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

	 * caches on yet */
@@ -81,21 +80,9 @@ notrace unsigned long __init early_init(unsigned long dt_ptr) 
	 * Identify the CPU type and fix up code sections

	 * that depend on which cpu we have.

	 */

	spec = identify_cpu(offset, mfspr(SPRN_PVR));

	identify_cpu(offset, mfspr(SPRN_PVR));



	do_feature_fixups(spec->cpu_features,

			  PTRRELOC(&__start___ftr_fixup),

			  PTRRELOC(&__stop___ftr_fixup));



	do_feature_fixups(spec->mmu_features,

			  PTRRELOC(&__start___mmu_ftr_fixup),

			  PTRRELOC(&__stop___mmu_ftr_fixup));



	do_lwsync_fixups(spec->cpu_features,

			 PTRRELOC(&__start___lwsync_fixup),

			 PTRRELOC(&__stop___lwsync_fixup));



	do_final_fixups();

	apply_feature_fixups();



	return KERNELBASE + offset;

}

arch/powerpc/kernel/setup_64.c

+1 −12
Original line number Diff line number Diff line
@@ -467,18 +467,7 @@ void __init setup_system(void) 
{

	DBG(" -> setup_system()\n");



	/* Apply the CPUs-specific and firmware specific fixups to kernel

	 * text (nop out sections not relevant to this CPU or this firmware)

	 */

	do_feature_fixups(cur_cpu_spec->cpu_features,

			  &__start___ftr_fixup, &__stop___ftr_fixup);

	do_feature_fixups(cur_cpu_spec->mmu_features,

			  &__start___mmu_ftr_fixup, &__stop___mmu_ftr_fixup);

	do_feature_fixups(powerpc_firmware_features,

			  &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);

	do_lwsync_fixups(cur_cpu_spec->cpu_features,

			 &__start___lwsync_fixup, &__stop___lwsync_fixup);

	do_final_fixups();

	apply_feature_fixups();



	/*

	 * Unflatten the device-tree passed by prom_init or kexec

arch/powerpc/lib/feature-fixups.c

+30 −2
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
#include <asm/code-patching.h>

#include <asm/page.h>

#include <asm/sections.h>



#include <asm/setup.h>

#include <asm/firmware.h>



struct fixup_entry {

	unsigned long	mask;
@@ -130,7 +131,7 @@ void do_lwsync_fixups(unsigned long value, void *fixup_start, void *fixup_end) 
	}

}



void do_final_fixups(void)

static void do_final_fixups(void)

{

#if defined(CONFIG_PPC64) && defined(CONFIG_RELOCATABLE)

	int *src, *dest;
@@ -151,6 +152,33 @@ void do_final_fixups(void) 
#endif

}



void apply_feature_fixups(void)

{

	struct cpu_spec *spec = *PTRRELOC(&cur_cpu_spec);



	/*

	 * Apply the CPU-specific and firmware specific fixups to kernel text

	 * (nop out sections not relevant to this CPU or this firmware).

	 */

	do_feature_fixups(spec->cpu_features,

			  PTRRELOC(&__start___ftr_fixup),

			  PTRRELOC(&__stop___ftr_fixup));



	do_feature_fixups(spec->mmu_features,

			  PTRRELOC(&__start___mmu_ftr_fixup),

			  PTRRELOC(&__stop___mmu_ftr_fixup));



	do_lwsync_fixups(spec->cpu_features,

			 PTRRELOC(&__start___lwsync_fixup),

			 PTRRELOC(&__stop___lwsync_fixup));



#ifdef CONFIG_PPC64

	do_feature_fixups(powerpc_firmware_features,

			  &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);

#endif

	do_final_fixups();

}



#ifdef CONFIG_FTR_FIXUP_SELFTEST



#define check(x)	\