linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeremy Linton <jeremy.linton@arm.com>
To: linux-kernel@vger.kernel.org
Cc: will.deacon@arm.com, mark.rutland@arm.com, peterz@infradead.org,
	mingo@redhat.com, catalin.marinas@arm.com, msalter@redhat.com,
	timur@codeaurora.org, nleeder@codeaurora.org,
	agustinv@codeaurora.org, sfr@canb.auug.org.au,
	jan.glauber@gmail.com, Jeremy Linton <jeremy.linton@arm.com>
Subject: [PATCH 1/6] arm: pmu: Fix non-devicetree probing
Date: Tue, 12 Apr 2016 15:21:06 -0500	[thread overview]
Message-ID: <1460492471-15527-2-git-send-email-jeremy.linton@arm.com> (raw)
In-Reply-To: <1460492471-15527-1-git-send-email-jeremy.linton@arm.com>

From: Mark Salter <msalter@redhat.com>

There is a problem in the non-devicetree PMU probing where some
probe functions may get the number of supported events through
smp_call_function_any() using the arm_pmu supported_cpus mask.
But at the time the probe function is called, the supported_cpus
mask is empty so the call fails. This patch makes sure the mask
is set before calling the init function rather than after.

Signed-off-by: Mark Salter <msalter@redhat.com>
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
 drivers/perf/arm_pmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 32346b5..49fa845 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -997,8 +997,8 @@ int arm_pmu_device_probe(struct platform_device *pdev,
 		if (!ret)
 			ret = init_fn(pmu);
 	} else {
-		ret = probe_current_pmu(pmu, probe_table);
 		cpumask_setall(&pmu->supported_cpus);
+		ret = probe_current_pmu(pmu, probe_table);
 	}
 
 	if (ret) {
-- 
2.4.3

  reply	other threads:[~2016-04-12 20:21 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-12 20:21 [PATCH 0/6 v4] arm64/perf: Add ACPI support Jeremy Linton
2016-04-12 20:21 ` Jeremy Linton [this message]
2016-04-12 20:21 ` [PATCH 2/6] arm64: pmu: add fallback probe table Jeremy Linton
2016-04-12 20:21 ` [PATCH 3/6] arm64: pmu: Add support for probing with ACPI Jeremy Linton
2016-04-12 20:21 ` [PATCH 4/6] arm: arm64: Add routine to determine cpuid of other cpus Jeremy Linton
2016-04-12 20:21 ` [PATCH 5/6] arm64: pmu: Add ACPI support for A72 and ThunderX Jeremy Linton
2016-04-12 20:21 ` [PATCH 6/6] arm64: pmu: Detect multiple PMU types in an ACPI system Jeremy Linton
2016-04-15  6:47 ` [PATCH 0/6 v4] arm64/perf: Add ACPI support Jan Glauber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1460492471-15527-2-git-send-email-jeremy.linton@arm.com \
    --to=jeremy.linton@arm.com \
    --cc=agustinv@codeaurora.org \
    --cc=catalin.marinas@arm.com \
    --cc=jan.glauber@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mingo@redhat.com \
    --cc=msalter@redhat.com \
    --cc=nleeder@codeaurora.org \
    --cc=peterz@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --cc=timur@codeaurora.org \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).