1 files changed, 0 insertions, 158 deletions

diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
index b265ecc0836a..13aef2323bbc 100644
--- a/arch/powerpc/platforms/powernv/pci.c
+++ b/arch/powerpc/platforms/powernv/pci.c
@@ -802,85 +802,6 @@ struct pci_ops pnv_pci_ops = {
         .write = pnv_pci_write_config,
 };
 
-static __be64 *pnv_tce(struct iommu_table *tbl, long idx)
-{
-        __be64 *tmp = ((__be64 *)tbl->it_base);
-        int  level = tbl->it_indirect_levels;
-        const long shift = ilog2(tbl->it_level_size);
-        unsigned long mask = (tbl->it_level_size - 1) << (level * shift);
-
-        while (level) {
-                int n = (idx & mask) >> (level * shift);
-                unsigned long tce = be64_to_cpu(tmp[n]);
-
-                tmp = __va(tce & ~(TCE_PCI_READ | TCE_PCI_WRITE));
-                idx &= ~mask;
-                mask >>= shift;
-                --level;
-        }
-
-        return tmp + idx;
-}
-
-int pnv_tce_build(struct iommu_table *tbl, long index, long npages,
-                unsigned long uaddr, enum dma_data_direction direction,
-                unsigned long attrs)
-{
-        u64 proto_tce = iommu_direction_to_tce_perm(direction);
-        u64 rpn = __pa(uaddr) >> tbl->it_page_shift;
-        long i;
-
-        if (proto_tce & TCE_PCI_WRITE)
-                proto_tce |= TCE_PCI_READ;
-
-        for (i = 0; i < npages; i++) {
-                unsigned long newtce = proto_tce |
-                        ((rpn + i) << tbl->it_page_shift);
-                unsigned long idx = index - tbl->it_offset + i;
-
-                *(pnv_tce(tbl, idx)) = cpu_to_be64(newtce);
-        }
-
-        return 0;
-}
-
-#ifdef CONFIG_IOMMU_API
-int pnv_tce_xchg(struct iommu_table *tbl, long index,
-                unsigned long *hpa, enum dma_data_direction *direction)
-{
-        u64 proto_tce = iommu_direction_to_tce_perm(*direction);
-        unsigned long newtce = *hpa | proto_tce, oldtce;
-        unsigned long idx = index - tbl->it_offset;
-
-        BUG_ON(*hpa & ~IOMMU_PAGE_MASK(tbl));
-
-        if (newtce & TCE_PCI_WRITE)
-                newtce |= TCE_PCI_READ;
-
-        oldtce = be64_to_cpu(xchg(pnv_tce(tbl, idx), cpu_to_be64(newtce)));
-        *hpa = oldtce & ~(TCE_PCI_READ | TCE_PCI_WRITE);
-        *direction = iommu_tce_direction(oldtce);
-
-        return 0;
-}
-#endif
-
-void pnv_tce_free(struct iommu_table *tbl, long index, long npages)
-{
-        long i;
-
-        for (i = 0; i < npages; i++) {
-                unsigned long idx = index - tbl->it_offset + i;
-
-                *(pnv_tce(tbl, idx)) = cpu_to_be64(0);
-        }
-}
-
-unsigned long pnv_tce_get(struct iommu_table *tbl, long index)
-{
-        return be64_to_cpu(*(pnv_tce(tbl, index - tbl->it_offset)));
-}
-
 struct iommu_table *pnv_pci_table_alloc(int nid)
 {
         struct iommu_table *tbl;
@@ -895,85 +816,6 @@ struct iommu_table *pnv_pci_table_alloc(int nid)
         return tbl;
 }
 
-long pnv_pci_link_table_and_group(int node, int num,
-                struct iommu_table *tbl,
-                struct iommu_table_group *table_group)
-{
-        struct iommu_table_group_link *tgl = NULL;
-
-        if (WARN_ON(!tbl || !table_group))
-                return -EINVAL;
-
-        tgl = kzalloc_node(sizeof(struct iommu_table_group_link), GFP_KERNEL,
-                        node);
-        if (!tgl)
-                return -ENOMEM;
-
-        tgl->table_group = table_group;
-        list_add_rcu(&tgl->next, &tbl->it_group_list);
-
-        table_group->tables[num] = tbl;
-
-        return 0;
-}
-
-static void pnv_iommu_table_group_link_free(struct rcu_head *head)
-{
-        struct iommu_table_group_link *tgl = container_of(head,
-                        struct iommu_table_group_link, rcu);
-
-        kfree(tgl);
-}
-
-void pnv_pci_unlink_table_and_group(struct iommu_table *tbl,
-                struct iommu_table_group *table_group)
-{
-        long i;
-        bool found;
-        struct iommu_table_group_link *tgl;
-
-        if (!tbl || !table_group)
-                return;
-
-        /* Remove link to a group from table's list of attached groups */
-        found = false;
-        list_for_each_entry_rcu(tgl, &tbl->it_group_list, next) {
-                if (tgl->table_group == table_group) {
-                        list_del_rcu(&tgl->next);
-                        call_rcu(&tgl->rcu, pnv_iommu_table_group_link_free);
-                        found = true;
-                        break;
-                }
-        }
-        if (WARN_ON(!found))
-                return;
-
-        /* Clean a pointer to iommu_table in iommu_table_group::tables[] */
-        found = false;
-        for (i = 0; i < IOMMU_TABLE_GROUP_MAX_TABLES; ++i) {
-                if (table_group->tables[i] == tbl) {
-                        table_group->tables[i] = NULL;
-                        found = true;
-                        break;
-                }
-        }
-        WARN_ON(!found);
-}
-
-void pnv_pci_setup_iommu_table(struct iommu_table *tbl,
-                               void *tce_mem, u64 tce_size,
-                               u64 dma_offset, unsigned page_shift)
-{
-        tbl->it_blocksize = 16;
-        tbl->it_base = (unsigned long)tce_mem;
-        tbl->it_page_shift = page_shift;
-        tbl->it_offset = dma_offset >> tbl->it_page_shift;
-        tbl->it_index = 0;
-        tbl->it_size = tce_size >> 3;
-        tbl->it_busno = 0;
-        tbl->it_type = TCE_PCI;
-}
-
 void pnv_pci_dma_dev_setup(struct pci_dev *pdev)
 {
         struct pci_controller *hose = pci_bus_to_host(pdev->bus);