From patchwork Tue Aug 20 17:16:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13770510 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E7EB7C531DC for ; Tue, 20 Aug 2024 17:19:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=I2hM9IXnWJCIXdGneHBR3ODZityq3OdYqAzA4dSYz3U=; b=GwXYpUAiwlE+xl6xKo+ocCynT9 Eyo/2KVZrl5nLNYURDLhVkbwuhtFV6/n7Fe1HKXnq9UH3hTbISaQ9txiHesfM2kbRrHCp42KGJU/g 5l2X5uA/CbD9bAhn2Oz7DSsPD0DcL/wqwGRNH8XhFirHow4ZkD1brQaMbWwfRrINJfCOIXWt3b6jc KLBXwjX4v/QaQQSWq5fUTQEo7Dt8w/wyMdLaRTXc6i+0b7vlMWF6O6hgF034v4VsdYrBlrNTKgt5M nQU/RvtPWL+LxNxI18jwmTYkoFHaYq0MZLNT6KJwSCF+D0+nknJMzMF+13VPJnWO4pypByqSX9Ftq C9ihzJ5w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgSVl-0000000698Z-2t2B; Tue, 20 Aug 2024 17:19:13 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgSTp-000000068Yv-3pBu for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2024 17:17:15 +0000 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-20208830de8so34648195ad.1 for ; Tue, 20 Aug 2024 10:17:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724174232; x=1724779032; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I2hM9IXnWJCIXdGneHBR3ODZityq3OdYqAzA4dSYz3U=; b=he81W4+i5eIwA5ppEuCMX3xH9d3kBTbhF3ta6ym/zC5pmj2HUrZsuHd/wHpoY7O9z9 k0rJC3fh8zcS2fHbzyuzzM3ZgqLPELfkzJkgJnUA5ujtWqqd14PAXUI1Qf+X8ZY0xxQA NUN7VEgRTkdQUCop6IIZ75lSk8nlyaZaJoAViR0m+9szv+tQCeeQoO19aqX2BjoL/YCM b5BGSSEziCozeMbB+VtonqKBLNBcMWW1Cl8oTGPZkSxBc0C9otEpOVwBJ9UDGIu8ydhM KSrGRVeJVfNW+swpvth3VTU35E6xpI/qX8tWTlPIXE4PXXoLI1dUSeTjX2Rel/W/t0jk DKww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724174232; x=1724779032; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I2hM9IXnWJCIXdGneHBR3ODZityq3OdYqAzA4dSYz3U=; b=g+usSgJoa5CqHfv2kR6/hkuIePrqqOb7ojC30hG3RNk4m4DLIqvs3C6FeCKUkZtb// pxMtbCL742YAkAqKAuUJU7JYcaVPPcthLrKYJQ3bAFzwTgpW6rEuTHYKOyK0RzT9yx4v 2p0eJSzkKP28OKXS8DgbWvEmzMpF2MBAeyJQ3YEuP0NxzphV2UMnD6JRdgdJsftQulY9 jI5ABtdIT5NVRE09bDksWhdqFowyI1zNmRTdGaCT0kbXChJ3qLszEIIwIIO6J+/JzOR0 eNWedfshapx3jf4sBPvWPbWekQ0vQsZcnWDAL2gGCwDUWCMHUzzNNfy+NGnRsaAAX+eB LlNw== X-Forwarded-Encrypted: i=1; AJvYcCUbPIw7NkaPC0fJFpZ3C9MgwR6rbBn8QKOPNSo3UxmunUtZl2EovD8gIG5LgJ5UCk3RLUBNxFbZGafiFRLFwqnk4wifjs5zcDed69WS7Jw4ISDq2us= X-Gm-Message-State: AOJu0Yzuw/vKZKGnhPLnGQetv/hVZqYMVRKsoSD9WEIV+6D5B536aPNZ eHq0RNdK2+f/jVvmmPxIBAxvG6PYEtNwfP5lwOz2ukniayNkZQAj X-Google-Smtp-Source: AGHT+IHS+4WBqpl7XNll/ytEzf6YHrvGP09TiR7krwtGsSYQlPFlo0KfVRx52A+btS5AqAL/na8UQw== X-Received: by 2002:a17:902:db10:b0:1fb:4a57:7cba with SMTP id d9443c01a7336-2031512dbbbmr29303395ad.34.1724174232313; Tue, 20 Aug 2024 10:17:12 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:bd02:d0ce:e791:dc08:a375]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201f0303285sm80066795ad.26.2024.08.20.10.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 10:17:11 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Mostafa Saleh , Will Deacon , Rob Clark , Robin Murphy , Joerg Roedel , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v7 2/4] iommu/io-pgtable-arm: Re-use the pgtable walk for iova_to_phys Date: Tue, 20 Aug 2024 10:16:45 -0700 Message-ID: <20240820171652.145673-3-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240820171652.145673-1-robdclark@gmail.com> References: <20240820171652.145673-1-robdclark@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240820_101713_980562_9D56DD36 X-CRM114-Status: GOOD ( 14.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Rob Clark Re-use the generic pgtable walk path. Signed-off-by: Rob Clark --- drivers/iommu/io-pgtable-arm.c | 73 +++++++++++++++++----------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index b4bc358740e0..5fa1274a665a 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -710,42 +710,6 @@ static size_t arm_lpae_unmap_pages(struct io_pgtable_ops *ops, unsigned long iov data->start_level, ptep); } -static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, - unsigned long iova) -{ - struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); - arm_lpae_iopte pte, *ptep = data->pgd; - int lvl = data->start_level; - - do { - /* Valid IOPTE pointer? */ - if (!ptep) - return 0; - - /* Grab the IOPTE we're interested in */ - ptep += ARM_LPAE_LVL_IDX(iova, lvl, data); - pte = READ_ONCE(*ptep); - - /* Valid entry? */ - if (!pte) - return 0; - - /* Leaf entry? */ - if (iopte_leaf(pte, lvl, data->iop.fmt)) - goto found_translation; - - /* Take it to the next level */ - ptep = iopte_deref(pte, data); - } while (++lvl < ARM_LPAE_MAX_LEVELS); - - /* Ran out of page tables to walk */ - return 0; - -found_translation: - iova &= (ARM_LPAE_BLOCK_SIZE(lvl, data) - 1); - return iopte_to_paddr(pte, data) | iova; -} - struct io_pgtable_walk_data { void *data; int (*visit)(struct io_pgtable_walk_data *walk_data, int lvl, @@ -760,6 +724,41 @@ static int __arm_lpae_iopte_walk(struct arm_lpae_io_pgtable *data, arm_lpae_iopte *ptep, int lvl); +struct iova_to_phys_data { + arm_lpae_iopte pte; + int lvl; +}; + +static int visit_iova_to_phys(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte pte, size_t size) +{ + struct iova_to_phys_data *data = walk_data->data; + data->pte = pte; + data->lvl = lvl; + return 0; +} + +static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, + unsigned long iova) +{ + struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); + struct iova_to_phys_data d; + struct io_pgtable_walk_data walk_data = { + .data = &d, + .visit = visit_iova_to_phys, + .addr = iova, + .end = iova + 1, + }; + int ret; + + ret = __arm_lpae_iopte_walk(data, &walk_data, data->pgd, data->start_level); + if (ret) + return 0; + + iova &= (ARM_LPAE_BLOCK_SIZE(d.lvl, data) - 1); + return iopte_to_paddr(d.pte, data) | iova; +} + static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, struct io_pgtable_walk_data *walk_data, arm_lpae_iopte *ptep, int lvl) @@ -776,7 +775,7 @@ static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, return 0; } - if (WARN_ON(!iopte_table(pte, lvl))) + if (WARN_ON(!iopte_table(pte, lvl) && !selftest_running)) return -EINVAL; ptep = iopte_deref(pte, data);