From patchwork Tue Apr 12 20:21:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 65657 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2125084qge; Tue, 12 Apr 2016 13:21:58 -0700 (PDT) X-Received: by 10.98.75.147 with SMTP id d19mr7213552pfj.29.1460492513681; Tue, 12 Apr 2016 13:21:53 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hs5si253995pac.157.2016.04.12.13.21.53; Tue, 12 Apr 2016 13:21:53 -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 S966144AbcDLUVr (ORCPT + 29 others); Tue, 12 Apr 2016 16:21:47 -0400 Received: from foss.arm.com ([217.140.101.70]:58131 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933155AbcDLUVp (ORCPT ); Tue, 12 Apr 2016 16:21:45 -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 8A8B83A; Tue, 12 Apr 2016 13:20:21 -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 5AD023F25F; Tue, 12 Apr 2016 13:21:34 -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, jan.glauber@gmail.com, Jeremy Linton Subject: [PATCH 1/6] arm: pmu: Fix non-devicetree probing Date: Tue, 12 Apr 2016 15:21:06 -0500 Message-Id: <1460492471-15527-2-git-send-email-jeremy.linton@arm.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1460492471-15527-1-git-send-email-jeremy.linton@arm.com> References: <1460492471-15527-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 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 Signed-off-by: Jeremy Linton --- drivers/perf/arm_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.4.3 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) {