Commit 5485592c authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar

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: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andi Kleen <andi.kleen@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Harish Chegondi <harish.chegondi@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/20160222221011.799159968@linutronix.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 7b672d64
...@@ -1023,7 +1023,7 @@ static int __init uncore_pci_init(void) ...@@ -1023,7 +1023,7 @@ static int __init uncore_pci_init(void)
ret = skl_uncore_pci_init(); ret = skl_uncore_pci_init();
break; break;
default: default:
return 0; return -ENODEV;
} }
if (ret) if (ret)
...@@ -1324,7 +1324,7 @@ static int __init uncore_cpu_init(void) ...@@ -1324,7 +1324,7 @@ static int __init uncore_cpu_init(void)
knl_uncore_cpu_init(); knl_uncore_cpu_init();
break; break;
default: default:
return 0; return -ENODEV;
} }
ret = uncore_types_init(uncore_msr_uncores, true); ret = uncore_types_init(uncore_msr_uncores, true);
...@@ -1349,7 +1349,7 @@ static void __init uncore_cpu_setup(void *dummy) ...@@ -1349,7 +1349,7 @@ static void __init uncore_cpu_setup(void *dummy)
/* Lazy to avoid allocation of a few bytes for the normal case */ /* Lazy to avoid allocation of a few bytes for the normal case */
static __initdata DECLARE_BITMAP(packages, MAX_LOCAL_APIC); 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; unsigned int cpu;
...@@ -1360,12 +1360,15 @@ static int __init uncore_cpumask_init(void) ...@@ -1360,12 +1360,15 @@ static int __init uncore_cpumask_init(void)
if (test_and_set_bit(pkg, packages)) if (test_and_set_bit(pkg, packages))
continue; continue;
/* /*
* The first online cpu of each package takes the refcounts * The first online cpu of each package allocates and takes
* for all other online cpus in that package. * 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 (msr) {
if (ret) ret = uncore_cpu_prepare(cpu);
return ret; if (ret)
return ret;
}
uncore_event_init_cpu(cpu); uncore_event_init_cpu(cpu);
smp_call_function_single(cpu, uncore_cpu_setup, NULL, 1); smp_call_function_single(cpu, uncore_cpu_setup, NULL, 1);
} }
...@@ -1375,7 +1378,7 @@ static int __init uncore_cpumask_init(void) ...@@ -1375,7 +1378,7 @@ static int __init uncore_cpumask_init(void)
static int __init intel_uncore_init(void) static int __init intel_uncore_init(void)
{ {
int ret; int pret, cret, ret;
if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
return -ENODEV; return -ENODEV;
...@@ -1385,15 +1388,14 @@ static int __init intel_uncore_init(void) ...@@ -1385,15 +1388,14 @@ static int __init intel_uncore_init(void)
max_packages = topology_max_packages(); max_packages = topology_max_packages();
ret = uncore_pci_init(); pret = uncore_pci_init();
if (ret) cret = uncore_cpu_init();
return ret;
ret = uncore_cpu_init(); if (cret && pret)
if (ret) return -ENODEV;
goto err;
cpu_notifier_register_begin(); cpu_notifier_register_begin();
ret = uncore_cpumask_init(); ret = uncore_cpumask_init(!cret);
if (ret) if (ret)
goto err; goto err;
cpu_notifier_register_done(); cpu_notifier_register_done();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment