Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c1cfacc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v3.14-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI resource management fix from Bjorn Helgaas:
 "This is a fix for an AGP regression exposed by e501b3d8 ("agp:
  Support 64-bit APBASE"), which we merged in v3.14-rc1.

  We've warned about the conflict between the GART and PCI resources and
  cleared out the PCI resource for a long time, but after e501b3d8,
  we still *use* that cleared-out PCI resource.  I think the GART
  resource is incorrect, so this patch removes it"

* tag 'pci-v3.14-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  Revert "[PATCH] Insert GART region into resource map"
parents 7c389538 707d4eef

arch/x86/kernel/aperture_64.c

+1 −19
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/pci_ids.h>

#include <linux/pci.h>

#include <linux/bitops.h>

#include <linux/ioport.h>

#include <linux/suspend.h>

#include <asm/e820.h>

#include <asm/io.h>
@@ -54,18 +53,6 @@ int fallback_aper_force __initdata; 


int fix_aperture __initdata = 1;



static struct resource gart_resource = {

	.name	= "GART",

	.flags	= IORESOURCE_MEM,

};



static void __init insert_aperture_resource(u32 aper_base, u32 aper_size)

{

	gart_resource.start = aper_base;

	gart_resource.end = aper_base + aper_size - 1;

	insert_resource(&iomem_resource, &gart_resource);

}



/* This code runs before the PCI subsystem is initialized, so just

   access the northbridge directly. */
@@ -96,7 +83,6 @@ static u32 __init allocate_aperture(void) 
	memblock_reserve(addr, aper_size);

	printk(KERN_INFO "Mapping aperture over %d KB of RAM @ %lx\n",

			aper_size >> 10, addr);

	insert_aperture_resource((u32)addr, aper_size);

	register_nosave_region(addr >> PAGE_SHIFT,

			       (addr+aper_size) >> PAGE_SHIFT);
@@ -444,12 +430,8 @@ int __init gart_iommu_hole_init(void) 


out:

	if (!fix && !fallback_aper_force) {

		if (last_aper_base) {

			unsigned long n = (32 * 1024 * 1024) << last_aper_order;



			insert_aperture_resource((u32)last_aper_base, n);

		if (last_aper_base)

			return 1;

		}

		return 0;

	}