diff options
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/kernel/pci-calgary.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c index 6b76e2fc9249..c88e70dcfed4 100644 --- a/arch/x86_64/kernel/pci-calgary.c +++ b/arch/x86_64/kernel/pci-calgary.c | |||
@@ -1224,10 +1224,9 @@ static int __init calgary_init(void) | |||
1224 | continue; | 1224 | continue; |
1225 | } | 1225 | } |
1226 | tce_space = bus_info[dev->bus->number].tce_space; | 1226 | tce_space = bus_info[dev->bus->number].tce_space; |
1227 | if (!tce_space && !translate_empty_slots) { | 1227 | if (!tce_space && !translate_empty_slots) |
1228 | printk("Calg: %p failed tce_space check\n", dev); | ||
1229 | continue; | 1228 | continue; |
1230 | } | 1229 | |
1231 | ret = calgary_init_one(dev); | 1230 | ret = calgary_init_one(dev); |
1232 | if (ret) | 1231 | if (ret) |
1233 | goto error; | 1232 | goto error; |
@@ -1419,8 +1418,6 @@ void __init detect_calgary(void) | |||
1419 | goto cleanup; | 1418 | goto cleanup; |
1420 | info->tce_space = tbl; | 1419 | info->tce_space = tbl; |
1421 | calgary_found = 1; | 1420 | calgary_found = 1; |
1422 | printk("Calg: allocated tce_table %p for bus 0x%x\n", | ||
1423 | info->tce_space, bus); | ||
1424 | } | 1421 | } |
1425 | } | 1422 | } |
1426 | 1423 | ||
@@ -1555,10 +1552,6 @@ static void __init calgary_fixup_one_tce_space(struct pci_dev *dev) | |||
1555 | npages = (r->end - r->start) >> PAGE_SHIFT; | 1552 | npages = (r->end - r->start) >> PAGE_SHIFT; |
1556 | npages++; | 1553 | npages++; |
1557 | 1554 | ||
1558 | printk(KERN_DEBUG "Calg: dev %p [%x] tbl %p reserving " | ||
1559 | "0x%Lx-0x%Lx [0x%x pages]\n", dev, dev->bus->number, | ||
1560 | tbl, r->start, r->end, npages); | ||
1561 | |||
1562 | iommu_range_reserve(tbl, r->start, npages); | 1555 | iommu_range_reserve(tbl, r->start, npages); |
1563 | } | 1556 | } |
1564 | } | 1557 | } |
@@ -1571,7 +1564,7 @@ static int __init calgary_fixup_tce_spaces(void) | |||
1571 | if (no_iommu || swiotlb || !calgary_detected) | 1564 | if (no_iommu || swiotlb || !calgary_detected) |
1572 | return -ENODEV; | 1565 | return -ENODEV; |
1573 | 1566 | ||
1574 | printk(KERN_DEBUG "Calgary: fixing tce spaces\n"); | 1567 | printk(KERN_DEBUG "Calgary: fixing up tce spaces\n"); |
1575 | 1568 | ||
1576 | do { | 1569 | do { |
1577 | dev = pci_get_device(PCI_VENDOR_ID_IBM, PCI_ANY_ID, dev); | 1570 | dev = pci_get_device(PCI_VENDOR_ID_IBM, PCI_ANY_ID, dev); |