From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754191AbcB2LJg (ORCPT ); Mon, 29 Feb 2016 06:09:36 -0500 Received: from torg.zytor.com ([198.137.202.12]:53688 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752372AbcB2LJ3 (ORCPT ); Mon, 29 Feb 2016 06:09:29 -0500 Date: Mon, 29 Feb 2016 03:08:27 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: jacob.jun.pan@linux.intel.com, eranian@google.com, ak@linux.intel.com, jolsa@redhat.com, hpa@zytor.com, bp@alien8.de, torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org, andi.kleen@intel.com, kan.liang@intel.com, peterz@infradead.org, harish.chegondi@intel.com, vincent.weaver@maine.edu, linux-kernel@vger.kernel.org, acme@redhat.com Reply-To: bp@alien8.de, hpa@zytor.com, torvalds@linux-foundation.org, eranian@google.com, ak@linux.intel.com, jolsa@redhat.com, jacob.jun.pan@linux.intel.com, linux-kernel@vger.kernel.org, acme@redhat.com, harish.chegondi@intel.com, vincent.weaver@maine.edu, peterz@infradead.org, tglx@linutronix.de, andi.kleen@intel.com, mingo@kernel.org, kan.liang@intel.com In-Reply-To: <20160222221011.799159968@linutronix.de> References: <20160222221011.799159968@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel/uncore: Make PCI and MSR uncore independent Git-Commit-ID: 5485592c17954b2a91fbd12980af596dc666079d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5485592c17954b2a91fbd12980af596dc666079d Gitweb: http://git.kernel.org/tip/5485592c17954b2a91fbd12980af596dc666079d Author: Thomas Gleixner AuthorDate: Mon, 22 Feb 2016 22:19:17 +0000 Committer: Ingo Molnar CommitDate: Mon, 29 Feb 2016 09:35:19 +0100 perf/x86/intel/uncore: Make PCI and MSR uncore independent Andi wanted to do this before, but the patch fell down the cracks. Implement it with the proper error handling. Requested-by: Andi Kleen Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Cc: Andi Kleen Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: Harish Chegondi Cc: Jacob Pan Cc: Jiri Olsa Cc: Kan Liang Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Vince Weaver Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/20160222221011.799159968@linutronix.de Signed-off-by: Ingo Molnar --- arch/x86/events/intel/uncore.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 5ad8e52..7012d18 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -1023,7 +1023,7 @@ static int __init uncore_pci_init(void) ret = skl_uncore_pci_init(); break; default: - return 0; + return -ENODEV; } if (ret) @@ -1324,7 +1324,7 @@ static int __init uncore_cpu_init(void) knl_uncore_cpu_init(); break; default: - return 0; + return -ENODEV; } ret = uncore_types_init(uncore_msr_uncores, true); @@ -1349,7 +1349,7 @@ static void __init uncore_cpu_setup(void *dummy) /* Lazy to avoid allocation of a few bytes for the normal case */ static __initdata DECLARE_BITMAP(packages, MAX_LOCAL_APIC); -static int __init uncore_cpumask_init(void) +static int __init uncore_cpumask_init(bool msr) { unsigned int cpu; @@ -1360,12 +1360,15 @@ static int __init uncore_cpumask_init(void) if (test_and_set_bit(pkg, packages)) continue; /* - * The first online cpu of each package takes the refcounts - * for all other online cpus in that package. + * The first online cpu of each package allocates and takes + * the refcounts for all other online cpus in that package. + * If msrs are not enabled no allocation is required. */ - ret = uncore_cpu_prepare(cpu); - if (ret) - return ret; + if (msr) { + ret = uncore_cpu_prepare(cpu); + if (ret) + return ret; + } uncore_event_init_cpu(cpu); smp_call_function_single(cpu, uncore_cpu_setup, NULL, 1); } @@ -1375,7 +1378,7 @@ static int __init uncore_cpumask_init(void) static int __init intel_uncore_init(void) { - int ret; + int pret, cret, ret; if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) return -ENODEV; @@ -1385,15 +1388,14 @@ static int __init intel_uncore_init(void) max_packages = topology_max_packages(); - ret = uncore_pci_init(); - if (ret) - return ret; - ret = uncore_cpu_init(); - if (ret) - goto err; + pret = uncore_pci_init(); + cret = uncore_cpu_init(); + + if (cret && pret) + return -ENODEV; cpu_notifier_register_begin(); - ret = uncore_cpumask_init(); + ret = uncore_cpumask_init(!cret); if (ret) goto err; cpu_notifier_register_done();