From: Jeremy Linton <jeremy.linton@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: linux-acpi@vger.kernel.org, will.deacon@arm.com, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, catalin.marinas@arm.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, alexander.shishkin@linux.intel.com, mlangsdorf@redhat.com Subject: [PATCH 1/8] arm64: pmu: add fallback probe table Date: Thu, 9 Jun 2016 17:23:26 -0500 [thread overview] Message-ID: <1465511013-10742-2-git-send-email-jeremy.linton@arm.com> (raw) In-Reply-To: <1465511013-10742-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 | 8 +++++++- include/linux/perf/arm_pmu.h | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 838ccf1..917c3e2 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -1044,9 +1044,15 @@ static const struct of_device_id armv8_pmu_of_device_ids[] = { {}, }; +static const struct pmu_probe_info armv8_pmu_probe_table[] = { + 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 d28ac05..7e814fe 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -147,6 +147,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.5.5
WARNING: multiple messages have this Message-ID (diff)
From: jeremy.linton@arm.com (Jeremy Linton) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/8] arm64: pmu: add fallback probe table Date: Thu, 9 Jun 2016 17:23:26 -0500 [thread overview] Message-ID: <1465511013-10742-2-git-send-email-jeremy.linton@arm.com> (raw) In-Reply-To: <1465511013-10742-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 | 8 +++++++- include/linux/perf/arm_pmu.h | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 838ccf1..917c3e2 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -1044,9 +1044,15 @@ static const struct of_device_id armv8_pmu_of_device_ids[] = { {}, }; +static const struct pmu_probe_info armv8_pmu_probe_table[] = { + 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 d28ac05..7e814fe 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -147,6 +147,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.5.5
next prev parent reply other threads:[~2016-06-09 22:23 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-09 22:23 [PATCH 0/8] arm64: pmu: Detect multiple PMU types in an ACPI system Jeremy Linton 2016-06-09 22:23 ` Jeremy Linton 2016-06-09 22:23 ` Jeremy Linton [this message] 2016-06-09 22:23 ` [PATCH 1/8] arm64: pmu: add fallback probe table Jeremy Linton 2016-06-15 10:59 ` Will Deacon 2016-06-15 10:59 ` Will Deacon 2016-06-09 22:23 ` [PATCH 2/8] arm64: pmu: Probe default hw/cache counters Jeremy Linton 2016-06-09 22:23 ` Jeremy Linton 2016-06-15 11:14 ` Will Deacon 2016-06-15 11:14 ` Will Deacon 2016-06-09 22:23 ` [PATCH 3/8] arm64: pmu: Add support for probing with ACPI Jeremy Linton 2016-06-09 22:23 ` Jeremy Linton 2016-06-15 11:33 ` Will Deacon 2016-06-15 11:33 ` Will Deacon 2016-06-15 15:07 ` Jeremy Linton 2016-06-15 15:07 ` Jeremy Linton 2016-06-09 22:23 ` [PATCH 4/8] arm: arm64: Add routine to determine cpuid of other cpus Jeremy Linton 2016-06-09 22:23 ` Jeremy Linton 2016-06-20 16:49 ` Punit Agrawal 2016-06-20 16:49 ` Punit Agrawal 2016-06-09 22:23 ` [PATCH 5/8] arm: arm64: pmu: Assign platform PMU CPU affinity Jeremy Linton 2016-06-09 22:23 ` Jeremy Linton 2016-06-15 13:09 ` Will Deacon 2016-06-15 13:09 ` Will Deacon 2016-06-20 16:40 ` Punit Agrawal 2016-06-20 16:40 ` Punit Agrawal 2016-06-20 16:49 ` Jeremy Linton 2016-06-20 16:49 ` Jeremy Linton 2016-06-20 17:01 ` Punit Agrawal 2016-06-20 17:01 ` Punit Agrawal 2016-06-09 22:23 ` [PATCH 6/8] arm64: pmu: Add routines for detecting differing PMU types in the system Jeremy Linton 2016-06-09 22:23 ` Jeremy Linton 2016-06-09 22:23 ` [PATCH 7/8] arm64: pmu: Enable multiple PMUs in an ACPI system Jeremy Linton 2016-06-09 22:23 ` Jeremy Linton 2016-06-15 13:22 ` Will Deacon 2016-06-15 13:22 ` Will Deacon 2016-06-15 15:21 ` Jeremy Linton 2016-06-15 15:21 ` Jeremy Linton 2016-06-15 15:30 ` Will Deacon 2016-06-15 15:30 ` Will Deacon 2016-06-20 16:37 ` Punit Agrawal 2016-06-20 16:37 ` Punit Agrawal 2016-06-20 21:44 ` Jeremy Linton 2016-06-20 21:44 ` Jeremy Linton 2016-06-21 8:34 ` Punit Agrawal 2016-06-21 8:34 ` Punit Agrawal 2016-06-09 22:23 ` [PATCH 8/8] MAINTAINERS: Tweak ARM PMU maintainers Jeremy Linton 2016-06-09 22:23 ` Jeremy Linton 2016-06-20 16:47 ` [PATCH 0/8] arm64: pmu: Detect multiple PMU types in an ACPI system Punit Agrawal 2016-06-20 16:47 ` Punit Agrawal
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=1465511013-10742-2-git-send-email-jeremy.linton@arm.com \ --to=jeremy.linton@arm.com \ --cc=acme@kernel.org \ --cc=alexander.shishkin@linux.intel.com \ --cc=catalin.marinas@arm.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=mark.rutland@arm.com \ --cc=mingo@redhat.com \ --cc=mlangsdorf@redhat.com \ --cc=peterz@infradead.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.