Commit b70cb364 authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman

MIPS: perf: Fix build with CONFIG_CPU_BMIPS5000 enabled

commit 1b1f01b6 upstream.

arch/mips/kernel/perf_event_mipsxx.c: In function 'mipsxx_pmu_enable_event':
arch/mips/kernel/perf_event_mipsxx.c:326:21: error: unused variable 'event' [-Werror=unused-variable]
  struct perf_event *event = container_of(evt, struct perf_event, hw);
                     ^~~~~

Fix this by making use of IS_ENABLED() to simplify the code and avoid
unnecessary ifdefery.

Fixes: 84002c88 ("MIPS: perf: Fix perf with MT counting other threads")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: linux-mips@linux-mips.org
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: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@vger.kernel.org
Cc: stable@vger.kernel.org # v4.18+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36dcf6ef
...@@ -64,17 +64,11 @@ struct mips_perf_event { ...@@ -64,17 +64,11 @@ struct mips_perf_event {
#define CNTR_EVEN 0x55555555 #define CNTR_EVEN 0x55555555
#define CNTR_ODD 0xaaaaaaaa #define CNTR_ODD 0xaaaaaaaa
#define CNTR_ALL 0xffffffff #define CNTR_ALL 0xffffffff
#ifdef CONFIG_MIPS_MT_SMP
enum { enum {
T = 0, T = 0,
V = 1, V = 1,
P = 2, P = 2,
} range; } range;
#else
#define T
#define V
#define P
#endif
}; };
static struct mips_perf_event raw_event; static struct mips_perf_event raw_event;
...@@ -325,9 +319,7 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx) ...@@ -325,9 +319,7 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx)
{ {
struct perf_event *event = container_of(evt, struct perf_event, hw); struct perf_event *event = container_of(evt, struct perf_event, hw);
struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events); struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
#ifdef CONFIG_MIPS_MT_SMP
unsigned int range = evt->event_base >> 24; unsigned int range = evt->event_base >> 24;
#endif /* CONFIG_MIPS_MT_SMP */
WARN_ON(idx < 0 || idx >= mipspmu.num_counters); WARN_ON(idx < 0 || idx >= mipspmu.num_counters);
...@@ -336,21 +328,15 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx) ...@@ -336,21 +328,15 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx)
/* Make sure interrupt enabled. */ /* Make sure interrupt enabled. */
MIPS_PERFCTRL_IE; MIPS_PERFCTRL_IE;
#ifdef CONFIG_CPU_BMIPS5000 if (IS_ENABLED(CONFIG_CPU_BMIPS5000)) {
{
/* enable the counter for the calling thread */ /* enable the counter for the calling thread */
cpuc->saved_ctrl[idx] |= cpuc->saved_ctrl[idx] |=
(1 << (12 + vpe_id())) | BRCM_PERFCTRL_TC; (1 << (12 + vpe_id())) | BRCM_PERFCTRL_TC;
} } else if (IS_ENABLED(CONFIG_MIPS_MT_SMP) && range > V) {
#else
#ifdef CONFIG_MIPS_MT_SMP
if (range > V) {
/* The counter is processor wide. Set it up to count all TCs. */ /* The counter is processor wide. Set it up to count all TCs. */
pr_debug("Enabling perf counter for all TCs\n"); pr_debug("Enabling perf counter for all TCs\n");
cpuc->saved_ctrl[idx] |= M_TC_EN_ALL; cpuc->saved_ctrl[idx] |= M_TC_EN_ALL;
} else } else {
#endif /* CONFIG_MIPS_MT_SMP */
{
unsigned int cpu, ctrl; unsigned int cpu, ctrl;
/* /*
...@@ -365,7 +351,6 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx) ...@@ -365,7 +351,6 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx)
cpuc->saved_ctrl[idx] |= ctrl; cpuc->saved_ctrl[idx] |= ctrl;
pr_debug("Enabling perf counter for CPU%d\n", cpu); pr_debug("Enabling perf counter for CPU%d\n", cpu);
} }
#endif /* CONFIG_CPU_BMIPS5000 */
/* /*
* We do not actually let the counter run. Leave it until start(). * We do not actually let the counter run. Leave it until start().
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment