summaryrefslogtreecommitdiff
path: root/net/key/af_key.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-03-18 02:32:52 +0400
committerBjorn Helgaas <bhelgaas@google.com>2014-03-20 01:00:17 +0400
commitf2e6027b816df3326d3f40d6ce55539a2f381529 (patch)
tree7fddbed839d1ffa44c1bdb2a8ab4d15914af7e58 /net/key/af_key.c
parent075eb9e35578c23ee2414f87d97d2e5065aa1bc1 (diff)
downloadlinux-f2e6027b816df3326d3f40d6ce55539a2f381529.tar.xz
Revert "[PATCH] Insert GART region into resource map"
This reverts commit 56dd669a138c, which makes the GART visible in /proc/iomem. This fixes a regression: e501b3d87f00 ("agp: Support 64-bit APBASE") exposed an existing problem with a conflict between the GART region and a PCI BAR region. The GART addresses are bus addresses, not CPU addresses, and therefore should not be inserted in iomem_resource. On many machines, the GART region is addressable by the CPU as well as by an AGP master, but CPU addressability is not required by the spec. On some of these machines, the GART is mapped by a PCI BAR, and in that case, the PCI core automatically inserts it into iomem_resource, just as it does for all BARs. Inserting it here means we'll have a conflict if the PCI core later tries to claim the GART region, so let's drop the insertion here. The conflict indirectly causes X failures, as reported by Jouni in the bugzilla below. We detected the conflict even before e501b3d87f00, but after it the AGP code (fix_northbridge()) uses the PCI resource (which is zeroed because of the conflict) instead of reading the BAR again. Conflicts: arch/x86_64/kernel/aperture.c Fixes: e501b3d87f00 agp: Support 64-bit APBASE Link: https://bugzilla.kernel.org/show_bug.cgi?id=72201 Reported-and-tested-by: Jouni Mettälä <jtmettala@gmail.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'net/key/af_key.c')
0 files changed, 0 insertions, 0 deletions