UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

sparc64: Make sparc_pmu_{enable,disable}_event() multi-pcr aware. 

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2012-08-17 03:14:01 -07:00
parent 5ab9684135
commit b4f061a4b8
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/sparc/kernel/perf_event.c
View File

@ -623,27 +623,35 @@ static u64 nop_for_index(int idx)
static inline void sparc_pmu_enable_event(struct cpu_hw_events *cpuc, struct hw_perf_event *hwc, int idx) static inline void sparc_pmu_enable_event(struct cpu_hw_events *cpuc, struct hw_perf_event *hwc, int idx)
{ {
u64 val, mask = mask_for_index(idx); u64 val, mask = mask_for_index(idx);
int pcr_index = 0;
val = cpuc->pcr[0]; if (sparc_pmu->num_pcrs > 1)
pcr_index = idx;
val = cpuc->pcr[pcr_index];
val &= ~mask; val &= ~mask;
val |= hwc->config; val |= hwc->config;
cpuc->pcr[0] = val; cpuc->pcr[pcr_index] = val;
pcr_ops->write_pcr(0, cpuc->pcr[0]); pcr_ops->write_pcr(pcr_index, cpuc->pcr[pcr_index]);
} }
static inline void sparc_pmu_disable_event(struct cpu_hw_events *cpuc, struct hw_perf_event *hwc, int idx) static inline void sparc_pmu_disable_event(struct cpu_hw_events *cpuc, struct hw_perf_event *hwc, int idx)
{ {
u64 mask = mask_for_index(idx); u64 mask = mask_for_index(idx);
u64 nop = nop_for_index(idx); u64 nop = nop_for_index(idx);
int pcr_index = 0;
u64 val; u64 val;
val = cpuc->pcr[0]; if (sparc_pmu->num_pcrs > 1)
pcr_index = idx;
val = cpuc->pcr[pcr_index];
val &= ~mask; val &= ~mask;
val |= nop; val |= nop;
cpuc->pcr[0] = val; cpuc->pcr[pcr_index] = val;
pcr_ops->write_pcr(0, cpuc->pcr[0]); pcr_ops->write_pcr(pcr_index, cpuc->pcr[pcr_index]);
} }
static u64 sparc_perf_event_update(struct perf_event *event, static u64 sparc_perf_event_update(struct perf_event *event,