aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/perf_event_mipsxx.c
diff options
context:
space:
mode:
authorSteven J. Hill <Steven.Hill@imgtec.com>2014-01-17 16:03:50 -0500
committerRalf Baechle <ralf@linux-mips.org>2014-03-06 15:25:21 -0500
commit442e14a2c55e55f208bf87e3686396b4ff17ebf6 (patch)
tree9370c3907bb6b07027a95181d2e5ee3961641ec3 /arch/mips/kernel/perf_event_mipsxx.c
parent02dc6bfb080e8205aacea5c4b4dd6a9bd4c9406e (diff)
MIPS: Add 1074K CPU support explicitly.
The 1074K is a multiprocessing coherent processing system (CPS) based on modified 74K cores. This patch makes the 1074K an actual unique CPU type, instead of a 74K derivative, which it is not. Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com> Reviewed-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6389/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/perf_event_mipsxx.c')
-rw-r--r--arch/mips/kernel/perf_event_mipsxx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
index 24cdf64789c3..17594b81a5d2 100644
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@ -1442,6 +1442,7 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)
1442#endif 1442#endif
1443 break; 1443 break;
1444 case CPU_74K: 1444 case CPU_74K:
1445 case CPU_1074K:
1445 if (IS_BOTH_COUNTERS_74K_EVENT(base_id)) 1446 if (IS_BOTH_COUNTERS_74K_EVENT(base_id))
1446 raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD; 1447 raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;
1447 else 1448 else
@@ -1584,6 +1585,11 @@ init_hw_perf_events(void)
1584 mipspmu.general_event_map = &mipsxxcore_event_map; 1585 mipspmu.general_event_map = &mipsxxcore_event_map;
1585 mipspmu.cache_event_map = &mipsxxcore_cache_map; 1586 mipspmu.cache_event_map = &mipsxxcore_cache_map;
1586 break; 1587 break;
1588 case CPU_1074K:
1589 mipspmu.name = "mips/1074K";
1590 mipspmu.general_event_map = &mipsxxcore_event_map;
1591 mipspmu.cache_event_map = &mipsxxcore_cache_map;
1592 break;
1587 case CPU_LOONGSON1: 1593 case CPU_LOONGSON1:
1588 mipspmu.name = "mips/loongson1"; 1594 mipspmu.name = "mips/loongson1";
1589 mipspmu.general_event_map = &mipsxxcore_event_map; 1595 mipspmu.general_event_map = &mipsxxcore_event_map;