rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Chuck Ebbert 2011-08-25 20:08:39 -04:00
parent 802d512561
commit fbbfcd6a27
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel.spec
View File

@ -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@redhat.com>
- Reduce severity of host bridge window conflict warnings (rhbz#729652)
* Thu Aug 25 2011 Chuck Ebbert <cebbert@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

40
x86-pci-reduce-severity-of-host-bridge-window-conflict-warnings.patch Normal file
View File

@ -0,0 +1,40 @@
From: Bjorn Helgaas <bhelgaas@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@oxfordinspire.co.uk>
References: https://bugzilla.kernel.org/show_bug.cgi?id=38522
Reported-by: Das <dasfox@gmail.com>
References: https://bugzilla.kernel.org/show_bug.cgi?id=16497
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Jesse Barnes <jbarnes@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);
}