Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 327327
b: refs/heads/master
c: 0bab20b
h: refs/heads/master
i:
  327325: 9898e32
  327323: 9c6a54a
  327319: a190c21
  327311: 743396b
  327295: 69a5f2d
v: v3
  • Loading branch information
David S. Miller committed Aug 19, 2012
1 parent eb21a43 commit ddad391
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8c79bfa51101354853f0f5d3b02435cec429da51
refs/heads/master: 0bab20ba4c95f56355c24a0b9f03eb486c2a267d
4 changes: 2 additions & 2 deletions trunk/arch/sparc/include/asm/pcr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#define __PCR_H

struct pcr_ops {
u64 (*read)(void);
void (*write)(u64);
u64 (*read)(unsigned long);
void (*write)(unsigned long, u64);
};
extern const struct pcr_ops *pcr_ops;

Expand Down
14 changes: 7 additions & 7 deletions trunk/arch/sparc/kernel/nmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP)
touched = 1;
else
pcr_ops->write(PCR_PIC_PRIV);
pcr_ops->write(0, PCR_PIC_PRIV);

sum = local_cpu_data().irq0_irqs;
if (__get_cpu_var(nmi_touch)) {
Expand All @@ -127,7 +127,7 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
}
if (__get_cpu_var(wd_enabled)) {
write_pic(picl_value(nmi_hz));
pcr_ops->write(pcr_enable);
pcr_ops->write(0, pcr_enable);
}

restore_hardirq_stack(orig_sp);
Expand Down Expand Up @@ -166,7 +166,7 @@ static void report_broken_nmi(int cpu, int *prev_nmi_count)

void stop_nmi_watchdog(void *unused)
{
pcr_ops->write(PCR_PIC_PRIV);
pcr_ops->write(0, PCR_PIC_PRIV);
__get_cpu_var(wd_enabled) = 0;
atomic_dec(&nmi_active);
}
Expand Down Expand Up @@ -223,21 +223,21 @@ void start_nmi_watchdog(void *unused)
__get_cpu_var(wd_enabled) = 1;
atomic_inc(&nmi_active);

pcr_ops->write(PCR_PIC_PRIV);
pcr_ops->write(0, PCR_PIC_PRIV);
write_pic(picl_value(nmi_hz));

pcr_ops->write(pcr_enable);
pcr_ops->write(0, pcr_enable);
}

static void nmi_adjust_hz_one(void *unused)
{
if (!__get_cpu_var(wd_enabled))
return;

pcr_ops->write(PCR_PIC_PRIV);
pcr_ops->write(0, PCR_PIC_PRIV);
write_pic(picl_value(nmi_hz));

pcr_ops->write(pcr_enable);
pcr_ops->write(0, pcr_enable);
}

void nmi_adjust_hz(unsigned int new_hz)
Expand Down
9 changes: 6 additions & 3 deletions trunk/arch/sparc/kernel/pcr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,18 @@ void arch_irq_work_raise(void)
const struct pcr_ops *pcr_ops;
EXPORT_SYMBOL_GPL(pcr_ops);

static u64 direct_pcr_read(void)
static u64 direct_pcr_read(unsigned long reg_num)
{
u64 val;

WARN_ON_ONCE(reg_num != 0);
read_pcr(val);
return val;
}

static void direct_pcr_write(u64 val)
static void direct_pcr_write(unsigned long reg_num, u64 val)
{
WARN_ON_ONCE(reg_num != 0);
write_pcr(val);
}

Expand All @@ -78,10 +80,11 @@ static const struct pcr_ops direct_pcr_ops = {
.write = direct_pcr_write,
};

static void n2_pcr_write(u64 val)
static void n2_pcr_write(unsigned long reg_num, u64 val)
{
unsigned long ret;

WARN_ON_ONCE(reg_num != 0);
if (val & PCR_N2_HTRACE) {
ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val);
if (ret != HV_EOK)
Expand Down
14 changes: 7 additions & 7 deletions trunk/arch/sparc/kernel/perf_event.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ static inline void sparc_pmu_enable_event(struct cpu_hw_events *cpuc, struct hw_
val |= hwc->config;
cpuc->pcr = val;

pcr_ops->write(cpuc->pcr);
pcr_ops->write(0, cpuc->pcr);
}

static inline void sparc_pmu_disable_event(struct cpu_hw_events *cpuc, struct hw_perf_event *hwc, int idx)
Expand All @@ -578,7 +578,7 @@ static inline void sparc_pmu_disable_event(struct cpu_hw_events *cpuc, struct hw
val |= nop;
cpuc->pcr = val;

pcr_ops->write(cpuc->pcr);
pcr_ops->write(0, cpuc->pcr);
}

static u32 read_pmc(int idx)
Expand Down Expand Up @@ -736,7 +736,7 @@ static void sparc_pmu_enable(struct pmu *pmu)
cpuc->pcr = pcr | cpuc->event[0]->hw.config_base;
}

pcr_ops->write(cpuc->pcr);
pcr_ops->write(0, cpuc->pcr);
}

static void sparc_pmu_disable(struct pmu *pmu)
Expand All @@ -755,7 +755,7 @@ static void sparc_pmu_disable(struct pmu *pmu)
sparc_pmu->hv_bit | sparc_pmu->irq_bit);
cpuc->pcr = val;

pcr_ops->write(cpuc->pcr);
pcr_ops->write(0, cpuc->pcr);
}

static int active_event_index(struct cpu_hw_events *cpuc,
Expand Down Expand Up @@ -856,7 +856,7 @@ static void perf_stop_nmi_watchdog(void *unused)
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);

stop_nmi_watchdog(NULL);
cpuc->pcr = pcr_ops->read();
cpuc->pcr = pcr_ops->read(0);
}

void perf_event_grab_pmc(void)
Expand Down Expand Up @@ -1264,7 +1264,7 @@ void perf_event_print_debug(void)

cpu = smp_processor_id();

pcr = pcr_ops->read();
pcr = pcr_ops->read(0);
read_pic(pic);

pr_info("\n");
Expand Down Expand Up @@ -1306,7 +1306,7 @@ static int __kprobes perf_event_nmi_handler(struct notifier_block *self,
* overflow so we don't lose any events.
*/
if (sparc_pmu->irq_bit)
pcr_ops->write(cpuc->pcr);
pcr_ops->write(0, cpuc->pcr);

for (i = 0; i < cpuc->n_events; i++) {
struct perf_event *event = cpuc->event[i];
Expand Down

0 comments on commit ddad391

Please sign in to comment.