Commit 654810ec authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras

[PATCH] powerpc: merge oprofile headers

Merge include/asm-ppc64/oprofile_ipml.h and arch/ppc/oprofile/op_impl.h
into include/asm-powerpc/oprofile_ipml.h
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent a3e48c10
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/perfmon.h> #include <asm/perfmon.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/oprofile_impl.h>
#include "op_impl.h"
static struct op_powerpc_model *model; static struct op_powerpc_model *model;
......
/*
* Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM
*
* Based on alpha version.
*
* 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.
*/
#ifndef OP_IMPL_H
#define OP_IMPL_H 1
#define OP_MAX_COUNTER 8
/* Per-counter configuration as set via oprofilefs. */
struct op_counter_config {
unsigned long enabled;
unsigned long event;
unsigned long count;
unsigned long kernel;
unsigned long user;
unsigned long unit_mask;
};
/* System-wide configuration as set via oprofilefs. */
struct op_system_config {
unsigned long enable_kernel;
unsigned long enable_user;
};
/* Per-arch configuration */
struct op_powerpc_model {
void (*reg_setup) (struct op_counter_config *,
struct op_system_config *,
int num_counters);
void (*start) (struct op_counter_config *);
void (*stop) (void);
void (*handle_interrupt) (struct pt_regs *,
struct op_counter_config *);
int num_counters;
};
#endif /* OP_IMPL_H */
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
#include <asm/reg_booke.h> #include <asm/reg_booke.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/perfmon.h> #include <asm/perfmon.h>
#include <asm/oprofile_impl.h>
#include "op_impl.h"
static unsigned long reset_value[OP_MAX_COUNTER]; static unsigned long reset_value[OP_MAX_COUNTER];
......
...@@ -9,31 +9,39 @@ ...@@ -9,31 +9,39 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#ifndef OP_IMPL_H #ifndef _ASM_POWERPC_OPROFILE_IMPL_H
#define OP_IMPL_H 1 #define _ASM_POWERPC_OPROFILE_IMPL_H
#define OP_MAX_COUNTER 8 #define OP_MAX_COUNTER 8
/* Per-counter configuration as set via oprofilefs. */ /* Per-counter configuration as set via oprofilefs. */
struct op_counter_config { struct op_counter_config {
#ifdef __powerpc64__
unsigned long valid; unsigned long valid;
#endif
unsigned long enabled; unsigned long enabled;
unsigned long event; unsigned long event;
unsigned long count; unsigned long count;
unsigned long kernel; unsigned long kernel;
#ifdef __powerpc64__
/* We dont support per counter user/kernel selection */ /* We dont support per counter user/kernel selection */
#endif
unsigned long user; unsigned long user;
unsigned long unit_mask; unsigned long unit_mask;
}; };
/* System-wide configuration as set via oprofilefs. */ /* System-wide configuration as set via oprofilefs. */
struct op_system_config { struct op_system_config {
#ifdef __powerpc64__
unsigned long mmcr0; unsigned long mmcr0;
unsigned long mmcr1; unsigned long mmcr1;
unsigned long mmcra; unsigned long mmcra;
#endif
unsigned long enable_kernel; unsigned long enable_kernel;
unsigned long enable_user; unsigned long enable_user;
#ifdef __powerpc64__
unsigned long backtrace_spinlocks; unsigned long backtrace_spinlocks;
#endif
}; };
/* Per-arch configuration */ /* Per-arch configuration */
...@@ -41,7 +49,9 @@ struct op_powerpc_model { ...@@ -41,7 +49,9 @@ struct op_powerpc_model {
void (*reg_setup) (struct op_counter_config *, void (*reg_setup) (struct op_counter_config *,
struct op_system_config *, struct op_system_config *,
int num_counters); int num_counters);
#ifdef __powerpc64__
void (*cpu_setup) (void *); void (*cpu_setup) (void *);
#endif
void (*start) (struct op_counter_config *); void (*start) (struct op_counter_config *);
void (*stop) (void); void (*stop) (void);
void (*handle_interrupt) (struct pt_regs *, void (*handle_interrupt) (struct pt_regs *,
...@@ -49,6 +59,7 @@ struct op_powerpc_model { ...@@ -49,6 +59,7 @@ struct op_powerpc_model {
int num_counters; int num_counters;
}; };
#ifdef __powerpc64__
extern struct op_powerpc_model op_model_rs64; extern struct op_powerpc_model op_model_rs64;
extern struct op_powerpc_model op_model_power4; extern struct op_powerpc_model op_model_power4;
...@@ -107,5 +118,6 @@ static inline void ctr_write(unsigned int i, unsigned int val) ...@@ -107,5 +118,6 @@ static inline void ctr_write(unsigned int i, unsigned int val)
break; break;
} }
} }
#endif /* __powerpc64__ */
#endif #endif /* _ASM_POWERPC_OPROFILE_IMPL_H */
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