[POWERPC] 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). Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Šī revīzija ir iekļauta:

revīziju iesūtīja
Kumar Gala

vecāks
0367aad1ad
revīzija
39aef685af
@@ -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
|
||||
|
@@ -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:
|
||||
|
@@ -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 <anton@au.ibm.com>, 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,
|
||||
};
|
Atsaukties uz šo jaunā problēmā
Block a user