Implement iova_to_phys_length for Rockchip IOMMU driver, returning the actual PTE mapping size.
Signed-off-by: Guanghui Feng <[email protected]> --- drivers/iommu/rockchip-iommu.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index 0013cf196c57..5bae28a123c1 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -648,15 +648,18 @@ static irqreturn_t rk_iommu_irq(int irq, void *dev_id) return ret; } -static phys_addr_t rk_iommu_iova_to_phys(struct iommu_domain *domain, - dma_addr_t iova) +static phys_addr_t rk_iommu_iova_to_phys_length(struct iommu_domain *domain, + dma_addr_t iova, size_t *mapped_length) { struct rk_iommu_domain *rk_domain = to_rk_domain(domain); unsigned long flags; - phys_addr_t pt_phys, phys = 0; + phys_addr_t pt_phys, phys = PHYS_ADDR_MAX; u32 dte, pte; u32 *page_table; + if (mapped_length) + *mapped_length = 0; + spin_lock_irqsave(&rk_domain->dt_lock, flags); dte = rk_domain->dt[rk_iova_dte_index(iova)]; @@ -670,6 +673,8 @@ static phys_addr_t rk_iommu_iova_to_phys(struct iommu_domain *domain, goto out; phys = rk_ops->pt_address(pte) + rk_iova_page_offset(iova); + if (mapped_length) + *mapped_length = SPAGE_SIZE; out: spin_unlock_irqrestore(&rk_domain->dt_lock, flags); @@ -1187,7 +1192,7 @@ static const struct iommu_ops rk_iommu_ops = { .attach_dev = rk_iommu_attach_device, .map_pages = rk_iommu_map, .unmap_pages = rk_iommu_unmap, - .iova_to_phys = rk_iommu_iova_to_phys, + .iova_to_phys_length = rk_iommu_iova_to_phys_length, .free = rk_iommu_domain_free, } }; -- 2.43.7
