|
@@ -28,9 +28,12 @@
|
|
|
static DEFINE_PER_CPU(struct arm_pmu *, cpu_armpmu);
|
|
|
static DEFINE_PER_CPU(int, cpu_irq);
|
|
|
|
|
|
-static inline u64 arm_pmu_max_period(void)
|
|
|
+static inline u64 arm_pmu_event_max_period(struct perf_event *event)
|
|
|
{
|
|
|
- return (1ULL << 32) - 1;
|
|
|
+ if (event->hw.flags & ARMPMU_EVT_64BIT)
|
|
|
+ return GENMASK_ULL(63, 0);
|
|
|
+ else
|
|
|
+ return GENMASK_ULL(31, 0);
|
|
|
}
|
|
|
|
|
|
static int
|
|
@@ -122,7 +125,7 @@ int armpmu_event_set_period(struct perf_event *event)
|
|
|
u64 max_period;
|
|
|
int ret = 0;
|
|
|
|
|
|
- max_period = arm_pmu_max_period();
|
|
|
+ max_period = arm_pmu_event_max_period(event);
|
|
|
if (unlikely(left <= -period)) {
|
|
|
left = period;
|
|
|
local64_set(&hwc->period_left, left);
|
|
@@ -148,7 +151,7 @@ int armpmu_event_set_period(struct perf_event *event)
|
|
|
|
|
|
local64_set(&hwc->prev_count, (u64)-left);
|
|
|
|
|
|
- armpmu->write_counter(event, (u64)(-left) & 0xffffffff);
|
|
|
+ armpmu->write_counter(event, (u64)(-left) & max_period);
|
|
|
|
|
|
perf_event_update_userpage(event);
|
|
|
|
|
@@ -160,7 +163,7 @@ u64 armpmu_event_update(struct perf_event *event)
|
|
|
struct arm_pmu *armpmu = to_arm_pmu(event->pmu);
|
|
|
struct hw_perf_event *hwc = &event->hw;
|
|
|
u64 delta, prev_raw_count, new_raw_count;
|
|
|
- u64 max_period = arm_pmu_max_period();
|
|
|
+ u64 max_period = arm_pmu_event_max_period(event);
|
|
|
|
|
|
again:
|
|
|
prev_raw_count = local64_read(&hwc->prev_count);
|
|
@@ -368,6 +371,7 @@ __hw_perf_event_init(struct perf_event *event)
|
|
|
struct hw_perf_event *hwc = &event->hw;
|
|
|
int mapping;
|
|
|
|
|
|
+ hwc->flags = 0;
|
|
|
mapping = armpmu->map_event(event);
|
|
|
|
|
|
if (mapping < 0) {
|
|
@@ -410,7 +414,7 @@ __hw_perf_event_init(struct perf_event *event)
|
|
|
* is far less likely to overtake the previous one unless
|
|
|
* you have some serious IRQ latency issues.
|
|
|
*/
|
|
|
- hwc->sample_period = arm_pmu_max_period() >> 1;
|
|
|
+ hwc->sample_period = arm_pmu_event_max_period(event) >> 1;
|
|
|
hwc->last_period = hwc->sample_period;
|
|
|
local64_set(&hwc->period_left, hwc->sample_period);
|
|
|
}
|