|
@@ -1424,7 +1424,7 @@ static void pnv_pci_ioda2_release_dma_pe(struct pci_dev *dev, struct pnv_ioda_pe
|
|
|
iommu_group_put(pe->table_group.group);
|
|
|
BUG_ON(pe->table_group.group);
|
|
|
}
|
|
|
- iommu_free_table(tbl, of_node_full_name(dev->dev.of_node));
|
|
|
+ iommu_tce_table_put(tbl);
|
|
|
}
|
|
|
|
|
|
static void pnv_ioda_release_vf_PE(struct pci_dev *pdev)
|
|
@@ -2225,7 +2225,7 @@ found:
|
|
|
__free_pages(tce_mem, get_order(tce32_segsz * segs));
|
|
|
if (tbl) {
|
|
|
pnv_pci_unlink_table_and_group(tbl, &pe->table_group);
|
|
|
- iommu_free_table(tbl, "pnv");
|
|
|
+ iommu_tce_table_put(tbl);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -2321,7 +2321,7 @@ static long pnv_pci_ioda2_create_table(struct iommu_table_group *table_group,
|
|
|
bus_offset, page_shift, window_size,
|
|
|
levels, tbl);
|
|
|
if (ret) {
|
|
|
- iommu_free_table(tbl, "pnv");
|
|
|
+ iommu_tce_table_put(tbl);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -2365,7 +2365,7 @@ static long pnv_pci_ioda2_setup_default_config(struct pnv_ioda_pe *pe)
|
|
|
if (rc) {
|
|
|
pe_err(pe, "Failed to configure 32-bit TCE table, err %ld\n",
|
|
|
rc);
|
|
|
- iommu_free_table(tbl, "");
|
|
|
+ iommu_tce_table_put(tbl);
|
|
|
return rc;
|
|
|
}
|
|
|
|
|
@@ -2453,7 +2453,7 @@ static void pnv_ioda2_take_ownership(struct iommu_table_group *table_group)
|
|
|
pnv_pci_ioda2_unset_window(&pe->table_group, 0);
|
|
|
if (pe->pbus)
|
|
|
pnv_ioda_setup_bus_dma(pe, pe->pbus, false);
|
|
|
- iommu_free_table(tbl, "pnv");
|
|
|
+ iommu_tce_table_put(tbl);
|
|
|
}
|
|
|
|
|
|
static void pnv_ioda2_release_ownership(struct iommu_table_group *table_group)
|
|
@@ -3428,7 +3428,7 @@ static void pnv_pci_ioda1_release_pe_dma(struct pnv_ioda_pe *pe)
|
|
|
}
|
|
|
|
|
|
free_pages(tbl->it_base, get_order(tbl->it_size << 3));
|
|
|
- iommu_free_table(tbl, "pnv");
|
|
|
+ iommu_tce_table_put(tbl);
|
|
|
}
|
|
|
|
|
|
static void pnv_pci_ioda2_release_pe_dma(struct pnv_ioda_pe *pe)
|
|
@@ -3455,7 +3455,7 @@ static void pnv_pci_ioda2_release_pe_dma(struct pnv_ioda_pe *pe)
|
|
|
}
|
|
|
|
|
|
pnv_pci_ioda2_table_free_pages(tbl);
|
|
|
- iommu_free_table(tbl, "pnv");
|
|
|
+ iommu_tce_table_put(tbl);
|
|
|
}
|
|
|
|
|
|
static void pnv_ioda_free_pe_seg(struct pnv_ioda_pe *pe,
|