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 2/6] arm64: pmu: add fallback probe table
Date: Tue, 12 Apr 2016 15:21:07 -0500 [thread overview]
Message-ID: <1460492471-15527-3-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>
In preparation for ACPI support, add a pmu_probe_info table to
the arm_pmu_device_probe() call. This table gets used when
probing in the absence of a devicetree node for PMU.
Signed-off-by: Mark Salter <msalter@redhat.com>
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
arch/arm64/kernel/perf_event.c | 10 +++++++++-
include/linux/perf/arm_pmu.h | 3 +++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index f419a7c..8f12eac 100644
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -867,9 +867,17 @@ static const struct of_device_id armv8_pmu_of_device_ids[] = {
{},
};
+static const struct pmu_probe_info armv8_pmu_probe_table[] = {
+ ARMV8_PMU_PART_PROBE(ARM_CPU_PART_CORTEX_A53, armv8_a53_pmu_init),
+ ARMV8_PMU_PART_PROBE(ARM_CPU_PART_CORTEX_A57, armv8_a57_pmu_init),
+ PMU_PROBE(0, 0, armv8_pmuv3_init), /* if all else fails... */
+ { /* sentinel value */ }
+};
+
static int armv8_pmu_device_probe(struct platform_device *pdev)
{
- return arm_pmu_device_probe(pdev, armv8_pmu_of_device_ids, NULL);
+ return arm_pmu_device_probe(pdev, armv8_pmu_of_device_ids,
+ armv8_pmu_probe_table);
}
static struct platform_driver armv8_pmu_driver = {
diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h
index 4196c90..495332f 100644
--- a/include/linux/perf/arm_pmu.h
+++ b/include/linux/perf/arm_pmu.h
@@ -145,6 +145,9 @@ struct pmu_probe_info {
#define XSCALE_PMU_PROBE(_version, _fn) \
PMU_PROBE(ARM_CPU_IMP_INTEL << 24 | _version, ARM_PMU_XSCALE_MASK, _fn)
+#define ARMV8_PMU_PART_PROBE(_part, _fn) \
+ PMU_PROBE((_part) << MIDR_PARTNUM_SHIFT, MIDR_PARTNUM_MASK, _fn)
+
int arm_pmu_device_probe(struct platform_device *pdev,
const struct of_device_id *of_table,
const struct pmu_probe_info *probe_table);
--
2.4.3
next prev parent 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 ` [PATCH 1/6] arm: pmu: Fix non-devicetree probing Jeremy Linton
2016-04-12 20:21 ` Jeremy Linton [this message]
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-3-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).