Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b0b8429 authored by Deng-Cheng Zhu's avatar Deng-Cheng Zhu Committed by Ralf Baechle
Browse files

MIPS: perf: Rename 74K event/cache maps in preparation for Aptiv support 



74K/proAptiv share the same event/cache maps. So it's better to change the
names of the existing mipsxx74Kcore_[event|cache]_map.

Signed-off-by: default avatarDeng-Cheng Zhu <dengcheng.zhu@imgtec.com>
Reviewed-by: default avatarMarkos Chandras <Markos.Chandras@imgtec.com>
Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Steven.Hill@imgtec.com
Patchwork: https://patchwork.linux-mips.org/patch/6526/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 823cf3cd

arch/mips/kernel/perf_event_mipsxx.c

+4 −4
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ static const struct mips_perf_event mipsxxcore_event_map 
};



/* 74K core has different branch event code. */

static const struct mips_perf_event mipsxx74Kcore_event_map

static const struct mips_perf_event mipsxxcore_event_map2

				[PERF_COUNT_HW_MAX] = {

	[PERF_COUNT_HW_CPU_CYCLES] = { 0x00, CNTR_EVEN | CNTR_ODD, P },

	[PERF_COUNT_HW_INSTRUCTIONS] = { 0x01, CNTR_EVEN | CNTR_ODD, T },
@@ -931,7 +931,7 @@ static const struct mips_perf_event mipsxxcore_cache_map 
};



/* 74K core has completely different cache event map. */

static const struct mips_perf_event mipsxx74Kcore_cache_map

static const struct mips_perf_event mipsxxcore_cache_map2

				[PERF_COUNT_HW_CACHE_MAX]

				[PERF_COUNT_HW_CACHE_OP_MAX]

				[PERF_COUNT_HW_CACHE_RESULT_MAX] = {
@@ -1577,8 +1577,8 @@ init_hw_perf_events(void) 
		break;

	case CPU_74K:

		mipspmu.name = "mips/74K";

		mipspmu.general_event_map = &mipsxx74Kcore_event_map;

		mipspmu.cache_event_map = &mipsxx74Kcore_cache_map;

		mipspmu.general_event_map = &mipsxxcore_event_map2;

		mipspmu.cache_event_map = &mipsxxcore_cache_map2;

		break;

	case CPU_1004K:

		mipspmu.name = "mips/1004K";