• Bjorn Helgaas's avatar
    Revert "[PATCH] Insert GART region into resource map" · 707d4eef
    Bjorn Helgaas authored
    This reverts commit 56dd669a, which makes the GART visible in
    /proc/iomem.  This fixes a regression: e501b3d8 ("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 e501b3d8, 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: e501b3d8 agp: Support 64-bit APBASE
    Link: https://bugzilla.kernel.org/show_bug.cgi?id=72201Reported-and-tested-by: default avatarJouni Mettälä <jtmettala@gmail.com>
    Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
    707d4eef
aperture_64.c 13.4 KB