sparc64: Move generic PCR support code to seperate file.
It all lives in the oprofile support code currently and we will need to share this stuff with NMI watchdog and perf_counter support. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -17,47 +17,10 @@
|
||||
#include <asm/spitfire.h>
|
||||
#include <asm/cpudata.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/pcr.h>
|
||||
|
||||
static int nmi_enabled;
|
||||
|
||||
struct pcr_ops {
|
||||
u64 (*read)(void);
|
||||
void (*write)(u64);
|
||||
};
|
||||
static const struct pcr_ops *pcr_ops;
|
||||
|
||||
static u64 direct_pcr_read(void)
|
||||
{
|
||||
u64 val;
|
||||
|
||||
read_pcr(val);
|
||||
return val;
|
||||
}
|
||||
|
||||
static void direct_pcr_write(u64 val)
|
||||
{
|
||||
write_pcr(val);
|
||||
}
|
||||
|
||||
static const struct pcr_ops direct_pcr_ops = {
|
||||
.read = direct_pcr_read,
|
||||
.write = direct_pcr_write,
|
||||
};
|
||||
|
||||
static void n2_pcr_write(u64 val)
|
||||
{
|
||||
unsigned long ret;
|
||||
|
||||
ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val);
|
||||
if (val != HV_EOK)
|
||||
write_pcr(val);
|
||||
}
|
||||
|
||||
static const struct pcr_ops n2_pcr_ops = {
|
||||
.read = direct_pcr_read,
|
||||
.write = n2_pcr_write,
|
||||
};
|
||||
|
||||
/* In order to commonize as much of the implementation as
|
||||
* possible, we use PICH as our counter. Mostly this is
|
||||
* to accomodate Niagara-1 which can only count insn cycles
|
||||
@@ -70,30 +33,13 @@ static u64 picl_value(void)
|
||||
return ((u64)((0 - delta) & 0xffffffff)) << 32;
|
||||
}
|
||||
|
||||
#define PCR_PIC_PRIV 0x00000001 /* PIC access is privileged */
|
||||
#define PCR_STRACE 0x00000002 /* Trace supervisor events */
|
||||
#define PCR_UTRACE 0x00000004 /* Trace user events */
|
||||
#define PCR_N2_HTRACE 0x00000008 /* Trace hypervisor events */
|
||||
#define PCR_N2_TOE_OV0 0x00000010 /* Trap if PIC 0 overflows */
|
||||
#define PCR_N2_TOE_OV1 0x00000020 /* Trap if PIC 1 overflows */
|
||||
#define PCR_N2_MASK0 0x00003fc0
|
||||
#define PCR_N2_MASK0_SHIFT 6
|
||||
#define PCR_N2_SL0 0x0003c000
|
||||
#define PCR_N2_SL0_SHIFT 14
|
||||
#define PCR_N2_OV0 0x00040000
|
||||
#define PCR_N2_MASK1 0x07f80000
|
||||
#define PCR_N2_MASK1_SHIFT 19
|
||||
#define PCR_N2_SL1 0x78000000
|
||||
#define PCR_N2_SL1_SHIFT 27
|
||||
#define PCR_N2_OV1 0x80000000
|
||||
|
||||
#define PCR_SUN4U_ENABLE (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE)
|
||||
#define PCR_N2_ENABLE (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE | \
|
||||
PCR_N2_TOE_OV1 | \
|
||||
(2 << PCR_N2_SL1_SHIFT) | \
|
||||
(0xff << PCR_N2_MASK1_SHIFT))
|
||||
|
||||
static u64 pcr_enable = PCR_SUN4U_ENABLE;
|
||||
static u64 pcr_enable;
|
||||
|
||||
static void nmi_handler(struct pt_regs *regs)
|
||||
{
|
||||
@@ -153,62 +99,16 @@ static void nmi_stop(void)
|
||||
synchronize_sched();
|
||||
}
|
||||
|
||||
static unsigned long perf_hsvc_group;
|
||||
static unsigned long perf_hsvc_major;
|
||||
static unsigned long perf_hsvc_minor;
|
||||
|
||||
static int __init register_perf_hsvc(void)
|
||||
{
|
||||
if (tlb_type == hypervisor) {
|
||||
switch (sun4v_chip_type) {
|
||||
case SUN4V_CHIP_NIAGARA1:
|
||||
perf_hsvc_group = HV_GRP_NIAG_PERF;
|
||||
break;
|
||||
|
||||
case SUN4V_CHIP_NIAGARA2:
|
||||
perf_hsvc_group = HV_GRP_N2_CPU;
|
||||
break;
|
||||
|
||||
default:
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
|
||||
perf_hsvc_major = 1;
|
||||
perf_hsvc_minor = 0;
|
||||
if (sun4v_hvapi_register(perf_hsvc_group,
|
||||
perf_hsvc_major,
|
||||
&perf_hsvc_minor)) {
|
||||
printk("perfmon: Could not register N2 hvapi.\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void unregister_perf_hsvc(void)
|
||||
{
|
||||
if (tlb_type != hypervisor)
|
||||
return;
|
||||
sun4v_hvapi_unregister(perf_hsvc_group);
|
||||
}
|
||||
|
||||
static int oprofile_nmi_init(struct oprofile_operations *ops)
|
||||
{
|
||||
int err = register_perf_hsvc();
|
||||
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
switch (tlb_type) {
|
||||
case hypervisor:
|
||||
pcr_ops = &n2_pcr_ops;
|
||||
pcr_enable = PCR_N2_ENABLE;
|
||||
break;
|
||||
|
||||
case cheetah:
|
||||
case cheetah_plus:
|
||||
pcr_ops = &direct_pcr_ops;
|
||||
pcr_enable = PCR_SUN4U_ENABLE;
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -241,10 +141,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
void oprofile_arch_exit(void)
|
||||
{
|
||||
#ifdef CONFIG_SPARC64
|
||||
unregister_perf_hsvc();
|
||||
#endif
|
||||
}
|
||||
|
Reference in New Issue
Block a user