Skip to content

L
linux-davinci-2.6.23
Commit 86a5cddb authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files
Options

[PATCH] powerpc: merge the rest of arch/ppc*/oprofile 

- merge common.c
- move model specific files
- remove stub Makefiles
- clean up arch/ppc*/Makefile
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 654810ec
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 180 deletions
arch/ppc64/oprofile/common.c → arch/powerpc/oprofile/common.c
View file @ 86a5cddb
/*
* PPC 64 oprofile support:
* Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM
* PPC 32 oprofile support: (based on PPC 64 support)
* Copyright (C) Freescale Semiconductor, Inc 2004
* Author: Andy Fleming
*
* Based on alpha version.
*
......@@ -10,12 +14,19 @@
*/
#include <linux/oprofile.h>
#ifndef __powerpc64__
#include <linux/slab.h>
#endif /* ! __powerpc64__ */
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/errno.h>
#include <asm/ptrace.h>
#include <asm/system.h>
#ifdef __powerpc64__
#include <asm/pmc.h>
#else /* __powerpc64__ */
#include <asm/perfmon.h>
#endif /* __powerpc64__ */
#include <asm/cputable.h>
#include <asm/oprofile_impl.h>
......@@ -24,59 +35,84 @@ static struct op_powerpc_model *model;
static struct op_counter_config ctr[OP_MAX_COUNTER];
static struct op_system_config sys;
#ifndef __powerpc64__
static char *cpu_type;
#endif /* ! __powerpc64__ */
static void op_handle_interrupt(struct pt_regs *regs)
{
model->handle_interrupt(regs, ctr);
}
static int op_ppc64_setup(void)
static int op_powerpc_setup(void)
{
#ifdef __powerpc64__
int err;
/* Grab the hardware */
err = reserve_pmc_hardware(op_handle_interrupt);
if (err)
return err;
#else /* __powerpc64__ */
/* Install our interrupt handler into the existing hook. */
if (request_perfmon_irq(&op_handle_interrupt))
return -EBUSY;
mb();
#endif /* __powerpc64__ */
/* Pre-compute the values to stuff in the hardware registers. */
model->reg_setup(ctr, &sys, model->num_counters);
/* Configure the registers on all cpus. */
#ifdef __powerpc64__
on_each_cpu(model->cpu_setup, NULL, 0, 1);
#else /* __powerpc64__ */
#if 0
/* FIXME: Make multi-cpu work */
on_each_cpu(model->reg_setup, NULL, 0, 1);
#endif
#endif /* __powerpc64__ */
return 0;
}
static void op_ppc64_shutdown(void)
static void op_powerpc_shutdown(void)
{
#ifdef __powerpc64__
release_pmc_hardware();
#else /* __powerpc64__ */
mb();
/* Remove our interrupt handler. We may be removing this module. */
free_perfmon_irq();
#endif /* __powerpc64__ */
}
static void op_ppc64_cpu_start(void *dummy)
static void op_powerpc_cpu_start(void *dummy)
{
model->start(ctr);
}
static int op_ppc64_start(void)
static int op_powerpc_start(void)
{
on_each_cpu(op_ppc64_cpu_start, NULL, 0, 1);
on_each_cpu(op_powerpc_cpu_start, NULL, 0, 1);
return 0;
}
static inline void op_ppc64_cpu_stop(void *dummy)
static inline void op_powerpc_cpu_stop(void *dummy)
{
model->stop();
}
static void op_ppc64_stop(void)
static void op_powerpc_stop(void)
{
on_each_cpu(op_ppc64_cpu_stop, NULL, 0, 1);
on_each_cpu(op_powerpc_cpu_stop, NULL, 0, 1);
}
static int op_ppc64_create_files(struct super_block *sb, struct dentry *root)
static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
{
int i;
#ifdef __powerpc64__
/*
* There is one mmcr0, mmcr1 and mmcra for setting the events for
* all of the counters.
......@@ -84,6 +120,7 @@ static int op_ppc64_create_files(struct super_block *sb, struct dentry *root)
oprofilefs_create_ulong(sb, root, "mmcr0", &sys.mmcr0);
oprofilefs_create_ulong(sb, root, "mmcr1", &sys.mmcr1);
oprofilefs_create_ulong(sb, root, "mmcra", &sys.mmcra);
#endif /* __powerpc64__ */
for (i = 0; i < model->num_counters; ++i) {
struct dentry *dir;
......@@ -95,44 +132,72 @@ static int op_ppc64_create_files(struct super_block *sb, struct dentry *root)
oprofilefs_create_ulong(sb, dir, "enabled", &ctr[i].enabled);
oprofilefs_create_ulong(sb, dir, "event", &ctr[i].event);
oprofilefs_create_ulong(sb, dir, "count", &ctr[i].count);
#ifdef __powerpc64__
/*
* We dont support per counter user/kernel selection, but
* we leave the entries because userspace expects them
*/
#endif /* __powerpc64__ */
oprofilefs_create_ulong(sb, dir, "kernel", &ctr[i].kernel);
oprofilefs_create_ulong(sb, dir, "user", &ctr[i].user);
#ifndef __powerpc64__
/* FIXME: Not sure if this is used */
#endif /* ! __powerpc64__ */
oprofilefs_create_ulong(sb, dir, "unit_mask", &ctr[i].unit_mask);
}
oprofilefs_create_ulong(sb, root, "enable_kernel", &sys.enable_kernel);
oprofilefs_create_ulong(sb, root, "enable_user", &sys.enable_user);
#ifdef __powerpc64__
oprofilefs_create_ulong(sb, root, "backtrace_spinlocks",
&sys.backtrace_spinlocks);
#endif /* __powerpc64__ */
/* Default to tracing both kernel and user */
sys.enable_kernel = 1;
sys.enable_user = 1;
#ifdef __powerpc64__
/* Turn on backtracing through spinlocks by default */
sys.backtrace_spinlocks = 1;
#endif /* __powerpc64__ */
return 0;
}
int __init oprofile_arch_init(struct oprofile_operations *ops)
{
#ifndef __powerpc64__
int cpu_id = smp_processor_id();
#ifdef CONFIG_FSL_BOOKE
model = &op_model_fsl_booke;
#else
return -ENODEV;
#endif
cpu_type = kmalloc(32, GFP_KERNEL);
if (NULL == cpu_type)
return -ENOMEM;
sprintf(cpu_type, "ppc/%s", cur_cpu_spec[cpu_id]->cpu_name);
model->num_counters = cur_cpu_spec[cpu_id]->num_pmcs;
ops->cpu_type = cpu_type;
#else /* __powerpc64__ */
if (!cur_cpu_spec->oprofile_model || !cur_cpu_spec->oprofile_cpu_type)
return -ENODEV;
model = cur_cpu_spec->oprofile_model;
model->num_counters = cur_cpu_spec->num_pmcs;
ops->cpu_type = cur_cpu_spec->oprofile_cpu_type;
ops->create_files = op_ppc64_create_files;
ops->setup = op_ppc64_setup;
ops->shutdown = op_ppc64_shutdown;
ops->start = op_ppc64_start;
ops->stop = op_ppc64_stop;
#endif /* __powerpc64__ */
ops->create_files = op_powerpc_create_files;
ops->setup = op_powerpc_setup;
ops->shutdown = op_powerpc_shutdown;
ops->start = op_powerpc_start;
ops->stop = op_powerpc_stop;
printk(KERN_INFO "oprofile: using %s performance monitoring.\n",
ops->cpu_type);
......@@ -142,4 +207,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
void oprofile_arch_exit(void)
{
#ifndef __powerpc64__
kfree(cpu_type);
cpu_type = NULL;
#endif /* ! __powerpc64__ */
}
arch/ppc/Makefile
View file @ 86a5cddb
......@@ -71,7 +71,7 @@ drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/
drivers-$(CONFIG_4xx) += arch/ppc/4xx_io/
drivers-$(CONFIG_CPM2) += arch/ppc/8260_io/
drivers-$(CONFIG_OPROFILE) += arch/ppc/oprofile/
drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm
......
arch/ppc/oprofile/Makefile deleted 100644 → 0
View file @ 654810ec
include arch/powerpc/oprofile/Makefile
arch/ppc/oprofile/common.c deleted 100644 → 0
View file @ 654810ec
/*
* PPC 32 oprofile support
* Based on PPC64 oprofile support
* Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM
*
* Copyright (C) Freescale Semiconductor, Inc 2004
*
* Author: Andy Fleming
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
#include <linux/oprofile.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/errno.h>
#include <asm/ptrace.h>
#include <asm/system.h>
#include <asm/perfmon.h>
#include <asm/cputable.h>
#include <asm/oprofile_impl.h>
static struct op_powerpc_model *model;
static struct op_counter_config ctr[OP_MAX_COUNTER];
static struct op_system_config sys;
static void op_handle_interrupt(struct pt_regs *regs)
{
model->handle_interrupt(regs, ctr);
}
static int op_ppc32_setup(void)
{
/* Install our interrupt handler into the existing hook. */
if(request_perfmon_irq(&op_handle_interrupt))
return -EBUSY;
mb();
/* Pre-compute the values to stuff in the hardware registers. */
model->reg_setup(ctr, &sys, model->num_counters);
#if 0
/* FIXME: Make multi-cpu work */
/* Configure the registers on all cpus. */
on_each_cpu(model->reg_setup, NULL, 0, 1);
#endif
return 0;
}
static void op_ppc32_shutdown(void)
{
mb();
/* Remove our interrupt handler. We may be removing this module. */
free_perfmon_irq();
}
static void op_ppc32_cpu_start(void *dummy)
{
model->start(ctr);
}
static int op_ppc32_start(void)
{
on_each_cpu(op_ppc32_cpu_start, NULL, 0, 1);
return 0;
}
static inline void op_ppc32_cpu_stop(void *dummy)
{
model->stop();
}
static void op_ppc32_stop(void)
{
on_each_cpu(op_ppc32_cpu_stop, NULL, 0, 1);
}
static int op_ppc32_create_files(struct super_block *sb, struct dentry *root)
{
int i;
for (i = 0; i < model->num_counters; ++i) {
struct dentry *dir;
char buf[3];
snprintf(buf, sizeof buf, "%d", i);
dir = oprofilefs_mkdir(sb, root, buf);
oprofilefs_create_ulong(sb, dir, "enabled", &ctr[i].enabled);
oprofilefs_create_ulong(sb, dir, "event", &ctr[i].event);
oprofilefs_create_ulong(sb, dir, "count", &ctr[i].count);
oprofilefs_create_ulong(sb, dir, "kernel", &ctr[i].kernel);
oprofilefs_create_ulong(sb, dir, "user", &ctr[i].user);
/* FIXME: Not sure if this is used */
oprofilefs_create_ulong(sb, dir, "unit_mask", &ctr[i].unit_mask);
}
oprofilefs_create_ulong(sb, root, "enable_kernel", &sys.enable_kernel);
oprofilefs_create_ulong(sb, root, "enable_user", &sys.enable_user);
/* Default to tracing both kernel and user */
sys.enable_kernel = 1;
sys.enable_user = 1;
return 0;
}
static struct oprofile_operations oprof_ppc32_ops = {
.create_files = op_ppc32_create_files,
.setup = op_ppc32_setup,
.shutdown = op_ppc32_shutdown,
.start = op_ppc32_start,
.stop = op_ppc32_stop,
.cpu_type = NULL /* To be filled in below. */
};
int __init oprofile_arch_init(struct oprofile_operations *ops)
{
char *name;
int cpu_id = smp_processor_id();
#ifdef CONFIG_FSL_BOOKE
model = &op_model_fsl_booke;
#else
return -ENODEV;
#endif
name = kmalloc(32, GFP_KERNEL);
if (NULL == name)
return -ENOMEM;
sprintf(name, "ppc/%s", cur_cpu_spec[cpu_id]->cpu_name);
oprof_ppc32_ops.cpu_type = name;
model->num_counters = cur_cpu_spec[cpu_id]->num_pmcs;
*ops = oprof_ppc32_ops;
printk(KERN_INFO "oprofile: using %s performance monitoring.\n",
oprof_ppc32_ops.cpu_type);
return 0;
}
void oprofile_arch_exit(void)
{
kfree(oprof_ppc32_ops.cpu_type);
oprof_ppc32_ops.cpu_type = NULL;
}
arch/ppc64/Makefile
View file @ 86a5cddb
......@@ -85,7 +85,7 @@ libs-y += arch/ppc64/lib/
core-y += arch/ppc64/kernel/
core-y += arch/ppc64/mm/
core-$(CONFIG_XMON) += arch/ppc64/xmon/
drivers-$(CONFIG_OPROFILE) += arch/ppc64/oprofile/
drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
boot := arch/ppc64/boot
......
arch/ppc64/oprofile/Makefile deleted 100644 → 0
View file @ 654810ec
include arch/powerpc/oprofile/Makefile
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment