From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) (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 5046A3D8129; Tue, 2 Jun 2026 10:47:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.119 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780397230; cv=none; b=aG7vsHJ+1HkXR2g8Cf7l91dLm7Xeg3JJUqcl+uB20yxYPzETPZlOuC9Qvje+iUMLFGzik1FAYXdqAYShM/0yZG1TxSTLofwRTpeC/GZmkfkCYxKW8JxW3DwLIU/1HG7cbJ/XizcxAzyLb4mublBDz9POXCMProvEI8ohNZczYho= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780397230; c=relaxed/simple; bh=+h8xtOdO5jnPPHZvAAfqAr8o3fzSkUep1Fz+d31GCUk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OF+cjXOY2CE6Qs3SIgUjOh2rP5sITkSkF94BUnYZVHUqYwRA8PPLGSUl4m3tDo+oEs82CfcK9ODUAHY1HylBlQsrVwnv1b4MjtJgZLMWsm/x89Jr8z5iKBX0xdSDgSYUV2SE2H4aWXT9fxqyCdTN3ljoXoZ020QfrJtgmVnWc0w= 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=DZgFlnbT; arc=none smtp.client-ip=115.124.30.119 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="DZgFlnbT" DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1780397226; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=1W+5Ep21JWFXb6Ndt1YmG74jhLb+YQ1K8PBTluefHNE=; b=DZgFlnbTVUdtuGeuyeZsIVI8dGzkpudPP1Tz2ahWLxTwcUq0ILnPGtRSIQqic3RGaNdfmm6AeA9tOf/8+/6ZYmk28PtzhBN+SPZpBUvK987fMuESoAOWWwIwwi9sc/ECSDNG77+zJjEAf0mtokfNGi3iK6P1Y1RyUjFYfmSXgJE= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033032089153;MF=guanghuifeng@linux.alibaba.com;NM=1;PH=DS;RN=28;SR=0;TI=SMTPD_---0X44E96b_1780397224; Received: from VM20241011-104.tbsite.net(mailfrom:guanghuifeng@linux.alibaba.com fp:SMTPD_---0X44E96b_1780397224 cluster:ay36) by smtp.aliyun-inc.com; Tue, 02 Jun 2026 18:47:04 +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 17/30] iommu/rockchip: implement iova_to_phys_length Date: Tue, 2 Jun 2026 18:46:24 +0800 Message-ID: <20260602104637.1219810-18-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 for Rockchip IOMMU driver, returning the actual PTE mapping size. Signed-off-by: Guanghui Feng --- drivers/iommu/rockchip-iommu.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index 0013cf196c57..5bae28a123c1 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -648,15 +648,18 @@ static irqreturn_t rk_iommu_irq(int irq, void *dev_id) return ret; } -static phys_addr_t rk_iommu_iova_to_phys(struct iommu_domain *domain, - dma_addr_t iova) +static phys_addr_t rk_iommu_iova_to_phys_length(struct iommu_domain *domain, + dma_addr_t iova, size_t *mapped_length) { struct rk_iommu_domain *rk_domain = to_rk_domain(domain); unsigned long flags; - phys_addr_t pt_phys, phys = 0; + phys_addr_t pt_phys, phys = PHYS_ADDR_MAX; u32 dte, pte; u32 *page_table; + if (mapped_length) + *mapped_length = 0; + spin_lock_irqsave(&rk_domain->dt_lock, flags); dte = rk_domain->dt[rk_iova_dte_index(iova)]; @@ -670,6 +673,8 @@ static phys_addr_t rk_iommu_iova_to_phys(struct iommu_domain *domain, goto out; phys = rk_ops->pt_address(pte) + rk_iova_page_offset(iova); + if (mapped_length) + *mapped_length = SPAGE_SIZE; out: spin_unlock_irqrestore(&rk_domain->dt_lock, flags); @@ -1187,7 +1192,7 @@ static const struct iommu_ops rk_iommu_ops = { .attach_dev = rk_iommu_attach_device, .map_pages = rk_iommu_map, .unmap_pages = rk_iommu_unmap, - .iova_to_phys = rk_iommu_iova_to_phys, + .iova_to_phys_length = rk_iommu_iova_to_phys_length, .free = rk_iommu_domain_free, } }; -- 2.43.7