Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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 e501b3d87f00 ("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 e501b3d87f00,
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"
+1
-19
+1
-19
arch/x86/kernel/aperture_64.c
+1
-19
arch/x86/kernel/aperture_64.c
···
18
18
#include <linux/pci_ids.h>
19
19
#include <linux/pci.h>
20
20
#include <linux/bitops.h>
21
-
#include <linux/ioport.h>
22
21
#include <linux/suspend.h>
23
22
#include <asm/e820.h>
24
23
#include <asm/io.h>
···
53
54
54
55
int fix_aperture __initdata = 1;
55
56
56
-
static struct resource gart_resource = {
57
-
.name = "GART",
58
-
.flags = IORESOURCE_MEM,
59
-
};
60
-
61
-
static void __init insert_aperture_resource(u32 aper_base, u32 aper_size)
62
-
{
63
-
gart_resource.start = aper_base;
64
-
gart_resource.end = aper_base + aper_size - 1;
65
-
insert_resource(&iomem_resource, &gart_resource);
66
-
}
67
-
68
57
/* This code runs before the PCI subsystem is initialized, so just
69
58
access the northbridge directly. */
70
59
···
83
96
memblock_reserve(addr, aper_size);
84
97
printk(KERN_INFO "Mapping aperture over %d KB of RAM @ %lx\n",
85
98
aper_size >> 10, addr);
86
-
insert_aperture_resource((u32)addr, aper_size);
87
99
register_nosave_region(addr >> PAGE_SHIFT,
88
100
(addr+aper_size) >> PAGE_SHIFT);
89
101
···
430
444
431
445
out:
432
446
if (!fix && !fallback_aper_force) {
433
-
if (last_aper_base) {
434
-
unsigned long n = (32 * 1024 * 1024) << last_aper_order;
435
-
436
-
insert_aperture_resource((u32)last_aper_base, n);
447
+
if (last_aper_base)
437
448
return 1;
438
-
}
439
449
return 0;
440
450
}
441
451