mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 00:20:32 +00:00
Code Issues Releases Wiki Activity

x86/oprofile: introduce model specific init/exit functions

Browse source 
This patch implements model specific OProfile init/exit functions for
x86 CPUs. Though there is more rework needed at the initialization
code, this new introduced functions allow it to keep model specific
code in the corresponding op_model_*.c files.

The function interface is the same as for oprofile_arch_init/exit().

Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: oprofile-list <oprofile-list@lists.sourceforge.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Robert Richter 2008-07-22 21:08:48 +02:00 committed by Ingo Molnar
parent 12f2b2610e
commit adf5ec0bca
3 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/x86/oprofile/nmi_int.c
View file

@ -1,10 +1,11 @@
/** /**
* @file nmi_int.c * @file nmi_int.c
* *
* @remark Copyright 2002 OProfile authors * @remark Copyright 2002-2008 OProfile authors
* @remark Read the file COPYING * @remark Read the file COPYING
* *
* @author John Levon <levon@movementarian.org> * @author John Levon <levon@movementarian.org>
* @author Robert Richter <robert.richter@amd.com>
*/ */
#include <linux/init.h> #include <linux/init.h>
@ -411,6 +412,7 @@ int __init op_nmi_init(struct oprofile_operations *ops)
__u8 vendor = boot_cpu_data.x86_vendor; __u8 vendor = boot_cpu_data.x86_vendor;
__u8 family = boot_cpu_data.x86; __u8 family = boot_cpu_data.x86;
char *cpu_type; char *cpu_type;
int ret = 0;
if (!cpu_has_apic) if (!cpu_has_apic)
return -ENODEV; return -ENODEV;
@ -466,6 +468,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
return -ENODEV; return -ENODEV;
} }
if (model->init)
ret = model->init(ops);
if (ret)
return ret;
init_sysfs(); init_sysfs();
using_nmi = 1; using_nmi = 1;
ops->create_files = nmi_create_files; ops->create_files = nmi_create_files;
@ -482,4 +489,6 @@ void op_nmi_exit(void)
{ {
if (using_nmi) if (using_nmi)
exit_sysfs(); exit_sysfs();
if (model->exit)
model->exit();
} }

18
arch/x86/oprofile/op_model_athlon.c
View file

@ -1,14 +1,15 @@
/* /*
* @file op_model_athlon.h * @file op_model_athlon.c
* athlon / K7 / K8 / Family 10h model-specific MSR operations * athlon / K7 / K8 / Family 10h model-specific MSR operations
* *
* @remark Copyright 2002 OProfile authors * @remark Copyright 2002-2008 OProfile authors
* @remark Read the file COPYING * @remark Read the file COPYING
* *
* @author John Levon * @author John Levon
* @author Philippe Elie * @author Philippe Elie
* @author Graydon Hoare * @author Graydon Hoare
*/ * @author Robert Richter <robert.richter@amd.com>
*/
#include <linux/oprofile.h> #include <linux/oprofile.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
@ -178,7 +179,18 @@ static void athlon_shutdown(struct op_msrs const * const msrs)
} }
} }
static int op_amd_init(struct oprofile_operations *ops)
{
return 0;
}
static void op_amd_exit(void)
{
}
struct op_x86_model_spec const op_athlon_spec = { struct op_x86_model_spec const op_athlon_spec = {
.init = op_amd_init,
.exit = op_amd_exit,
.num_counters = NUM_COUNTERS, .num_counters = NUM_COUNTERS,
.num_controls = NUM_CONTROLS, .num_controls = NUM_CONTROLS,
.fill_in_addresses = &athlon_fill_in_addresses, .fill_in_addresses = &athlon_fill_in_addresses,

2
arch/x86/oprofile/op_x86_model.h
View file

@ -32,6 +32,8 @@ struct pt_regs;
* various x86 CPU models' perfctr support. * various x86 CPU models' perfctr support.
*/ */
struct op_x86_model_spec { struct op_x86_model_spec {
int (*init)(struct oprofile_operations *ops);
void (*exit)(void);
unsigned int const num_counters; unsigned int const num_counters;
unsigned int const num_controls; unsigned int const num_controls;
void (*fill_in_addresses)(struct op_msrs * const msrs); void (*fill_in_addresses)(struct op_msrs * const msrs);