github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-01 03:59:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

dma-mapping-fast: IOMMU helper clean up

Browse Source 
iommu_put_dma_cookie() is now called by the IOMMU framework code
before each driver's domain free callback function is invoked. Remove
iommu_put_dma_cookie() accordingly.

qcom_iommu_put_resv_regions() is now replaced by
iommu_put_resv_regions(), drop all references to our qcom_ function
versions.

Change-Id: Ib9c1c431faf4988707e449ad00c1e3fe7ee2dd47
Signed-off-by: Chris Goldsworthy <quic_cgoldswo@quicinc.com>
This commit is contained in:
Chris Goldsworthy 2022-11-12 18:31:41 -08:00
parent b6ae4515d3
commit f817953a3b
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/iommu/dma-mapping-fast.c
View File

@ -980,7 +980,7 @@ static void fast_smmu_reserve_iommu_regions(struct device *dev,
bitmap_set(fast->clean_bitmap, lo, hi - lo + 1);
}
spin_unlock_irqrestore(&mapping->lock, flags);
qcom_iommu_put_resv_regions(dev, &resv_regions);
iommu_put_resv_regions(dev, &resv_regions);
fast_smmu_reserve_msi_iova(dev, fast);
}
@ -992,8 +992,6 @@ void fast_smmu_put_dma_cookie(struct iommu_domain *domain)
if (!fast)
return;
iommu_put_dma_cookie(domain);
if (fast->iovad) {
put_iova_domain(fast->iovad);
kfree(fast->iovad);

3
include/linux/qcom-iommu-util.h
View File

@ -112,9 +112,8 @@ int qcom_iommu_get_fast_iova_range(struct device *dev,
dma_addr_t *ret_iova_base,
dma_addr_t *ret_iova_end);
/* Remove once these functions are exported by upstream kernel */
/* Remove once this function is exported by upstream kernel */
void qcom_iommu_get_resv_regions(struct device *dev, struct list_head *list);
void qcom_iommu_put_resv_regions(struct device *dev, struct list_head *list);
phys_addr_t qcom_iommu_iova_to_phys_hard(struct iommu_domain *domain,
struct qcom_iommu_atos_txn *txn);