Skip to contentSkip to conversation

Patch "perf/x86/intel/uncore: Remove WARN_ON_ONCE in uncore_pci_probe" has been added to the 4.6-stable tree

PATCH [email protected] 1 participant 1 message May 29, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

perf/x86/intel/uncore: Remove WARN_ON_ONCE in uncore_pci_probe

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
perf-x86-intel-uncore-remove-warn_on_once-in-uncore_pci_probe.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From ef3f00a4d38e01ec0e7ad1b1c8edc2f5667aaa32 Mon Sep 17 00:00:00 2001

From: Jiri Olsa <[email protected]>
Date: Wed, 18 May 2016 08:16:10 +0200
Subject: perf/x86/intel/uncore: Remove WARN_ON_ONCE in uncore_pci_probe

From: Jiri Olsa <[email protected]>

commit ef3f00a4d38e01ec0e7ad1b1c8edc2f5667aaa32 upstream.

When booting with nr_cpus=1, uncore_pci_probe tries to init the PCI/uncore also for the other packages and fails with warning when they are not found.

The warning is bogus because it's correct to fail here for packages which are not initialized. Remove it and return silently.

Fixes cf6d445f6897 "perf/x86/uncore: Track packages, not per CPU data"
Cc Peter Zijlstra <[email protected]>
---
 arch/x86/events/intel/uncore.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/uncore.c +1 -1
@@ -888,7 +888,7 @@ static int uncore_pci_probe(struct pci_d
 		return -ENODEV;
 
 	pkg = topology_phys_to_logical_pkg(phys_id);
-	if (WARN_ON_ONCE(pkg < 0))
+	if (pkg < 0)
 		return -EINVAL;
 
 	if (UNCORE_PCI_DEV_TYPE(id->driver_data) == UNCORE_EXTRA_PCI_DEV) {

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/perf-x86-intel-uncore-remove-warn_on_once-in-uncore_pci_probe.patch