Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 62416
b: refs/heads/master
c: 12de257
h: refs/heads/master
v: v3
  • Loading branch information
Muli Ben-Yehuda authored and Linus Torvalds committed Jul 22, 2007
1 parent 443b845 commit dc52ed7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 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: e8f204147149e48d72e9c1e321ee72452169e34a
refs/heads/master: 12de257b83e2fa9343eb7cee70a6edc85b51fbc5
13 changes: 3 additions & 10 deletions trunk/arch/x86_64/kernel/pci-calgary.c
Original file line number Diff line number Diff line change
Expand Up @@ -1224,10 +1224,9 @@ static int __init calgary_init(void)
continue;
}
tce_space = bus_info[dev->bus->number].tce_space;
if (!tce_space && !translate_empty_slots) {
printk("Calg: %p failed tce_space check\n", dev);
if (!tce_space && !translate_empty_slots)
continue;
}

ret = calgary_init_one(dev);
if (ret)
goto error;
Expand Down Expand Up @@ -1419,8 +1418,6 @@ void __init detect_calgary(void)
goto cleanup;
info->tce_space = tbl;
calgary_found = 1;
printk("Calg: allocated tce_table %p for bus 0x%x\n",
info->tce_space, bus);
}
}

Expand Down Expand Up @@ -1555,10 +1552,6 @@ static void __init calgary_fixup_one_tce_space(struct pci_dev *dev)
npages = (r->end - r->start) >> PAGE_SHIFT;
npages++;

printk(KERN_DEBUG "Calg: dev %p [%x] tbl %p reserving "
"0x%Lx-0x%Lx [0x%x pages]\n", dev, dev->bus->number,
tbl, r->start, r->end, npages);

iommu_range_reserve(tbl, r->start, npages);
}
}
Expand All @@ -1571,7 +1564,7 @@ static int __init calgary_fixup_tce_spaces(void)
if (no_iommu || swiotlb || !calgary_detected)
return -ENODEV;

printk(KERN_DEBUG "Calgary: fixing tce spaces\n");
printk(KERN_DEBUG "Calgary: fixing up tce spaces\n");

do {
dev = pci_get_device(PCI_VENDOR_ID_IBM, PCI_ANY_ID, dev);
Expand Down

0 comments on commit dc52ed7

Please sign in to comment.