git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
pci-calgary.c
diff --git
a/arch/x86_64/kernel/pci-calgary.c
b/arch/x86_64/kernel/pci-calgary.c
index
87d90cb
..
3d65b1d
100644
(file)
--- a/
arch/x86_64/kernel/pci-calgary.c
+++ b/
arch/x86_64/kernel/pci-calgary.c
@@
-1068,6
+1068,8
@@
void __init detect_calgary(void)
if (!early_pci_allowed())
return;
if (!early_pci_allowed())
return;
+ printk(KERN_DEBUG "Calgary: detecting Calgary via BIOS EBDA area\n");
+
ptr = (unsigned long)phys_to_virt(get_bios_ebda());
rio_table_hdr = NULL;
ptr = (unsigned long)phys_to_virt(get_bios_ebda());
rio_table_hdr = NULL;
@@
-1088,14
+1090,14
@@
void __init detect_calgary(void)
offset = *((unsigned short *)(ptr + offset));
}
if (!rio_table_hdr) {
offset = *((unsigned short *)(ptr + offset));
}
if (!rio_table_hdr) {
- printk(KERN_
ERR "Calgary: Unable to locat
e "
-
"Rio Grande Table
in EBDA - bailing!\n");
+ printk(KERN_
DEBUG "Calgary: Unable to locate Rio Grande tabl
e "
+
"
in EBDA - bailing!\n");
return;
}
ret = build_detail_arrays();
if (ret) {
return;
}
ret = build_detail_arrays();
if (ret) {
- printk(KERN_
ERR
"Calgary: build_detail_arrays ret %d\n", ret);
+ printk(KERN_
DEBUG
"Calgary: build_detail_arrays ret %d\n", ret);
return;
}
return;
}
@@
-1128,6
+1130,9
@@
void __init detect_calgary(void)
}
}
}
}
+ printk(KERN_DEBUG "Calgary: finished detection, Calgary %s\n",
+ calgary_found ? "found" : "not found");
+
if (calgary_found) {
iommu_detected = 1;
calgary_detected = 1;
if (calgary_found) {
iommu_detected = 1;
calgary_detected = 1;