[PATCH 9/9] iommu: remove deprecated iova_to_phys from domain_ops and io_pgtable_ops
Guanghui Feng
guanghuifeng at linux.alibaba.com
Sun May 31 02:36:37 PDT 2026
Now that all drivers implement iova_to_phys_length and all callers
have migrated, remove the deprecated interfaces:
- Remove .iova_to_phys from struct iommu_domain_ops
- Remove .iova_to_phys from struct io_pgtable_ops
- Remove fallback in iommu_iova_to_phys_length()
- Make iommu_iova_to_phys() a thin wrapper
- Remove old wrapper functions from io-pgtable implementations
Signed-off-by: Guanghui Feng <guanghuifeng at linux.alibaba.com>
Acked-by: Shiqiang Zhang <shiyu.zsq at linux.alibaba.com>
Acked-by: Simon Guo <wei.guo.simon at linux.alibaba.com>
---
drivers/iommu/io-pgtable-arm-v7s.c | 11 -----------
drivers/iommu/io-pgtable-arm.c | 11 -----------
drivers/iommu/io-pgtable-dart.c | 11 -----------
drivers/iommu/iommu.c | 4 ----
include/linux/io-pgtable.h | 3 ---
include/linux/iommu.h | 3 ---
6 files changed, 43 deletions(-)
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index 54e8cc673eb6..00c09710b01b 100644
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -641,16 +641,6 @@ static size_t arm_v7s_unmap_pages(struct io_pgtable_ops *ops, unsigned long iova
return unmapped;
}
-static phys_addr_t arm_v7s_iova_to_phys_length(struct io_pgtable_ops *ops,
- unsigned long iova,
- size_t *mapped_length);
-
-static phys_addr_t arm_v7s_iova_to_phys(struct io_pgtable_ops *ops,
- unsigned long iova)
-{
- return arm_v7s_iova_to_phys_length(ops, iova, NULL);
-}
-
static phys_addr_t arm_v7s_iova_to_phys_length(struct io_pgtable_ops *ops,
unsigned long iova,
size_t *mapped_length)
@@ -730,7 +720,6 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
data->iop.ops = (struct io_pgtable_ops) {
.map_pages = arm_v7s_map_pages,
.unmap_pages = arm_v7s_unmap_pages,
- .iova_to_phys = arm_v7s_iova_to_phys,
.iova_to_phys_length = arm_v7s_iova_to_phys_length,
};
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index e2ea84669fbf..c7419f812e79 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -731,16 +731,6 @@ static int visit_iova_to_phys(struct io_pgtable_walk_data *walk_data, int lvl,
return 0;
}
-static phys_addr_t arm_lpae_iova_to_phys_length(struct io_pgtable_ops *ops,
- unsigned long iova,
- size_t *mapped_length);
-
-static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
- unsigned long iova)
-{
- return arm_lpae_iova_to_phys_length(ops, iova, NULL);
-}
-
static phys_addr_t arm_lpae_iova_to_phys_length(struct io_pgtable_ops *ops,
unsigned long iova,
size_t *mapped_length)
@@ -963,7 +953,6 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
data->iop.ops = (struct io_pgtable_ops) {
.map_pages = arm_lpae_map_pages,
.unmap_pages = arm_lpae_unmap_pages,
- .iova_to_phys = arm_lpae_iova_to_phys,
.iova_to_phys_length = arm_lpae_iova_to_phys_length,
.read_and_clear_dirty = arm_lpae_read_and_clear_dirty,
.pgtable_walk = arm_lpae_pgtable_walk,
diff --git a/drivers/iommu/io-pgtable-dart.c b/drivers/iommu/io-pgtable-dart.c
index fa250f5d16ed..f71c04a4c15e 100644
--- a/drivers/iommu/io-pgtable-dart.c
+++ b/drivers/iommu/io-pgtable-dart.c
@@ -333,16 +333,6 @@ static size_t dart_unmap_pages(struct io_pgtable_ops *ops, unsigned long iova,
return i * pgsize;
}
-static phys_addr_t dart_iova_to_phys_length(struct io_pgtable_ops *ops,
- unsigned long iova,
- size_t *mapped_length);
-
-static phys_addr_t dart_iova_to_phys(struct io_pgtable_ops *ops,
- unsigned long iova)
-{
- return dart_iova_to_phys_length(ops, iova, NULL);
-}
-
static phys_addr_t dart_iova_to_phys_length(struct io_pgtable_ops *ops,
unsigned long iova,
size_t *mapped_length)
@@ -414,7 +404,6 @@ dart_alloc_pgtable(struct io_pgtable_cfg *cfg)
data->iop.ops = (struct io_pgtable_ops) {
.map_pages = dart_map_pages,
.unmap_pages = dart_unmap_pages,
- .iova_to_phys = dart_iova_to_phys,
.iova_to_phys_length = dart_iova_to_phys_length,
};
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 43323229a1df..df56635de39d 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -2573,10 +2573,6 @@ phys_addr_t iommu_iova_to_phys_length(struct iommu_domain *domain,
return domain->ops->iova_to_phys_length(domain, iova,
mapped_length);
- /* Fallback to legacy iova_to_phys without length info */
- if (domain->ops->iova_to_phys)
- return domain->ops->iova_to_phys(domain, iova);
-
return 0;
}
EXPORT_SYMBOL_GPL(iommu_iova_to_phys_length);
diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h
index 42bcdd309b88..c595f5b51e61 100644
--- a/include/linux/io-pgtable.h
+++ b/include/linux/io-pgtable.h
@@ -202,7 +202,6 @@ struct arm_lpae_io_pgtable_walk_data {
*
* @map_pages: Map a physically contiguous range of pages of the same size.
* @unmap_pages: Unmap a range of virtually contiguous pages of the same size.
- * @iova_to_phys: Translate iova to physical address.
* @iova_to_phys_length: Translate iova to physical address and return the
* remaining mapped length from iova to the end of the
* mapping entry via @mapped_length. If @mapped_length is
@@ -222,8 +221,6 @@ struct io_pgtable_ops {
size_t (*unmap_pages)(struct io_pgtable_ops *ops, unsigned long iova,
size_t pgsize, size_t pgcount,
struct iommu_iotlb_gather *gather);
- phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
- unsigned long iova);
phys_addr_t (*iova_to_phys_length)(struct io_pgtable_ops *ops,
unsigned long iova,
size_t *mapped_length);
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 19da84c2922c..ca585647180b 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -746,7 +746,6 @@ struct iommu_ops {
* array->entry_num to report the number of handled
* invalidation requests. The driver data structure
* must be defined in include/uapi/linux/iommufd.h
- * @iova_to_phys: translate iova to physical address
* @iova_to_phys_length: translate iova to physical address and additionally
* return the page size of the PTE mapping at @iova
* through @mapped_length.
@@ -777,8 +776,6 @@ struct iommu_domain_ops {
int (*cache_invalidate_user)(struct iommu_domain *domain,
struct iommu_user_data_array *array);
- phys_addr_t (*iova_to_phys)(struct iommu_domain *domain,
- dma_addr_t iova);
phys_addr_t (*iova_to_phys_length)(struct iommu_domain *domain,
dma_addr_t iova,
size_t *mapped_length);
--
2.43.7
More information about the linux-arm-kernel
mailing list