[kernel/f15] Reduce severity of host bridge window conflict warnings (rhbz#729652)

[Chuck Ebbert]

commit fbbfcd6a2793155d395a6cfe86084b1f1b9bbf8b
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Thu Aug 25 20:08:39 2011 -0400

    Reduce severity of host bridge window conflict warnings (rhbz#729652)

 kernel.spec                                        |    8 ++++
 ...y-of-host-bridge-window-conflict-warnings.patch |   40 ++++++++++++++++++++
 2 files changed, 48 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 0e11262..0c46c89 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -595,6 +595,8 @@ Patch470: die-floppy-die.patch
 
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
+# from 3.1
+Patch540: x86-pci-reduce-severity-of-host-bridge-window-conflict-warnings.patch
 
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
 
@@ -1154,6 +1156,9 @@ ApplyPatch linux-2.6-silence-noise.patch
 # Make fbcon not show the penguins with 'quiet'
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
 
+# Get rid of useless bridge window conflict warnings
+ApplyPatch x86-pci-reduce-severity-of-host-bridge-window-conflict-warnings.patch
+
 # Changes to upstream defaults.
 
 
@@ -1839,6 +1844,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 25 2011 Chuck Ebbert <cebbert at redhat.com>
+- Reduce severity of host bridge window conflict warnings (rhbz#729652)
+
 * Thu Aug 25 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.40.3-2
 - Add patches queued for 3.0.4
 - Comment out xen-blkfront-name-adjust.patch, now queued for -stable
diff --git a/x86-pci-reduce-severity-of-host-bridge-window-conflict-warnings.patch b/x86-pci-reduce-severity-of-host-bridge-window-conflict-warnings.patch
new file mode 100644
index 0000000..5db2f00
--- /dev/null
+++ b/x86-pci-reduce-severity-of-host-bridge-window-conflict-warnings.patch
@@ -0,0 +1,40 @@
+From: Bjorn Helgaas <bhelgaas at google.com>
+Date: Sat, 2 Jul 2011 16:47:12 +0000 (-0600)
+Subject: x86/PCI: reduce severity of host bridge window conflict warnings
+X-Git-Tag: v3.1-rc1~122^2~13
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=43d786ed4df4c54cb8802a523748a7d78130a2cb
+
+x86/PCI: reduce severity of host bridge window conflict warnings
+
+Host bridge windows are top-level resources, so if we find a host bridge
+window conflict, it's probably with a hard-coded legacy reservation.
+Moving host bridge windows is theoretically possible, but we don't support
+it; we just ignore windows with conflicts, and it's not worth making this
+a user-visible error.
+
+Reported-and-tested-by: Jools Wills <jools at oxfordinspire.co.uk>
+References: https://bugzilla.kernel.org/show_bug.cgi?id=38522
+Reported-by: Das <dasfox at gmail.com>
+References: https://bugzilla.kernel.org/show_bug.cgi?id=16497
+Signed-off-by: Bjorn Helgaas <bhelgaas at google.com>
+Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+---
+
+diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
+index 68c3c13..ae3cb23 100644
+--- a/arch/x86/pci/acpi.c
++++ b/arch/x86/pci/acpi.c
+@@ -246,10 +246,9 @@ static void add_resources(struct pci_root_info *info)
+ 
+ 		conflict = insert_resource_conflict(root, res);
+ 		if (conflict)
+-			dev_err(&info->bridge->dev,
+-				"address space collision: host bridge window %pR "
+-				"conflicts with %s %pR\n",
+-				res, conflict->name, conflict);
++			dev_info(&info->bridge->dev,
++				 "ignoring host bridge window %pR (conflicts with %s %pR)\n",
++				 res, conflict->name, conflict);
+ 		else
+ 			pci_bus_add_resource(info->bus, res, 0);
+ 	}