powerpc/kernel/cputable: cleanup the function declarations
Madhavan Srinivasan
maintainerPATCH 1/2 powerpc/kernel/cputable: cleanup the function declarations
__machine_check_early_realmode_p*() are currently declared as extern in cputable.c and because of this when compiled with "C=1" (which enables semantic checker) produces these warnings.
CHECK arch/powerpc/kernel/mce_power.carch/powerpc/kernel/mce_power.c:709:6: warning: symbol '__machine_check_early_realmode_p7' was not declared. Should it be static? arch/powerpc/kernel/mce_power.c:717:6: warning: symbol '__machine_check_early_realmode_p8' was not declared. Should it be static? arch/powerpc/kernel/mce_power.c:722:6: warning: symbol '__machine_check_early_realmode_p9' was not declared. Should it be static? arch/powerpc/kernel/mce_power.c:740:6: warning: symbol '__machine_check_early_realmode_p10' was not declared. Should it be static?
Patch here moves the declaration to asm/mce.h
and includes the same in cputable.c
--- arch/powerpc/include/asm/cputable.h | 5 +++++ arch/powerpc/include/asm/mce.h | 7 +++++++ arch/powerpc/kernel/cputable.c | 3 --- arch/powerpc/kernel/dt_cpu_ftrs.c | 4 ---- 4 files changed, 12 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/cputable.h +5 -0
@@ -9,6 +9,11 @@#ifndef __ASSEMBLY__ +/* +* Added to include __machine_check_early_realmode_* functions +*/ +#include <asm/mce.h> +/* This structure can grow, it's real size is used by head.S code * via the mkdefs mechanism. */
arch/powerpc/include/asm/mce.h +7 -0
@@ -210,6 +210,9 @@ struct mce_error_info {#define MCE_EVENT_RELEASE true#define MCE_EVENT_DONTRELEASE false +struct pt_regs ; +struct notifier_block ; +extern void save_mce_event (struct pt_regs *regs,long handled,struct mce_error_info *mce_err,uint64_t nip,uint64_t addr,uint64_t phys_addr);
@@ -225,5 +228,9 @@ int mce_register_notifier(struct notifier_block *nb);int mce_unregister_notifier (struct notifier_block *nb);#ifdef CONFIG_PPC_BOOK3S_64 void flush_and_reload_slb (void ); +long __machine_check_early_realmode_p7 (struct pt_regs *regs); +long __machine_check_early_realmode_p8 (struct pt_regs *regs); +long __machine_check_early_realmode_p9 (struct pt_regs *regs); +long __machine_check_early_realmode_p10 (struct pt_regs *regs);#endif /* CONFIG_PPC_BOOK3S_64 */ #endif /* __ASM_PPC64_MCE_H__ */
arch/powerpc/kernel/cputable.c +0 -3
@@ -72,9 +72,6 @@ extern void __setup_cpu_power9(unsigned long offset, struct cpu_spec* spec);extern void __restore_cpu_power9 (void );extern void __setup_cpu_power10 (unsigned long offset,struct cpu_spec * spec);extern void __restore_cpu_power10 (void ); -extern long __machine_check_early_realmode_p7 (struct pt_regs *regs); -extern long __machine_check_early_realmode_p8 (struct pt_regs *regs); -extern long __machine_check_early_realmode_p9 (struct pt_regs *regs);#endif /* CONFIG_PPC64 */ #if defined(CONFIG_E500 )extern void __setup_cpu_e5500 (unsigned long offset,struct cpu_spec * spec);
arch/powerpc/kernel/dt_cpu_ftrs.c +0 -4
@@ -64,10 +64,6 @@ struct dt_cpu_feature {* Set up the base CPU */ -extern long __machine_check_early_realmode_p8 (struct pt_regs *regs); -extern long __machine_check_early_realmode_p9 (struct pt_regs *regs); -extern long __machine_check_early_realmode_p10 (struct pt_regs *regs); -static int hv_mode; static struct {
Signature · 1 line
2.26.2
Madhavan Srinivasan
maintainerPATCH 2/2 powerpc: Add POWER10 raw mode cputable entry
Add a raw mode cputable entry for POWER10. Copies most of the fields from commit a3ea40d5c736 ("powerpc: Add POWER10 architected mode") except for oprofile_cpu_type, machine_check_early, pvr_mask and pvr_mask fields. On bare metal systems we use DT CPU features, which doesn't need a cputable entry. But in VMs we still rely on the raw cputable entry to set the correct values for the PMU related fields.
--- arch/powerpc/kernel/cputable.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/powerpc/kernel/cputable.c +19 -0
@@ -539,6 +539,25 @@ static struct cpu_spec __initdata cpu_specs[] = { .machine_check_early = __machine_check_early_realmode_p9, .platform = "power9", }, + {/* Power10 */ + .pvr_mask = 0xffff0000, + .pvr_value = 0x00800000, + .cpu_name = "POWER10 (raw)", + .cpu_features = CPU_FTRS_POWER10, + .cpu_user_features = COMMON_USER_POWER10, + .cpu_user_features2 = COMMON_USER2_POWER10, + .mmu_features = MMU_FTRS_POWER10, + .icache_bsize = 128, + .dcache_bsize = 128, + .num_pmcs = 6, + .pmc_type = PPC_PMC_IBM, + .oprofile_cpu_type = "ppc64/power10", + .oprofile_type = PPC_OPROFILE_INVALID, + .cpu_setup = __setup_cpu_power10, + .cpu_restore = __restore_cpu_power10, + .machine_check_early = __machine_check_early_realmode_p10, + .platform = "power10", + }, { /* Cell Broadband Engine */ .pvr_mask = 0xffff0000, .pvr_value = 0x00700000,
Signature · 1 line
2.26.2
Michael Ellerman
AppliedQuoted 5 lines · Madhavan Srinivasan
__machine_check_early_realmode_p*() are currently declared as extern in
cputable.cand because of this when compiled with "C=1" (which enables semantic checker) produces these warnings.
Quoted 7 lines
CHECK
arch/powerpc/kernel/mce_power.carch/powerpc/kernel/mce_power.c:709:6: warning: symbol '__machine_check_early_realmode_p7' was not declared. Should it be static?arch/powerpc/kernel/mce_power.c:717:6: warning: symbol '__machine_check_early_realmode_p8' was not declared. Should it be static?arch/powerpc/kernel/mce_power.c:722:6: warning: symbol '__machine_check_early_realmode_p9' was not declared. Should it be static?arch/powerpc/kernel/mce_power.c:740:6: warning: symbol '__machine_check_early_realmode_p10' was not declared. Should it be static?[...]
Applied to powerpc/fixes.
[1/2] powerpc/kernel: Cleanup machine check function declarations
https://git.kernel.org/powerpc/c/388692e943a58f28aac0fe83e75f5994da9ff8a1 [2/2] powerpc: Add POWER10 raw mode cputable entry https://git.kernel.org/powerpc/c/327da008e65a25b8206b36b7fc0c9e4edbb36a58
cheers