From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753964AbbFOF6F (ORCPT ); Mon, 15 Jun 2015 01:58:05 -0400 Received: from mga03.intel.com ([134.134.136.65]:54213 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751238AbbFOF54 (ORCPT ); Mon, 15 Jun 2015 01:57:56 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,617,1427785200"; d="scan'208";a="587864641" From: Andi Kleen To: peterz@infradead.org Cc: eranian@google.com, linux-kernel@vger.kernel.org, kan.liang@intel.com, Andi Kleen Subject: [PATCH 3/3] x86, perf, uncore: Don't make MSR uncore depend on PCI uncore Date: Sun, 14 Jun 2015 22:57:42 -0700 Message-Id: <1434347862-28490-3-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1434347862-28490-1-git-send-email-andi@firstfloor.org> References: <1434347862-28490-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Several sytems, such as my laptop, don't expose the PCI devices for the PCI uncore measurements. But the MSRs for the CBOX and ARB uncores are always available. Currently the init code doesn't initialize the MSR uncores when the PCI uncore registration fails. Stop it from doing that and always try to register the MSR uncores. This makes the pci uncore exit function unused. We'll need it later when the uncore becomes modular, so instead of removing it I just marked it with module_exit right now (which discards it) Signed-off-by: Andi Kleen --- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c index b57a09d..6359309 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c @@ -952,6 +952,8 @@ static void __init uncore_pci_exit(void) uncore_types_exit(uncore_pci_uncores); } } +module_exit(uncore_pci_exit); +/* XXX: need exit code for MSR uncores too */ /* CPU hot plug/unplug are serialized by cpu_add_remove_lock mutex */ static LIST_HEAD(boxes_to_free); @@ -1287,27 +1289,17 @@ static void __init uncore_cpumask_init(void) static int __init intel_uncore_init(void) { - int ret; - if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) return -ENODEV; if (cpu_has_hypervisor) return -ENODEV; - ret = uncore_pci_init(); - if (ret) - goto fail; - ret = uncore_cpu_init(); - if (ret) { - uncore_pci_exit(); - goto fail; - } + uncore_pci_init(); + uncore_cpu_init(); uncore_cpumask_init(); uncore_pmus_register(); return 0; -fail: - return ret; } device_initcall(intel_uncore_init); -- 2.4.2