From patchwork Fri Apr 8 21:57:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 65424 Delivered-To: patch@linaro.org Received: by 10.112.43.237 with SMTP id z13csp299427lbl; Fri, 8 Apr 2016 14:57:40 -0700 (PDT) X-Received: by 10.66.90.136 with SMTP id bw8mr15739924pab.52.1460152659078; Fri, 08 Apr 2016 14:57:39 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ac17si3009104pac.174.2016.04.08.14.57.38; Fri, 08 Apr 2016 14:57:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759137AbcDHV51 (ORCPT + 29 others); Fri, 8 Apr 2016 17:57:27 -0400 Received: from foss.arm.com ([217.140.101.70]:41783 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759110AbcDHV5Z (ORCPT ); Fri, 8 Apr 2016 17:57:25 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9AD103EF; Fri, 8 Apr 2016 14:56:02 -0700 (PDT) Received: from u200856.usa.arm.com (unknown [10.118.28.91]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C050A3F487; Fri, 8 Apr 2016 14:57:13 -0700 (PDT) From: Jeremy Linton 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, Jeremy Linton Subject: [PATCH 2/4] arm64: pmu: add fallback probe table Date: Fri, 8 Apr 2016 16:57:05 -0500 Message-Id: <1460152627-3248-3-git-send-email-jeremy.linton@arm.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1460152627-3248-1-git-send-email-jeremy.linton@arm.com> References: <1460152627-3248-1-git-send-email-jeremy.linton@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Salter 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 Signed-off-by: Jeremy Linton --- arch/arm64/kernel/perf_event.c | 10 +++++++++- include/linux/perf/arm_pmu.h | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) -- 2.4.3 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);