Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 45463
b: refs/heads/master
c: b92cc55
h: refs/heads/master
i:
  45461: 435e014
  45459: 76f1235
  45455: 4abdf60
v: v3
  • Loading branch information
Muli Ben-Yehuda authored and Andi Kleen committed Jan 11, 2007
1 parent 4e20432 commit a9c1670
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ed5316d4457b35c7b4942af028d6b878174264f7
refs/heads/master: b92cc55923898ab5e8a78939be9734ab9e1c8f49
11 changes: 8 additions & 3 deletions trunk/arch/x86_64/kernel/pci-calgary.c
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,8 @@ void __init detect_calgary(void)
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;
Expand All @@ -1088,14 +1090,14 @@ void __init detect_calgary(void)
offset = *((unsigned short *)(ptr + offset));
}
if (!rio_table_hdr) {
printk(KERN_ERR "Calgary: Unable to locate "
"Rio Grande Table in EBDA - bailing!\n");
printk(KERN_DEBUG "Calgary: Unable to locate Rio Grande table "
"in EBDA - bailing!\n");
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;
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit a9c1670

Please sign in to comment.