From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out30-132.freemail.mail.aliyun.com (out30-132.freemail.mail.aliyun.com [115.124.30.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8B4A3D6CC3; Tue, 2 Jun 2026 10:46:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.132 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780397216; cv=none; b=rFguuJMqeNgd2bmbV1vGpf98ISQdshOy2uNzsbK0YSg7cE/f6eY/0BlPt4dId1rpTbxTSk9vP/whTo5CwPSlysAidpnhPdvtmnt0bwqmn+2oiZ8HuT9rn+1rVLatHMqofIa7aXshcddulM1IswVAfd7GbMlwy2OV//zmuIK3qk0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780397216; c=relaxed/simple; bh=24W9IxqMVTohjC3Md1Ifb5ypnUAmrxqp2hkrF3RYkeo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mhp6eJ4p3cZWHm5zxpQ5vUZl3kaNWoqqfqpIwGtUyphD5/g9ZJHy0a0Wqnj9EWe+zc6fzu4XQFrZmChg5jdLkodvNUR0w+p5i/zOiUjx7TO6+1XeE1rFljtF8CDcp037ZQViNQ3HvxRdGLlSTcuEBqfFAPEcv/jN+pw5i7JWATw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=YXPTGHjH; arc=none smtp.client-ip=115.124.30.132 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="YXPTGHjH" DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1780397212; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=NEcdkKuIoYfcjbKM7WhKOeSFYFCWaJe62lwiuJRVrJ0=; b=YXPTGHjHGC1JjXPkuAjGSHxn0Z//22h6Dy5TjFDeP6mxWhDBz//uQ3Lfa8hyuZ22xeLz/sTsOtx606mr5QYgirZOd5TuNnEGISVhgt9U1U9Bg+fEVKZoartPqSXEUofmfH9rC9jNUk/qUcjk5cfNd7tq/xWntbg3lRYtsYFasLk= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R391e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045133197;MF=guanghuifeng@linux.alibaba.com;NM=1;PH=DS;RN=28;SR=0;TI=SMTPD_---0X44E92e_1780397209; Received: from VM20241011-104.tbsite.net(mailfrom:guanghuifeng@linux.alibaba.com fp:SMTPD_---0X44E92e_1780397209 cluster:ay36) by smtp.aliyun-inc.com; Tue, 02 Jun 2026 18:46:50 +0800 From: Guanghui Feng To: adrian.larumbe@collabora.com, airlied@gmail.com, alex@shazbot.org, baolu.lu@linux.intel.com, boris.brezillon@collabora.com, dri-devel@lists.freedesktop.org, dwmw2@infradead.org, iommu@lists.linux.dev, jgg@ziepe.ca, joro@8bytes.org, kevin.tian@intel.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, oliver.yang@linux.alibaba.com, robh@kernel.org, robin.murphy@arm.com, shiyu.zsq@linux.alibaba.com, steven.price@arm.com, suravee.suthikulpanit@amd.com, tzimmermann@suse.de, wei.guo.simon@linux.alibaba.com, will@kernel.org, xlpang@linux.alibaba.com Cc: alikernel-developer@linux.alibaba.com Subject: [PATCH v2 03/30] iommu/io-pgtable-arm-v7s: introduce iova_to_phys_length in io_pgtable_ops Date: Tue, 2 Jun 2026 18:46:10 +0800 Message-ID: <20260602104637.1219810-4-guanghuifeng@linux.alibaba.com> X-Mailer: git-send-email 2.43.7 In-Reply-To: <20260602104637.1219810-1-guanghuifeng@linux.alibaba.com> References: <20260531093637.3893199-1-guanghuifeng@linux.alibaba.com> <20260602104637.1219810-1-guanghuifeng@linux.alibaba.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Implement iova_to_phys_length in ARM v7s backend: returns block size derived from level mask. The old iova_to_phys is kept as a thin wrapper. Signed-off-by: Guanghui Feng --- drivers/iommu/io-pgtable-arm-v7s.c | 34 ++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index 1dbef8c55007..5868d68e8a85 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -641,13 +641,27 @@ 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) +{ + phys_addr_t phys = arm_v7s_iova_to_phys_length(ops, iova, NULL); + + return (phys == PHYS_ADDR_MAX) ? 0 : phys; +} + +static phys_addr_t arm_v7s_iova_to_phys_length(struct io_pgtable_ops *ops, + unsigned long iova, + size_t *mapped_length) { struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops); arm_v7s_iopte *ptep = data->pgd, pte; int lvl = 0; u32 mask; + size_t blk_size; do { ptep += ARM_V7S_LVL_IDX(iova, ++lvl, &data->iop.cfg); @@ -656,11 +670,16 @@ static phys_addr_t arm_v7s_iova_to_phys(struct io_pgtable_ops *ops, } while (ARM_V7S_PTE_IS_TABLE(pte, lvl)); if (!ARM_V7S_PTE_IS_VALID(pte)) - return 0; + return PHYS_ADDR_MAX; mask = ARM_V7S_LVL_MASK(lvl); if (arm_v7s_pte_is_cont(pte, lvl)) mask *= ARM_V7S_CONT_PAGES; + + blk_size = ~mask + 1U; + if (mapped_length) + *mapped_length = blk_size; + return iopte_to_paddr(pte, lvl, &data->iop.cfg) | (iova & ~mask); } @@ -714,6 +733,7 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, .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, }; /* We have to do this early for __arm_v7s_alloc_table to work... */ @@ -843,13 +863,13 @@ static int __init arm_v7s_do_selftests(void) * Initial sanity checks. * Empty page tables shouldn't provide any translations. */ - if (ops->iova_to_phys(ops, 42)) + if (ops->iova_to_phys_length(ops, 42, NULL) != PHYS_ADDR_MAX) return __FAIL(ops); - if (ops->iova_to_phys(ops, SZ_1G + 42)) + if (ops->iova_to_phys_length(ops, SZ_1G + 42, NULL) != PHYS_ADDR_MAX) return __FAIL(ops); - if (ops->iova_to_phys(ops, SZ_2G + 42)) + if (ops->iova_to_phys_length(ops, SZ_2G + 42, NULL) != PHYS_ADDR_MAX) return __FAIL(ops); /* @@ -870,7 +890,7 @@ static int __init arm_v7s_do_selftests(void) &mapped)) return __FAIL(ops); - if (ops->iova_to_phys(ops, iova + 42) != (iova + 42)) + if (ops->iova_to_phys_length(ops, iova + 42, NULL) != (iova + 42)) return __FAIL(ops); iova += SZ_16M; @@ -884,7 +904,7 @@ static int __init arm_v7s_do_selftests(void) if (ops->unmap_pages(ops, iova, size, 1, NULL) != size) return __FAIL(ops); - if (ops->iova_to_phys(ops, iova + 42)) + if (ops->iova_to_phys_length(ops, iova + 42, NULL) != PHYS_ADDR_MAX) return __FAIL(ops); /* Remap full block */ @@ -892,7 +912,7 @@ static int __init arm_v7s_do_selftests(void) GFP_KERNEL, &mapped)) return __FAIL(ops); - if (ops->iova_to_phys(ops, iova + 42) != (iova + 42)) + if (ops->iova_to_phys_length(ops, iova + 42, NULL) != (iova + 42)) return __FAIL(ops); iova += SZ_16M; -- 2.43.7