git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
aperture.c
diff --git
a/arch/x86_64/kernel/aperture.c
b/arch/x86_64/kernel/aperture.c
index
1d8b391
..
70b9d21
100644
(file)
--- a/
arch/x86_64/kernel/aperture.c
+++ b/
arch/x86_64/kernel/aperture.c
@@
-23,6
+23,7
@@
#include <asm/io.h>
#include <asm/proto.h>
#include <asm/pci-direct.h>
#include <asm/io.h>
#include <asm/proto.h>
#include <asm/pci-direct.h>
+#include <asm/dma.h>
int iommu_aperture;
int iommu_aperture_disabled __initdata = 0;
int iommu_aperture;
int iommu_aperture_disabled __initdata = 0;
@@
-33,18
+34,14
@@
int fallback_aper_force __initdata = 0;
int fix_aperture __initdata = 1;
int fix_aperture __initdata = 1;
-/* This code runs before the PCI subsystem is initialized, so just
+/* This code runs before the PCI subsystem is initialized, so just
access the northbridge directly. */
#define NB_ID_3 (PCI_VENDOR_ID_AMD | (0x1103<<16))
static u32 __init allocate_aperture(void)
{
access the northbridge directly. */
#define NB_ID_3 (PCI_VENDOR_ID_AMD | (0x1103<<16))
static u32 __init allocate_aperture(void)
{
-#ifdef CONFIG_DISCONTIGMEM
pg_data_t *nd0 = NODE_DATA(0);
pg_data_t *nd0 = NODE_DATA(0);
-#else
- pg_data_t *nd0 = &contig_page_data;
-#endif
u32 aper_size;
void *p;
u32 aper_size;
void *p;
@@
-53,9
+50,9
@@
static u32 __init allocate_aperture(void)
aper_size = (32 * 1024 * 1024) << fallback_aper_order;
/*
aper_size = (32 * 1024 * 1024) << fallback_aper_order;
/*
- * Aperture has to be naturally aligned. This means an 2GB aperture won't
- * have much chances to find a place in the lower 4GB of memory.
- * Unfortunately we cannot move it up because that would make the
+ * Aperture has to be naturally aligned. This means an 2GB aperture won't
+ * have much chances to find a place in the lower 4GB of memory.
+ * Unfortunately we cannot move it up because that would make the
* IOMMU useless.
*/
p = __alloc_bootmem_node(nd0, aper_size, aper_size, 0);
* IOMMU useless.
*/
p = __alloc_bootmem_node(nd0, aper_size, aper_size, 0);
@@
-63,10
+60,10
@@
static u32 __init allocate_aperture(void)
printk("Cannot allocate aperture memory hole (%p,%uK)\n",
p, aper_size>>10);
if (p)
printk("Cannot allocate aperture memory hole (%p,%uK)\n",
p, aper_size>>10);
if (p)
- free_bootmem_node(nd0,
(unsigned long)p
, aper_size);
+ free_bootmem_node(nd0,
__pa(p)
, aper_size);
return 0;
}
return 0;
}
- printk("Mapping aperture over %d KB of RAM @ %lx\n",
+ printk("Mapping aperture over %d KB of RAM @ %lx\n",
aper_size >> 10, __pa(p));
return (u32)__pa(p);
}
aper_size >> 10, __pa(p));
return (u32)__pa(p);
}
@@
-83,14
+80,14
@@
static int __init aperture_valid(char *name, u64 aper_base, u32 aper_size)
printk("Aperture from %s beyond 4GB. Ignoring.\n",name);
return 0;
}
printk("Aperture from %s beyond 4GB. Ignoring.\n",name);
return 0;
}
- if (e820_
mapped(aper_base, aper_base + aper_size, E820_RAM)) {
+ if (e820_
any_mapped(aper_base, aper_base + aper_size, E820_RAM)) {
printk("Aperture from %s pointing to e820 RAM. Ignoring.\n",name);
return 0;
}
return 1;
}
printk("Aperture from %s pointing to e820 RAM. Ignoring.\n",name);
return 0;
}
return 1;
}
-/* Find a PCI capability */
+/* Find a PCI capability */
static __u32 __init find_cap(int num, int slot, int func, int cap)
{
u8 pos;
static __u32 __init find_cap(int num, int slot, int func, int cap)
{
u8 pos;
@@
-164,7
+161,7
@@
static __u32 __init search_agp_bridge(u32 *order, int *valid_agp)
int num, slot, func;
/* Poor man's PCI discovery */
int num, slot, func;
/* Poor man's PCI discovery */
- for (num = 0; num <
32
; num++) {
+ for (num = 0; num <
256
; num++) {
for (slot = 0; slot < 32; slot++) {
for (func = 0; func < 8; func++) {
u32 class, cap;
for (slot = 0; slot < 32; slot++) {
for (func = 0; func < 8; func++) {
u32 class, cap;
@@
-200,8
+197,8
@@
static __u32 __init search_agp_bridge(u32 *order, int *valid_agp)
void __init iommu_hole_init(void)
{
int fix, num;
void __init iommu_hole_init(void)
{
int fix, num;
- u32 aper_size, aper_alloc = 0, aper_order;
- u64 aper_base
;
+ u32 aper_size, aper_alloc = 0, aper_order
= 0, last_aper_order = 0
;
+ u64 aper_base
, last_aper_base = 0;
int valid_agp = 0;
if (iommu_aperture_disabled || !fix_aperture)
int valid_agp = 0;
if (iommu_aperture_disabled || !fix_aperture)
@@
-230,7
+227,15
@@
void __init iommu_hole_init(void)
if (!aperture_valid(name, aper_base, aper_size)) {
fix = 1;
break;
if (!aperture_valid(name, aper_base, aper_size)) {
fix = 1;
break;
- }
+ }
+
+ if ((last_aper_order && aper_order != last_aper_order) ||
+ (last_aper_base && aper_base != last_aper_base)) {
+ fix = 1;
+ break;
+ }
+ last_aper_order = aper_order;
+ last_aper_base = aper_base;
}
if (!fix && !fallback_aper_force)
}
if (!fix && !fallback_aper_force)
@@
-241,7
+246,9
@@
void __init iommu_hole_init(void)
if (aper_alloc) {
/* Got the aperture from the AGP bridge */
if (aper_alloc) {
/* Got the aperture from the AGP bridge */
- } else if ((!no_iommu && end_pfn >= 0xffffffff>>PAGE_SHIFT) ||
+ } else if (swiotlb && !valid_agp) {
+ /* Do nothing */
+ } else if ((!no_iommu && end_pfn > MAX_DMA32_PFN) ||
force_iommu ||
valid_agp ||
fallback_aper_force) {
force_iommu ||
valid_agp ||
fallback_aper_force) {