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

Unverified Commit 800fb712 authored by Matt Redfearn's avatar Matt Redfearn Committed by James Hogan
Browse files

MIPS: perf: More robustly probe for the presence of per-tc counters 



The presence of per TC performance counters is now detected by
cpu-probe.c and indicated by MIPS_CPU_MT_PER_TC_PERF_COUNTERS in
cpu_data. Switch detection of the feature to use this new flag rather
than blindly testing the implementation specific config7 register with a
magic number.

Signed-off-by: default avatarMatt Redfearn <matt.redfearn@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Maciej W. Rozycki <macro@mips.com>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Robert Richter <rric@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: oprofile-list@lists.sf.net
Patchwork: https://patchwork.linux-mips.org/patch/19142/


Signed-off-by: default avatarJames Hogan <jhogan@kernel.org>
parent 8270ab48

arch/mips/include/asm/cpu-features.h

+7 −0
Original line number Diff line number Diff line
@@ -535,6 +535,13 @@ 
# define cpu_has_shared_ftlb_entries 0

#endif



#ifdef CONFIG_MIPS_MT_SMP

# define cpu_has_mipsmt_pertccounters \

	(cpu_data[0].options & MIPS_CPU_MT_PER_TC_PERF_COUNTERS)

#else

# define cpu_has_mipsmt_pertccounters 0

#endif /* CONFIG_MIPS_MT_SMP */



/*

 * Guest capabilities

 */

arch/mips/kernel/perf_event_mipsxx.c

+0 −3
Original line number Diff line number Diff line
@@ -129,8 +129,6 @@ static struct mips_pmu mipspmu; 




#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS

static int cpu_has_mipsmt_pertccounters;



static DEFINE_RWLOCK(pmuint_rwlock);



#if defined(CONFIG_CPU_BMIPS5000)
@@ -1723,7 +1721,6 @@ init_hw_perf_events(void) 
	}



#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS

	cpu_has_mipsmt_pertccounters = read_c0_config7() & (1<<19);

	if (!cpu_has_mipsmt_pertccounters)

		counters = counters_total_to_per_cpu(counters);

#endif

arch/mips/oprofile/op_model_mipsxx.c

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ static int perfcount_irq; 
#endif



#ifdef CONFIG_MIPS_MT_SMP

static int cpu_has_mipsmt_pertccounters;

#define WHAT		(MIPS_PERFCTRL_MT_EN_VPE | \

			 M_PERFCTL_VPEID(cpu_vpe_id(&current_cpu_data)))

#define vpe_id()	(cpu_has_mipsmt_pertccounters ? \
@@ -326,7 +325,6 @@ static int __init mipsxx_init(void) 
	}



#ifdef CONFIG_MIPS_MT_SMP

	cpu_has_mipsmt_pertccounters = read_c0_config7() & (1<<19);

	if (!cpu_has_mipsmt_pertccounters)

		counters = counters_total_to_per_cpu(counters);

#endif