lkml.org 
[lkml]   [2020]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 08/24] iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap
    Date
    Use the ias for the valid iova checking in arm_v7s_unmap. This is a
    preparing patch for supporting iova 34bit for MediaTek.
    BTW, change the ias/oas checking format in arm_v7s_map.

    Signed-off-by: Yong Wu <yong.wu@mediatek.com>
    ---
    drivers/iommu/io-pgtable-arm-v7s.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
    index a688f22cbe3b..4c9d8dccfc5a 100644
    --- a/drivers/iommu/io-pgtable-arm-v7s.c
    +++ b/drivers/iommu/io-pgtable-arm-v7s.c
    @@ -526,8 +526,7 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova,
    if (!(prot & (IOMMU_READ | IOMMU_WRITE)))
    return 0;

    - if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias) ||
    - paddr >= (1ULL << data->iop.cfg.oas)))
    + if (WARN_ON(iova >> data->iop.cfg.ias || paddr >> data->iop.cfg.oas))
    return -ERANGE;

    ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd, gfp);
    @@ -717,7 +716,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 >> data->iop.cfg.ias))
    return 0;

    return __arm_v7s_unmap(data, gather, iova, size, 1, data->pgd);
    --
    2.18.0
    \
     
     \ /
      Last update: 2020-09-30 09:08    [W:6.001 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site