[PATCH v6 09/33] iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap

[Yong Wu]

Use the ias for the valid iova checking in arm_v7s_unmap. This is a
preparing patch for supporting iova 34bit for MediaTek.

Signed-off-by: Yong Wu <yong...@mediatek.com>
Reviewed-by: Robin Murphy <robin.mur...@arm.com>
---
 drivers/iommu/io-pgtable-arm-v7s.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/io-pgtable-arm-v7s.c 
b/drivers/iommu/io-pgtable-arm-v7s.c
index 1d92ac948db7..eb3703bfd98e 100644
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -717,7 +717,7 @@ static size_t arm_v7s_unmap(struct io_pgtable_ops *ops, 
unsigned long iova,
 {
        struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops);
 
-       if (WARN_ON(upper_32_bits(iova)))
+       if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias)))
                return 0;
 
        return __arm_v7s_unmap(data, gather, iova, size, 1, data->pgd);
-- 
2.18.0