From 90a76c959231aee6550d421dbf7f69a74f5a9c90 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Tue, 20 Aug 2013 14:42:48 +0200 Subject: [PATCH] Enable performance counter for everything beyond Armv7 --- kernel/fiasco/src/kern/arm/cpu-arm.cpp | 1 + kernel/fiasco/src/kern/arm/perf_cnt-arm.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/fiasco/src/kern/arm/cpu-arm.cpp b/kernel/fiasco/src/kern/arm/cpu-arm.cpp index dd222ba3..622b2494 100644 --- a/kernel/fiasco/src/kern/arm/cpu-arm.cpp +++ b/kernel/fiasco/src/kern/arm/cpu-arm.cpp @@ -40,6 +40,7 @@ public: Copro_dbg_model_v6 = 2, Copro_dbg_model_v6_1 = 3, Copro_dbg_model_v7 = 4, + Copro_dbg_model_v7_1 = 5, }; unsigned copro_dbg_model() const { return _cpu_id._dfr0 & 0xf; } diff --git a/kernel/fiasco/src/kern/arm/perf_cnt-arm.cpp b/kernel/fiasco/src/kern/arm/perf_cnt-arm.cpp index 55afdef2..0d926879 100644 --- a/kernel/fiasco/src/kern/arm/perf_cnt-arm.cpp +++ b/kernel/fiasco/src/kern/arm/perf_cnt-arm.cpp @@ -261,6 +261,7 @@ Perf_cnt::init_cpu() //set_event_type(0, EVENT_EXTMEM_TRANSFER_READ); //set_event_type(1, EVENT_EXTMEM_TRANSFER_WRITE); + #if 0 set_event_type(3, EVENT_EXTMEM_TRANSFER_READ); set_event_type(4, EVENT_LINE_MIGRATION); @@ -296,7 +297,8 @@ int Perf_cnt::_nr_counters; PRIVATE static bool Perf_cnt::is_avail() -{ return Cpu::boot_cpu()->copro_dbg_model() == Cpu::Copro_dbg_model_v7; } +{ return Cpu::boot_cpu()->copro_dbg_model() == Cpu::Copro_dbg_model_v7 || + Cpu::boot_cpu()->copro_dbg_model() == Cpu::Copro_dbg_model_v7_1; } PRIVATE static void