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

powerpc/cputable: Move __cpu_setup() prototypes out of cputable.h 



Move all prototypes out of cputable.h

For that rename cpu_setup_power.h to cpu_setup.h and move all
prototypes in it.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
[mpe: Standardise cpu_spec *spec formatting]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/f45118489ee450db654db8bbcdfd8f5907337c22.1663606875.git.christophe.leroy@csgroup.eu
parent afd2288a

arch/powerpc/include/asm/cpu_setup.h

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * Copyright (C) 2020 IBM Corporation

 */



#ifndef _ASM_POWERPC_CPU_SETUP_H

#define _ASM_POWERPC_CPU_SETUP_H

void __setup_cpu_power7(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_power8(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_power9(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_power10(unsigned long offset, struct cpu_spec *spec);

void __restore_cpu_power7(void);

void __restore_cpu_power8(void);

void __restore_cpu_power9(void);

void __restore_cpu_power10(void);



void __setup_cpu_e500v1(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_e500v2(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_e500mc(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_440ep(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_440epx(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_440gx(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_440grx(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_440spe(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_440x5(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_460ex(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_460gt(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_460sx(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_apm821xx(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_603(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_604(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_750(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_750cx(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_750fx(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_7400(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_7410(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_745x(unsigned long offset, struct cpu_spec *spec);



void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_ppc970MP(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_pa6t(unsigned long offset, struct cpu_spec *spec);

void __restore_cpu_pa6t(void);

void __restore_cpu_ppc970(void);



void __setup_cpu_e5500(unsigned long offset, struct cpu_spec *spec);

void __setup_cpu_e6500(unsigned long offset, struct cpu_spec *spec);

void __restore_cpu_e5500(void);

void __restore_cpu_e6500(void);

#endif /* _ASM_POWERPC_CPU_SETUP_H */

arch/powerpc/include/asm/cpu_setup_power.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * Copyright (C) 2020 IBM Corporation

 */

void __setup_cpu_power7(unsigned long offset, struct cpu_spec *spec);

void __restore_cpu_power7(void);

void __setup_cpu_power8(unsigned long offset, struct cpu_spec *spec);

void __restore_cpu_power8(void);

void __setup_cpu_power9(unsigned long offset, struct cpu_spec *spec);

void __restore_cpu_power9(void);

void __setup_cpu_power10(unsigned long offset, struct cpu_spec *spec);

void __restore_cpu_power10(void);

arch/powerpc/kernel/cpu_setup_power.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <asm/synch.h>

#include <linux/bitops.h>

#include <asm/cputable.h>

#include <asm/cpu_setup_power.h>

#include <asm/cpu_setup.h>



/* Disable CPU_FTR_HVMODE and return false if MSR:HV is not set */

static bool init_hvmode_206(struct cpu_spec *t)

arch/powerpc/kernel/cputable.c

+1 −37
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/mce.h>

#include <asm/mmu.h>

#include <asm/setup.h>

#include <asm/cpu_setup.h>



static struct cpu_spec the_cpu_spec __read_mostly;
@@ -34,43 +35,6 @@ const char *powerpc_base_platform; 
 * part of the cputable though. That has to be fixed for both ppc32

 * and ppc64

 */

#ifdef CONFIG_PPC32

extern void __setup_cpu_e500v1(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_e500v2(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_e500mc(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_440ep(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_440x5(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_460sx(unsigned long offset, struct cpu_spec *spec);

extern void __setup_cpu_apm821xx(unsigned long offset, struct cpu_spec *spec);

extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_750cx(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_750fx(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_7400(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_7410(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_745x(unsigned long offset, struct cpu_spec* spec);

#endif /* CONFIG_PPC32 */

#ifdef CONFIG_PPC64

#include <asm/cpu_setup_power.h>

extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_ppc970MP(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_pa6t(unsigned long offset, struct cpu_spec* spec);

extern void __restore_cpu_pa6t(void);

extern void __restore_cpu_ppc970(void);

#endif /* CONFIG_PPC64 */

#if defined(CONFIG_E500)

extern void __setup_cpu_e5500(unsigned long offset, struct cpu_spec* spec);

extern void __setup_cpu_e6500(unsigned long offset, struct cpu_spec* spec);

extern void __restore_cpu_e5500(void);

extern void __restore_cpu_e6500(void);

#endif /* CONFIG_E500 */



/* This table only contains "desktop" CPUs, it need to be filled with embedded

 * ones as well...