From patchwork Tue Aug 20 17:16:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 820657 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9985D18C92C; Tue, 20 Aug 2024 17:17:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724174232; cv=none; b=MqmpwaGQK5DCq9P7H7m96xJIXQTDrbFyAy1AcmMpzDBMz+OSsqjudcPL6O6cwUAywbeiNOEQAg5/K2ossIN866U+RMnVin1VjDNedHqc4UzuLaEI1jxXG2G2SQKRWtd5vsV+KBnfbp37ZJb3Z6XsWc4IsFNArnhMvvYpoOsnyEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724174232; c=relaxed/simple; bh=gsNmqsqpWlkSnSqqXuWBaAR43/2v0PTTdbTVqGv4gw0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BnlgzJLW1qvIKpRA7qVqZ8DksHbvHPHzodBIu6fYi+k1mqN8YMtS+VY/A+fI4csSGL75YDwsy3OYRKHKV0EsXWaFjyM+blwFoSiN2D//jW4EmoqhQ/uIUnxe1BSt9tCVHwbKepNj1jjImLdm8nK98BnJlPKr/P6MbZCk68IDea4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PB+qoEYr; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PB+qoEYr" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-70d1c655141so3748036b3a.1; Tue, 20 Aug 2024 10:17:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724174230; x=1724779030; darn=vger.kernel.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=3n/7p2U9ieS4fxPWTOeYgrS5HGZLrK9VdS3pHhqiNE0=; b=PB+qoEYr8O0GUEvZecLg/iDN7lXw7mdEQZKe1tn0OuDOK3zniP/fBpimYqq+TAlmnn rhuSZKyvI2kidx8GuIrePxOyUCKYAe5nk/7aSahs0cLv68DqSZMBYEMZ5lftLbZQOmc6 ykns5yHBwVIEBUsz8LP+2Ft7NiW5cKa+FlZWlF+eZfG2ceTf9tQkNcOXfRqatAOoInjh HwzLebZem9QB1tb8BL3j5BOvFoTe1lfn3+UG6iJbVTIWuKtm2ePnOp+FOp/Qh8Kfhim8 pwo/wATcKPdFbzfBIpOJ1YQM8ubdzL/KMS1yShXFJrBGpJ0whxQGkmWu3Nf/kpHFTSl+ dmqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724174230; x=1724779030; 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=3n/7p2U9ieS4fxPWTOeYgrS5HGZLrK9VdS3pHhqiNE0=; b=tc9hAAx2Jj0v8dlAvNRfq21nSFsBbvg9+4WZGu+b8nAl+fxndDpR87AcCoXb8sf2/o PIw9QRZuxa0x1t+nC75iXWqwJkBR4bnkOGv0P0Ev4mV6INBCuv/wuWCnzm3gXoNVpD9y RxHzyvPnmViSVoZ1KpX03Cghv8xynypac/o2R0P0d3AHrNsFfi8fggSxtHOdEaRpctIY RJ+D9B+M2ivyH9Psy+xky50iib9w4EONFeXbD22c2J14RX2uLCe+O23cOLdUt2eI09j3 VXY4GTQSZf58PoOTyBRf/Kamv/8KtN06xWb7JwYrrorTX1IYtOgO3BsZN0oZuXlgAfbc jcLg== X-Forwarded-Encrypted: i=1; AJvYcCWEiD+c8ixQB+t2kPizIPi4xB3vsGc21fpzWjcejHWRafVIBzv20npu9+/UMRYeS/MPzGdvCMH61td2OJ0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy6N777ppdgtbz/PZmbw4+/BwU5NDMwbyp8ckMuNRS9W14rPwqh HN66FMt4cqXc29wjtk5bBRH8+7Da/wfNbDWz0mHEyPMdLs4IiL20 X-Google-Smtp-Source: AGHT+IGN8V4SYWFCRpzsemtnMPx/Ae6udueJVGLrFDaSeEfYPszwWWE/tbOvS5tDdOuR5xJpXoGzfQ== X-Received: by 2002:a05:6a20:6f87:b0:1c4:dfa7:d3ce with SMTP id adf61e73a8af0-1cad7f954b6mr103988637.17.1724174229744; Tue, 20 Aug 2024 10:17:09 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:bd02:d0ce:e791:dc08:a375]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201f0379031sm80590295ad.159.2024.08.20.10.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 10:17:09 -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 1/4] iommu/io-pgtable-arm: Make pgtable walker more generic Date: Tue, 20 Aug 2024 10:16:44 -0700 Message-ID: <20240820171652.145673-2-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> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Rob Clark We can re-use this basic pgtable walk logic in a few places. Signed-off-by: Rob Clark --- drivers/iommu/io-pgtable-arm.c | 59 +++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index f5d9fd1f45bf..b4bc358740e0 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -747,33 +747,31 @@ static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, } struct io_pgtable_walk_data { - struct iommu_dirty_bitmap *dirty; + void *data; + int (*visit)(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte pte, size_t size); unsigned long flags; u64 addr; const u64 end; }; -static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_io_pgtable *data, - struct io_pgtable_walk_data *walk_data, - arm_lpae_iopte *ptep, - int lvl); +static int __arm_lpae_iopte_walk(struct arm_lpae_io_pgtable *data, + struct io_pgtable_walk_data *walk_data, + arm_lpae_iopte *ptep, + int lvl); -static int io_pgtable_visit_dirty(struct arm_lpae_io_pgtable *data, - struct io_pgtable_walk_data *walk_data, - arm_lpae_iopte *ptep, int lvl) +static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, + struct io_pgtable_walk_data *walk_data, + arm_lpae_iopte *ptep, int lvl) { struct io_pgtable *iop = &data->iop; arm_lpae_iopte pte = READ_ONCE(*ptep); if (iopte_leaf(pte, lvl, iop->fmt)) { size_t size = ARM_LPAE_BLOCK_SIZE(lvl, data); - - if (iopte_writeable_dirty(pte)) { - iommu_dirty_bitmap_record(walk_data->dirty, - walk_data->addr, size); - if (!(walk_data->flags & IOMMU_DIRTY_NO_CLEAR)) - iopte_set_writeable_clean(ptep); - } + int ret = walk_data->visit(walk_data, lvl, pte, size); + if (ret) + return ret; walk_data->addr += size; return 0; } @@ -782,13 +780,13 @@ static int io_pgtable_visit_dirty(struct arm_lpae_io_pgtable *data, return -EINVAL; ptep = iopte_deref(pte, data); - return __arm_lpae_iopte_walk_dirty(data, walk_data, ptep, lvl + 1); + return __arm_lpae_iopte_walk(data, walk_data, ptep, lvl + 1); } -static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_io_pgtable *data, - struct io_pgtable_walk_data *walk_data, - arm_lpae_iopte *ptep, - int lvl) +static int __arm_lpae_iopte_walk(struct arm_lpae_io_pgtable *data, + struct io_pgtable_walk_data *walk_data, + arm_lpae_iopte *ptep, + int lvl) { u32 idx; int max_entries, ret; @@ -803,7 +801,7 @@ static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_io_pgtable *data, for (idx = ARM_LPAE_LVL_IDX(walk_data->addr, lvl, data); (idx < max_entries) && (walk_data->addr < walk_data->end); ++idx) { - ret = io_pgtable_visit_dirty(data, walk_data, ptep + idx, lvl); + ret = io_pgtable_visit(data, walk_data, ptep + idx, lvl); if (ret) return ret; } @@ -811,6 +809,20 @@ static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_io_pgtable *data, return 0; } +static int visit_dirty(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte pte, size_t size) +{ + struct iommu_dirty_bitmap *dirty = walk_data->data; + + if (iopte_writeable_dirty(pte)) { + iommu_dirty_bitmap_record(dirty, walk_data->addr, size); + if (!(walk_data->flags & IOMMU_DIRTY_NO_CLEAR)) + iopte_set_writeable_clean(&pte); + } + + return 0; +} + static int arm_lpae_read_and_clear_dirty(struct io_pgtable_ops *ops, unsigned long iova, size_t size, unsigned long flags, @@ -819,7 +831,8 @@ static int arm_lpae_read_and_clear_dirty(struct io_pgtable_ops *ops, struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); struct io_pgtable_cfg *cfg = &data->iop.cfg; struct io_pgtable_walk_data walk_data = { - .dirty = dirty, + .data = dirty, + .visit = visit_dirty, .flags = flags, .addr = iova, .end = iova + size, @@ -834,7 +847,7 @@ static int arm_lpae_read_and_clear_dirty(struct io_pgtable_ops *ops, if (data->iop.fmt != ARM_64_LPAE_S1) return -EINVAL; - return __arm_lpae_iopte_walk_dirty(data, &walk_data, ptep, lvl); + return __arm_lpae_iopte_walk(data, &walk_data, ptep, lvl); } static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg) 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: 821039 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63B611C0DE4; Tue, 20 Aug 2024 17:17:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724174234; cv=none; b=Ur0d/SCQxwhc7HpgQzyJZRuBt7A1ManU3S8Ad9LSdTX+wd+MoKQ/Z4VuIyeNp+v6XD+KSwMHHeFZe7OKe8S5R4A2+EV/Sk+mKIN2I3TRJK2XuD0CE4/ioyupV4S5CC+JB18q/RrgIpIWB1lDgtm2sIg3O96LANDBRy97n/e9lVY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724174234; c=relaxed/simple; bh=Jw5M9yB4qk/y8Z61fR27dXsfwJ+4Xe2LxgetVa5nwvY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t7wjrf3RmPTNzqi1PdcSj0wS2fcbYidDF2e+j3hzz+cBpaH8m2iu/ivTs1Gjdqcc5aE+de7RSx9Gs7F5QmujvzUpYcMsKYqIesg13/o9alxJl3TR76XYpTBr5I3TISosnCC2fGKXPthif1uMaRuyWhsNK4qX3AWhkEFCrh2zBIE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=a9YBx/z5; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a9YBx/z5" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-20219a0fe4dso29775645ad.2; 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=vger.kernel.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=a9YBx/z5NQqbJx6rZwBM+2yoaviktNd5gonYjjWkay6jer+K3p6Cog5mPBHYjL0eT0 PurJi6y/4Cg8coKy/xQEU1Ckd3+CYMuyqL9YSZ/Qrmd4HOawl7Bx73cAM8GYTTnlIdR/ 3ocTkiw0fzy37eziGaFHZnzs+ltfw79a+9yC7cknCuoFEbYr/hfz27XOsQ31meX5juZC e4vVCAXt6wk9eIKpkUvc2TMTuSWcHYZWB5ypW+3vleCxIeGrXj71yUG6ntFGFTQDEKcb fQVtBKFl0zZM6Ra+tcGPlQHEK2h/ZeP2hsigVAYhjlw4mp+jO74/9fRBq+Qwcdg8whGh 8QUQ== 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=m7MRh9XGqlaKN5xQ38TbcZtEiUJgmWi0wYfUZudPRmZzVoZ/HCgzK69xaJuahwPeMA LIgpvHyDlJcX2McWhQLWZRtCi1Z5JOmVBsS5C0ctKdea3Rsx41K7Eq2mW7/K8WmQ9UgQ szUdIVhUXhzOhUXFp1plES7SmE/VCzUUeYcrhAhbLz8ZeQ9iNQYfPu5tJzKjmomoao0M snM5+0dlPstvjLs0Vr/XMF+JbkoICh7oCcmkCcrg22MxBsT/rSvRVE1ELsUuoKqNVOeo ibkrgpCgxyMT4b3PhfY3K7BLvkxuLjSmla8jzivRm2tXqlr6kwiRBKDVglT+8e+GzXQ7 IA3w== X-Forwarded-Encrypted: i=1; AJvYcCVzWuPAHzBuDzbKZZgBeitZdwYFTLa9glPbv2/lJ9RC9EqJ1zwp6DdevALPDF0XO8ogkbm12RiF2DMHDjs+U1jFpIMq1HU8hTxtpqPa X-Gm-Message-State: AOJu0YwSXc65gDNtcNa2amBts9bDI/Llz3/vTCirZk2+1yTttdS6jQwp I75fNP40f18pVXvDIcFRsYLZjGuAKh19xVSQo+C95yRev92uZfFI 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> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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); From patchwork Tue Aug 20 17:16:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 820656 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 965D61C5789; Tue, 20 Aug 2024 17:17:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724174238; cv=none; b=GzTcRGDQAss06E4NiQFIrjMxd3OskuEC6XbMbBtqKtYvAtogqXAUH/RllqhbuXE1bLArBzEGY0p4L9U2/3cSUBhLQemVfdwXrk9896l3of2pNbKbh4fkiIqeWTVC49sUnw8iMTrZkebXcHeCON9CZCJn0PsUyc9JCcZafOrQnzY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724174238; c=relaxed/simple; bh=+gseIl1zsUZZaTdCls9oXHT0YEdPWdsZsVsrwqAiYiM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pK5Xt6wCYvtHZPvuCqAktNMb+iY0A8chZqrruISQ2yo3HCXuQQ8SUO7+HQ6R2ap3HxATaU4p5jTUvRopsGPTUdT0Nq0Levr7D15Fh/zWWqh+4xEWOwVqg5dMyILsJ7Dp+ms6Ves6Bv0UryLPUfASDK1mWM/YVbwfVO2Rw3NHN0Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QtQOrm8V; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QtQOrm8V" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-202318c4f45so28803605ad.0; Tue, 20 Aug 2024 10:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724174236; x=1724779036; darn=vger.kernel.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=4fyhtVpDgygfT5fUkGsgqPbatgiu5TzPiPLAt109+iE=; b=QtQOrm8VTeHW76vs/DfNu/8L2ybLQ4XEoyjVFNAb1ci4SUBn4CyDAvaq0jAkWJhGnQ wG2iDR2g/WnbE2SIVpmc+ZEQZW97SQGvjrauisdSYj80A8UVxlWR3RgxR72dbtBN0L/J SzoMvgGoUFD4P8+zLTbcbEIrNCrn0hEaypIzWVHQX0yHCajkUouXhpIdxDeZpi4zEAVv kJXblAc2WO6C1cobb2dJuJQ68QC8ncZr69DyBXbZbEwtAVxNsH0/TMq5IVeLDP9UvVKC TPJp9bKLw6ycGC4ddEL3AGqzjr8gzcYKL+KB0l43jI0OG9g15/IK7HgdaXJJzUsmMyo4 K5gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724174236; x=1724779036; 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=4fyhtVpDgygfT5fUkGsgqPbatgiu5TzPiPLAt109+iE=; b=XbTdt+4V3dlkg1uL77tx8eQs2dTkxosbRnKgxanq1xRmqegpPRGRCLMpgGDhFOflPN tNsC5ZujWtRFOxBW39HUlcTrNVQZPF4HLjOpiSeAnestRaZSRSHHhXlzoC0jGwMKrybY +kvrlGstEcTQIk4ztkfwFe4rTrA0QHvfFUaa9K81wuLiORoncvyKw5cmxDDPEUedwc2N 4+5qlG6rF+2TAlaYGiVoZTHuJXoQ4Ia8kHWX9+bRjvaRflK+OCr80BUiU1gFzyd0/zOF Fx6rFX6lVFsSyWcaozETgz/CIRmyxr8G1/JJC3YcJiPNYC34/NionuQ+OtSOk/AGg/ua /e9w== X-Forwarded-Encrypted: i=1; AJvYcCUjMbuV/ozv1iW5lz1WD+mUSu+awcihfFmw4EYAq7TzJpM3cwd8sXAayI/taAZwvYi0PgkHzmcG79P1f5o=@vger.kernel.org X-Gm-Message-State: AOJu0Yyhxn0dc1D+9arGQEloPs2pIg9HgVuTvPqV08SogVd9ehUdbzUn yWh3e1PEeXCYfmE/hxZTO8VOPT1hqqjUo91xv/SYKYiZC68neKmm X-Google-Smtp-Source: AGHT+IG89nPNiTxJdoeWAd4I9+Nt1kCBeEpf+Ehrfj9fghEkvWbqdwi+s8kDEywa2ecTlYbOssqipA== X-Received: by 2002:a17:902:e549:b0:202:671:e5bd with SMTP id d9443c01a7336-2020671f9b0mr167387315ad.42.1724174235653; Tue, 20 Aug 2024 10:17:15 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:bd02:d0ce:e791:dc08:a375]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201f038b303sm80401575ad.192.2024.08.20.10.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 10:17:15 -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 , Jason Gunthorpe , Kevin Tian , Joao Martins , Boris Brezillon , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v7 3/4] iommu/io-pgtable-arm: Add way to debug pgtable walk Date: Tue, 20 Aug 2024 10:16:46 -0700 Message-ID: <20240820171652.145673-4-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> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Rob Clark Add an io-pgtable method to walk the pgtable returning the raw PTEs that would be traversed for a given iova access. Signed-off-by: Rob Clark --- drivers/iommu/io-pgtable-arm.c | 25 +++++++++++++++++++++++++ include/linux/io-pgtable.h | 15 +++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 5fa1274a665a..a666ee03de47 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -759,6 +759,30 @@ static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, return iopte_to_paddr(d.pte, data) | iova; } +static int visit_pgtable_walk(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte pte, size_t size) +{ + struct arm_lpae_io_pgtable_walk_data *data = walk_data->data; + data->ptes[data->level++] = pte; + return 0; +} + +static int arm_lpae_pgtable_walk(struct io_pgtable_ops *ops, unsigned long iova, + void *wd) +{ + struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); + struct io_pgtable_walk_data walk_data = { + .data = wd, + .visit = visit_pgtable_walk, + .addr = iova, + .end = iova + 1, + }; + + ((struct arm_lpae_io_pgtable_walk_data *)wd)->level = 0; + + return __arm_lpae_iopte_walk(data, &walk_data, data->pgd, data->start_level); +} + static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, struct io_pgtable_walk_data *walk_data, arm_lpae_iopte *ptep, int lvl) @@ -928,6 +952,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg) .unmap_pages = arm_lpae_unmap_pages, .iova_to_phys = arm_lpae_iova_to_phys, .read_and_clear_dirty = arm_lpae_read_and_clear_dirty, + .pgtable_walk = arm_lpae_pgtable_walk, }; return data; diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h index f9a81761bfce..76eabd890e6a 100644 --- a/include/linux/io-pgtable.h +++ b/include/linux/io-pgtable.h @@ -174,12 +174,26 @@ struct io_pgtable_cfg { }; }; +/** + * struct arm_lpae_io_pgtable_walk_data - information from a pgtable walk + * + * @ptes: The recorded PTE values from the walk + * @level: The level of the last PTE + * + * @level also specifies the last valid index in @ptes + */ +struct arm_lpae_io_pgtable_walk_data { + u64 ptes[4]; + int level; +}; + /** * struct io_pgtable_ops - Page table manipulation API for IOMMU drivers. * * @map_pages: Map a physically contiguous range of pages of the same size. * @unmap_pages: Unmap a range of virtually contiguous pages of the same size. * @iova_to_phys: Translate iova to physical address. + * @pgtable_walk: (optional) Perform a page table walk for a given iova. * * These functions map directly onto the iommu_ops member functions with * the same names. @@ -193,6 +207,7 @@ struct io_pgtable_ops { struct iommu_iotlb_gather *gather); phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops, unsigned long iova); + int (*pgtable_walk)(struct io_pgtable_ops *ops, unsigned long iova, void *wd); int (*read_and_clear_dirty)(struct io_pgtable_ops *ops, unsigned long iova, size_t size, unsigned long flags, From patchwork Tue Aug 20 17:16:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 821038 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF1E61C57B6; Tue, 20 Aug 2024 17:17:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724174241; cv=none; b=JYidbbPMqstC8tOKbfFofa0famdCYDInAmP2Qe3jyC4IXxD6AEGpFvKFYHqLnHuEaM5HT1XtazjzOOBWKL1qlyC8totNIncm/IBhM8rNalV2jknkJ+URsTM/mwmfu6OKcNIPGbq2gFogComG4ejmAofa/sR/30iW+wUyB/bl4H8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724174241; c=relaxed/simple; bh=Z9rdbPQfURPCIg572NnKyoFcQ2uLzoi++cMrYqDlAP4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UWePaH8tGv94FqPmrT/vbSQPkx5Cl3xZqByMNW4pL/3ECh6lck02ISHmvUhmPUJTg3UIeMAjbd3p0x2ALSVJ0mkMCrDsXXeUP6fjPHB1YVmIyHOoT58KWdMC2JaDQ88+Wo5lKT+D4Pgi9q0AIgK4lDm7HRryzBxPDYjlv7cCrjE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=h2lfQG5i; arc=none smtp.client-ip=209.85.215.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h2lfQG5i" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-7c3e1081804so3803571a12.3; Tue, 20 Aug 2024 10:17:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724174239; x=1724779039; darn=vger.kernel.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=Cgk9ZwZd91vOVt90fIiETgBR9DeXKbUMnWSmPau0W5M=; b=h2lfQG5iLKB50uFyEimtu7e4eiknxX2lMbZ6OZ0Q5wjdQRLEkGo4Fzsf4NyVTBgJzJ UsDWvl8+MmVllnyKhZa87dVn8ah8JwprJ3Pm9JhgmpAI2Na8JFB+xDTPknLb6o/yv4xG NFvLCvuEUvu4ANmpiL67T4J93i1Gb1ToUKg6h+mUuBNP4pp5rS5q9YSScrhfIl6/qSaC cwQ9xcbmyrj4mJqS0A9gf7qhT191NPw9RnCnYML5K8qeYrNEacEzebVUVvtMvu23wd5j xptRoxVt6X+JI6ituAG5/rlvaicDoLYF2sj30vfVUZOx2VOZP7dpaQZacaq3z8lqnruX Gikg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724174239; x=1724779039; 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=Cgk9ZwZd91vOVt90fIiETgBR9DeXKbUMnWSmPau0W5M=; b=a/W6lZlgJqlyGZDhBKsZBS6oT/90AWHZvgPoMErR1u0D5NIMHE8HPffmAyCqjMgzvT Ze2sLe2AMuHrbHFF6wp4EqCdEEK6k1kfFJvJkgvFM1Bsc8Hjo47IHR8GBIjQIF1XXOYm wCxt0HzzOvWV9xpJxnwaqt4zSPGsXrGl2Yy8dFGCRRPnvbmtJt4n5bd6YDQdccugZkND 0v66JJw4BRRtEZBhAFbcJAYO70eFysVCa6E14YnphifLqNxoD5G7XP315K7wEzytFuiB kVlmxzooWy4axV/M106RgbajtN7ozMaBbgOnILEhnm7j068+R2nBedDRrVqCdeH1NMYd F37Q== X-Forwarded-Encrypted: i=1; AJvYcCXyIH6X+Dso4TR1RxMKE8lrJai6nkvCu+w1I9Jcy4Z2Lt10eIEDLmPIm6nNZ3Y1R5jiug4urHzG3ciC4vw=@vger.kernel.org X-Gm-Message-State: AOJu0YzH2NaAYj6mFP0+rNfEN/gz5huq0AD4ZNnmTEJn6AWaUO9FFVaZ vlPUHmt3obEEtuFdWy9hFGbsNCfunH+ms4FezIPWFTArwnHdWYrs X-Google-Smtp-Source: AGHT+IHI26fB0WIha9n2VpoDB3gNbAzXEFUKKhDiDd4EqEbe3tk4Z7K0Zq6OmEacRndMZ8/g3UT0lQ== X-Received: by 2002:a17:90a:ec0d:b0:2c9:8020:1b51 with SMTP id 98e67ed59e1d1-2d3dfdaadafmr14286329a91.3.1724174238747; Tue, 20 Aug 2024 10:17:18 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:bd02:d0ce:e791:dc08:a375]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d3c0b87dc8sm11779778a91.38.2024.08.20.10.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 10:17:17 -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 , Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org (open list:DRM DRIVER for Qualcomm Adreno GPUs), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v7 4/4] drm/msm: Extend gpu devcore dumps with pgtbl info Date: Tue, 20 Aug 2024 10:16:47 -0700 Message-ID: <20240820171652.145673-5-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> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Rob Clark In the case of iova fault triggered devcore dumps, include additional debug information based on what we think is the current page tables, including the TTBR0 value (which should match what we have in adreno_smmu_fault_info unless things have gone horribly wrong), and the pagetable entries traversed in the process of resolving the faulting iova. Signed-off-by: Rob Clark Reviewed-by: Akhil P Oommen --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 10 ++++++++++ drivers/gpu/drm/msm/msm_gpu.c | 9 +++++++++ drivers/gpu/drm/msm/msm_gpu.h | 8 ++++++++ drivers/gpu/drm/msm/msm_iommu.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/msm/msm_mmu.h | 3 ++- 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 1c6626747b98..3848b5a64351 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -864,6 +864,16 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state, drm_printf(p, " - dir=%s\n", info->flags & IOMMU_FAULT_WRITE ? "WRITE" : "READ"); drm_printf(p, " - type=%s\n", info->type); drm_printf(p, " - source=%s\n", info->block); + + /* Information extracted from what we think are the current + * pgtables. Hopefully the TTBR0 matches what we've extracted + * from the SMMU registers in smmu_info! + */ + drm_puts(p, "pgtable-fault-info:\n"); + drm_printf(p, " - ttbr0: %.16llx\n", (u64)info->pgtbl_ttbr0); + drm_printf(p, " - asid: %d\n", info->asid); + drm_printf(p, " - ptes: %.16llx %.16llx %.16llx %.16llx\n", + info->ptes[0], info->ptes[1], info->ptes[2], info->ptes[3]); } drm_printf(p, "rbbm-status: 0x%08x\n", state->rbbm_status); diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 3666b42b4ecd..bf2f8b2a7ccc 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -281,6 +281,15 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, if (submit) { int i; + if (state->fault_info.ttbr0) { + struct msm_gpu_fault_info *info = &state->fault_info; + struct msm_mmu *mmu = submit->aspace->mmu; + + msm_iommu_pagetable_params(mmu, &info->pgtbl_ttbr0, + &info->asid); + msm_iommu_pagetable_walk(mmu, info->iova, info->ptes); + } + state->bos = kcalloc(submit->nr_bos, sizeof(struct msm_gpu_state_bo), GFP_KERNEL); diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 1f02bb9956be..82e838ba8c80 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -101,6 +101,14 @@ struct msm_gpu_fault_info { int flags; const char *type; const char *block; + + /* Information about what we think/expect is the current SMMU state, + * for example expected_ttbr0 should match smmu_info.ttbr0 which + * was read back from SMMU registers. + */ + phys_addr_t pgtbl_ttbr0; + u64 ptes[4]; + int asid; }; /** diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c index 2a94e82316f9..3e692818ba1f 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -195,6 +195,28 @@ struct iommu_domain_geometry *msm_iommu_get_geometry(struct msm_mmu *mmu) return &iommu->domain->geometry; } +int +msm_iommu_pagetable_walk(struct msm_mmu *mmu, unsigned long iova, uint64_t ptes[4]) +{ + struct msm_iommu_pagetable *pagetable; + struct arm_lpae_io_pgtable_walk_data wd = {}; + + if (mmu->type != MSM_MMU_IOMMU_PAGETABLE) + return -EINVAL; + + pagetable = to_pagetable(mmu); + + if (!pagetable->pgtbl_ops->pgtable_walk) + return -EINVAL; + + pagetable->pgtbl_ops->pgtable_walk(pagetable->pgtbl_ops, iova, &wd); + + for (int i = 0; i < ARRAY_SIZE(wd.ptes); i++) + ptes[i] = wd.ptes[i]; + + return 0; +} + static const struct msm_mmu_funcs pagetable_funcs = { .map = msm_iommu_pagetable_map, .unmap = msm_iommu_pagetable_unmap, diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h index 88af4f490881..96e509bd96a6 100644 --- a/drivers/gpu/drm/msm/msm_mmu.h +++ b/drivers/gpu/drm/msm/msm_mmu.h @@ -53,7 +53,8 @@ static inline void msm_mmu_set_fault_handler(struct msm_mmu *mmu, void *arg, struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent); int msm_iommu_pagetable_params(struct msm_mmu *mmu, phys_addr_t *ttbr, - int *asid); + int *asid); +int msm_iommu_pagetable_walk(struct msm_mmu *mmu, unsigned long iova, uint64_t ptes[4]); struct iommu_domain_geometry *msm_iommu_get_geometry(struct msm_mmu *mmu); #endif /* __MSM_MMU_H__ */