diff options
| author | Yong Wu <yong.wu@mediatek.com> | 2021-01-11 19:18:50 +0800 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-02-01 11:31:16 +0000 |
| commit | 859da21112520829638a82f458ac2c8c2637e17d (patch) | |
| tree | 4da9cfe73937e5d7378f09e2b9582356658a1f3d /drivers/iommu | |
| parent | 66a28915541549f0fe0f4c705dab77443f22b5d6 (diff) | |
| download | linux-stable-859da21112520829638a82f458ac2c8c2637e17d.tar.gz linux-stable-859da21112520829638a82f458ac2c8c2637e17d.tar.bz2 linux-stable-859da21112520829638a82f458ac2c8c2637e17d.zip | |
iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap
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.wu@mediatek.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Link: https://lore.kernel.org/r/20210111111914.22211-10-yong.wu@mediatek.com
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/io-pgtable-arm-v7s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index 929cb1518db1..03f35065acff 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -711,7 +711,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); |