From 2ddbf3ac07cba2285f6d45d8ff9e3b32bb7bb432 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Thu, 25 Apr 2013 19:28:23 +0000 Subject: [PATCH] --- yaml --- r: 370813 b: refs/heads/master c: 7a7868326d77416018e8f3b4c4697a3c57444549 h: refs/heads/master i: 370811: 1da581209759a95593c58e44cd1dde6310c9cbf7 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/perf_event_server.h | 1 + trunk/arch/powerpc/perf/core-book3s.c | 3 ++- trunk/arch/powerpc/perf/power5+-pmu.c | 2 +- trunk/arch/powerpc/perf/power5-pmu.c | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cf3154dd4e93..9abd50b6a9e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 240686c1368775b5dc80aae863301189b25f9bfa +refs/heads/master: 7a7868326d77416018e8f3b4c4697a3c57444549 diff --git a/trunk/arch/powerpc/include/asm/perf_event_server.h b/trunk/arch/powerpc/include/asm/perf_event_server.h index d0aec72722e9..7074aeccb9f9 100644 --- a/trunk/arch/powerpc/include/asm/perf_event_server.h +++ b/trunk/arch/powerpc/include/asm/perf_event_server.h @@ -52,6 +52,7 @@ struct power_pmu { #define PPMU_NO_SIPR 0x00000004 /* no SIPR/HV in MMCRA at all */ #define PPMU_NO_CONT_SAMPLING 0x00000008 /* no continuous sampling */ #define PPMU_SIAR_VALID 0x00000010 /* Processor has SIAR Valid bit */ +#define PPMU_HAS_SSLOT 0x00000020 /* Has sampled slot in MMCRA */ /* * Values for flags to get_alternatives() diff --git a/trunk/arch/powerpc/perf/core-book3s.c b/trunk/arch/powerpc/perf/core-book3s.c index 65362e98eb26..eb644806f00e 100644 --- a/trunk/arch/powerpc/perf/core-book3s.c +++ b/trunk/arch/powerpc/perf/core-book3s.c @@ -98,11 +98,12 @@ static inline unsigned long perf_ip_adjust(struct pt_regs *regs) { unsigned long mmcra = regs->dsisr; - if ((mmcra & MMCRA_SAMPLE_ENABLE) && !(ppmu->flags & PPMU_ALT_SIPR)) { + if ((ppmu->flags & PPMU_HAS_SSLOT) && (mmcra & MMCRA_SAMPLE_ENABLE)) { unsigned long slot = (mmcra & MMCRA_SLOT) >> MMCRA_SLOT_SHIFT; if (slot > 1) return 4 * (slot - 1); } + return 0; } diff --git a/trunk/arch/powerpc/perf/power5+-pmu.c b/trunk/arch/powerpc/perf/power5+-pmu.c index a8757baa28f3..b03b6dc0172d 100644 --- a/trunk/arch/powerpc/perf/power5+-pmu.c +++ b/trunk/arch/powerpc/perf/power5+-pmu.c @@ -671,7 +671,7 @@ static struct power_pmu power5p_pmu = { .get_alternatives = power5p_get_alternatives, .disable_pmc = power5p_disable_pmc, .limited_pmc_event = power5p_limited_pmc_event, - .flags = PPMU_LIMITED_PMC5_6, + .flags = PPMU_LIMITED_PMC5_6 | PPMU_HAS_SSLOT, .n_generic = ARRAY_SIZE(power5p_generic_events), .generic_events = power5p_generic_events, .cache_events = &power5p_cache_events, diff --git a/trunk/arch/powerpc/perf/power5-pmu.c b/trunk/arch/powerpc/perf/power5-pmu.c index e7f06eb7a861..1e8ce423c3af 100644 --- a/trunk/arch/powerpc/perf/power5-pmu.c +++ b/trunk/arch/powerpc/perf/power5-pmu.c @@ -615,6 +615,7 @@ static struct power_pmu power5_pmu = { .n_generic = ARRAY_SIZE(power5_generic_events), .generic_events = power5_generic_events, .cache_events = &power5_cache_events, + .flags = PPMU_HAS_SSLOT, }; static int __init init_power5_pmu(void)