aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86_64/kernel/pci-calgary.c13
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);
href='#n647'>647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888























































































































































































































































































































































































































































































































































































































































































































































































































































































































                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
‹