Made FSL Book-E PMC support more generic
PATCH v2 1/1 Made FSL Book-E PMC support more generic
Some of the more recent e300 cores have the same performance monitor implementation as the e500. e300 isn't book-e, so the name isn't really appropriate. In preparation for e300 support, rename a bunch of fsl_booke things to say fsl_emb (Freescale Embedded Performance Monitors).
---
arch/powerpc/kernel/cputable.c | 4 +-
arch/powerpc/kernel/pmc.c | 2 +-
arch/powerpc/oprofile/Makefile | 2 +-
arch/powerpc/oprofile/common.c | 6 +-
.../{op_model_fsl_booke.c => op_model_fsl_emb.c} | 28 ++++----
arch/powerpc/platforms/Kconfig.cputype | 4 +
include/asm-powerpc/cputable.h | 2 +-
include/asm-powerpc/oprofile_impl.h | 2 +-
include/asm-powerpc/reg.h | 4 +
include/asm-powerpc/reg_booke.h | 62 -----------------
include/asm-powerpc/reg_fsl_emb.h | 72 ++++++++++++++++++++
11 files changed, 102 insertions(+), 86 deletions(-)
rename arch/powerpc/oprofile/{op_model_fsl_booke.c => op_model_fsl_emb.c} (91%)
create mode 100644 include/asm-powerpc/reg_fsl_emb.harch/powerpc/kernel/cputable.c +2 -2
@@ -1435,7 +1435,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .dcache_bsize = 32, .num_pmcs = 4, .oprofile_cpu_type = "ppc/e500", - .oprofile_type = PPC_OPROFILE_BOOKE, + .oprofile_type = PPC_OPROFILE_FSL_EMB, .machine_check = machine_check_e500, .platform = "ppc8540", },
@@ -1453,7 +1453,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .dcache_bsize = 32, .num_pmcs = 4, .oprofile_cpu_type = "ppc/e500", - .oprofile_type = PPC_OPROFILE_BOOKE, + .oprofile_type = PPC_OPROFILE_FSL_EMB, .machine_check = machine_check_e500, .platform = "ppc8548", },
arch/powerpc/kernel/pmc.c +1 -1
@@ -26,7 +26,7 @@static void dummy_perf (struct pt_regs *regs) { -#if defined(CONFIG_FSL_BOOKE ) && !defined(CONFIG_E200 ) +#if defined(CONFIG_FSL_EMB_PERFMON )mtpmr (PMRN_PMGC0 ,mfpmr (PMRN_PMGC0 ) & ~PMGC0_PMIE );#elif defined(CONFIG_PPC64 ) || defined(CONFIG_6xx)if (cur_cpu_spec->pmc_type ==PPC_PMC_IBM )
arch/powerpc/oprofile/Makefile +1 -1
@@ -15,5 +15,5 @@ oprofile-$(CONFIG_OPROFILE_CELL) += op_model_cell.o \ cell/spu_profiler.o cell/vma_map.o \ cell/spu_task_sync.o oprofile-$(CONFIG_PPC64) += op_model_rs64.o op_model_power4.o op_model_pa6t.o -oprofile-$(CONFIG_FSL_BOOKE) += op_model_fsl_booke.o +oprofile-$(CONFIG_FSL_EMB_PERFMON) += op_model_fsl_emb.o oprofile-$(CONFIG_6xx) += op_model_7450.o
arch/powerpc/oprofile/common.c +3 -3
@@ -202,9 +202,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) model = &op_model_7450;break ;#endif -#ifdef CONFIG_FSL_BOOKE -case PPC_OPROFILE_BOOKE : - model = &op_model_fsl_booke; +#if defined(CONFIG_FSL_EMB_PERFMON ) +case PPC_OPROFILE_FSL_EMB : + model = &op_model_fsl_emb;break ;#endif default :
arch/powerpc/oprofile/op_model_fsl_emb.c renamed from arch/powerpc/oprofile/op_model_fsl_booke.c +13 -15
@@ -1,7 +1,5 @@/* -* arch/powerpc/oprofile/op_model_fsl_booke.c -* -* Freescale Book-E oprofile support, based on ppc64 oprofile support +* Freescale Embedded oprofile support, based on ppc64 oprofile support * Copyright (C) 2004 Anton Blanchard <[email protected]>, IBM * * Copyright (c) 2004 Freescale Semiconductor, Inc
@@ -22,7 +20,7 @@#include <asm/system.h> #include <asm/processor.h> #include <asm/cputable.h> -#include <asm/reg_booke.h> +#include <asm/reg_fsl_emb.h> #include <asm/page.h> #include <asm/pmc.h> #include <asm/oprofile_impl.h>
@@ -244,7 +242,7 @@ static void dump_pmcs(void) mfpmr(PMRN_PMLCA3), mfpmr(PMRN_PMLCB3)); } -static int fsl_booke_cpu_setup (struct op_counter_config *ctr) +static int fsl_emb_cpu_setup (struct op_counter_config *ctr) {int i;
@@ -262,7 +260,7 @@ static int fsl_booke_cpu_setup(struct op_counter_config *ctr)return 0 ; } -static int fsl_booke_reg_setup (struct op_counter_config *ctr, +static int fsl_emb_reg_setup (struct op_counter_config *ctr,struct op_system_config *sys,int num_ctrs) {
@@ -281,7 +279,7 @@ static int fsl_booke_reg_setup(struct op_counter_config *ctr,return 0 ; } -static int fsl_booke_start (struct op_counter_config *ctr) +static int fsl_emb_start (struct op_counter_config *ctr) {int i;
@@ -315,7 +313,7 @@ static int fsl_booke_start(struct op_counter_config *ctr)return 0 ; } -static void fsl_booke_stop (void ) +static void fsl_emb_stop (void ) {/* freeze counters */ pmc_stop_ctrs ();
@@ -329,7 +327,7 @@ static void fsl_booke_stop(void) } -static void fsl_booke_handle_interrupt (struct pt_regs *regs, +static void fsl_emb_handle_interrupt (struct pt_regs *regs,struct op_counter_config *ctr) {unsigned long pc;
@@ -362,10 +360,10 @@ static void fsl_booke_handle_interrupt(struct pt_regs *regs,pmc_start_ctrs (1 ); } -struct op_powerpc_model op_model_fsl_booke = { - .reg_setup = fsl_booke_reg_setup, - .cpu_setup = fsl_booke_cpu_setup, - .start = fsl_booke_start, - .stop = fsl_booke_stop, - .handle_interrupt = fsl_booke_handle_interrupt, +struct op_powerpc_model op_model_fsl_emb = { + .reg_setup = fsl_emb_reg_setup, + .cpu_setup = fsl_emb_cpu_setup, + .start = fsl_emb_start, + .stop = fsl_emb_stop, + .handle_interrupt = fsl_emb_handle_interrupt, };
arch/powerpc/platforms/Kconfig.cputype +4 -0
@@ -94,6 +94,7 @@ config 8xx bool config E500 + select FSL_EMB_PERFMON bool config PPC_FPU
@@ -115,6 +116,9 @@ config FSL_BOOKE depends on E200 || E500 default y +config FSL_EMB_PERFMON + bool + config PTE_64BIT bool depends on 44x || E500
include/asm-powerpc/cputable.h +1 -1
@@ -46,7 +46,7 @@ enum powerpc_oprofile_type {PPC_OPROFILE_RS64 =1 ,PPC_OPROFILE_POWER4 =2 ,PPC_OPROFILE_G4 =3 , -PPC_OPROFILE_BOOKE =4 , +PPC_OPROFILE_FSL_EMB =4 ,PPC_OPROFILE_CELL =5 , PPC_OPROFILE_PA6T = 6, };
include/asm-powerpc/oprofile_impl.h +1 -1
@@ -54,7 +54,7 @@ struct op_powerpc_model {int num_counters; }; -extern struct op_powerpc_model op_model_fsl_booke; +extern struct op_powerpc_model op_model_fsl_emb;extern struct op_powerpc_model op_model_rs64;extern struct op_powerpc_model op_model_power4;extern struct op_powerpc_model op_model_7450;
include/asm-powerpc/reg.h +4 -0
@@ -18,6 +18,10 @@#include <asm/reg_booke.h> #endif /* CONFIG_BOOKE || CONFIG_40x */ +#ifdef CONFIG_FSL_EMB_PERFMON +#include <asm/reg_fsl_emb.h> +#endif +#ifdef CONFIG_8xx#include <asm/reg_8xx.h> #endif /* CONFIG_8xx */
include/asm-powerpc/reg_booke.h +0 -62
68 lines not on this page · raw message
include/asm-powerpc/reg_fsl_emb.h new file +72 -0
72 lines not on this page · raw message
Signature · 1 line
1.5.0.2.230.gfbe3d-dirty
Kumar Gala
AppliedQuoted 21 lines · Andy Fleming
Some of the more recent e300 cores have the same performance monitor implementation as the e500. e300 isn't book-e, so the name isn't really appropriate. In preparation for e300 support, rename a bunch of
fsl_bookethings to sayfsl_emb(Freescale Embedded Performance Monitors).Signed-off-by Andy Fleming <[email protected]>---
arch/powerpc/kernel/cputable.c | 4 +- arch/powerpc/kernel/pmc.c | 2 +- arch/powerpc/oprofile/Makefile | 2 +- arch/powerpc/oprofile/common.c | 6 +- .../{op_model_fsl_booke.c => op_model_fsl_emb.c} | 28 ++++---- arch/powerpc/platforms/Kconfig.cputype | 4 + include/asm-powerpc/cputable.h | 2 +- include/asm-powerpc/oprofile_impl.h | 2 +- include/asm-powerpc/reg.h | 4 + include/asm-powerpc/reg_booke.h | 62 ----------------- include/asm-powerpc/reg_fsl_emb.h | 72 +++++++++++ +++++++++ 11 files changed, 102 insertions(+), 86 deletions(-)
Quoted 2 lines
rename
arch/powerpc/oprofile/{op_model_fsl_booke.c=>op_model_fsl_emb.c} (91%) create mode 100644include/asm-powerpc/reg_fsl_emb.h
applied.
- k