From nobody Fri Dec 19 10:36:47 2025 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 805791D415D for ; Tue, 27 Aug 2024 18:17:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724782647; cv=none; b=sOGN55/ZjSVHcaiYxtyVNMLnpZ5wO4c/6qdj8fUTZRa5DdB23izxD1IjWUAEbDB2aMfJYkHL4x007mOqc+fcnDHPIgsX59SSjTZS9sSGY30NuHEe7n2Xpv/uBblN+kQ8HZV/YeR1teec0h9XPDeDjsBkJrhUgoJsOey48w3IfgM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724782647; c=relaxed/simple; bh=IHBkbRTSRs1I3VQNuuBQURPtkVM0/9Lbyd7rf++i6iU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ngRu314uUhYEZ76GSVmiIuL4nVa3Zt0aY1UOUaww7Jm0xbKmI3PL00lIym/JPAODyhz1tWToJ2Lqc0nucOTSFABSKCfE3abhWfcyZPJx73AVhROdfyFcrnP5SBVBBi61hYFePHrH4Ni6h7S/fYLLpWDbZKz77dUQGOOOKTYkJBE= 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=ZrJ+aa8z; arc=none smtp.client-ip=209.85.210.169 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="ZrJ+aa8z" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-7140ff4b1e9so4606994b3a.3 for ; Tue, 27 Aug 2024 11:17:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724782645; x=1725387445; 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=aKDm3s2TCTU5rY2IssAZFvBpqQYJOpn3EVObKPXkHYI=; b=ZrJ+aa8znpX+iIo+Fr5SaF28HAaaVtfzXkHaEVgsgXm9wwzheyfjVccOfHnMxuwaVZ XRIxdqc8t3vAATfpv1tWCOLj9HVOruTVhMUh+ohR6U/5eyGElV+2ZhpPok8YNkOqBRlj lCGdXuSqQIGQDHNX2izpSRSnn4bn/7ztcdK8iv6CY8GsprZ3QG01671SvnSD6huArPpu zysiCH5Zgkc6aVoamvjvaKT5DpK096PKX5dkXwGyn7gTvxa8KuFrsd+Z8f8uLdmliZs4 a5LjkCGAY5o9a6O2gLyc4B+7rSPohvXcOc/IORJhIFB5hRAkfSzvDpwfuV1fkqqleRti vy9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724782645; x=1725387445; 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=aKDm3s2TCTU5rY2IssAZFvBpqQYJOpn3EVObKPXkHYI=; b=rwzSWFSXn9GaQWy+d7b7Jax9rWQR0+Gy7G1mgFUSj0M/e+HvvBFSDoso0D3CP0jeu3 7fy5dR2KLTr6q8gLyCmoPtxR2MlcqTpbC05Mbb2fBbX1v1hnacntREel1yYZzjhOBero FaoDna/ntiCQncj3GQZaPogSj5I8n49KuuPn0K2GJwQS6DOHNsrkiIhe8o2Tb16WncZy BFDfCtqaNSUqY04qdbnLW0HF1ZyKyKkoCgCoeV3QUy1dlC0q88kT646vxsRrgViFEbgu CWxxbWg4k1kaKPQpDuBAjmncUr0pTxTAEAmQAEu22xZBMWBrRCSztEx7M1ChLjO49rbm TWaA== X-Forwarded-Encrypted: i=1; AJvYcCWhxzbBrrDwiFZ/iXbiItok3JmsAdOSUbjkAfl+zzO6dvlI2eTtOeolau13++4TruRkfQ3xAqZ7o23Z9qY=@vger.kernel.org X-Gm-Message-State: AOJu0YxDwC3Fy4QK7pyc2RhWrcgAIip/cNeAL2juHCdAMD0UoRuRr2J1 W6Pdrv9bQ2ovcGwrfDjnm8bUfm4oShN/UFr+xfodhCFAm9IgSJe8 X-Google-Smtp-Source: AGHT+IEdQtuPGHWLGK9dVGESUarAI6mwcJzwOmeoDY/at/WLDRJDTKjtiierrP3Jt3uEQb5wm9aMDQ== X-Received: by 2002:a05:6a00:3cd2:b0:714:1bcf:3d93 with SMTP id d2e1a72fcca58-715bff709c3mr4918008b3a.5.1724782644533; Tue, 27 Aug 2024 11:17:24 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-714342316e8sm9196285b3a.16.2024.08.27.11.17.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2024 11:17:23 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: Will Deacon , Robin Murphy , Rob Clark , Joerg Roedel , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 1/4] iommu/io-pgtable-arm: Make pgtable walker more generic Date: Tue, 27 Aug 2024 11:17:09 -0700 Message-ID: <20240827181717.187245-2-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827181717.187245-1-robdclark@gmail.com> References: <20240827181717.187245-1-robdclark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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..0132f1eff688 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_pg= table_ops *ops, } =20 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 *ptep, size_t size); unsigned long flags; u64 addr; const u64 end; }; =20 -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); =20 -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 =3D &data->iop; arm_lpae_iopte pte =3D READ_ONCE(*ptep); =20 if (iopte_leaf(pte, lvl, iop->fmt)) { size_t size =3D 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 =3D walk_data->visit(walk_data, lvl, ptep, size); + if (ret) + return ret; walk_data->addr +=3D size; return 0; } @@ -782,13 +780,13 @@ static int io_pgtable_visit_dirty(struct arm_lpae_io_= pgtable *data, return -EINVAL; =20 ptep =3D 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); } =20 -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, =20 for (idx =3D ARM_LPAE_LVL_IDX(walk_data->addr, lvl, data); (idx < max_entries) && (walk_data->addr < walk_data->end); ++idx) { - ret =3D io_pgtable_visit_dirty(data, walk_data, ptep + idx, lvl); + ret =3D 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; } =20 +static int visit_dirty(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte *ptep, size_t size) +{ + struct iommu_dirty_bitmap *dirty =3D walk_data->data; + + if (iopte_writeable_dirty(*ptep)) { + iommu_dirty_bitmap_record(dirty, walk_data->addr, size); + if (!(walk_data->flags & IOMMU_DIRTY_NO_CLEAR)) + iopte_set_writeable_clean(ptep); + } + + 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_pgta= ble_ops *ops, struct arm_lpae_io_pgtable *data =3D io_pgtable_ops_to_data(ops); struct io_pgtable_cfg *cfg =3D &data->iop.cfg; struct io_pgtable_walk_data walk_data =3D { - .dirty =3D dirty, + .data =3D dirty, + .visit =3D visit_dirty, .flags =3D flags, .addr =3D iova, .end =3D iova + size, @@ -834,7 +847,7 @@ static int arm_lpae_read_and_clear_dirty(struct io_pgta= ble_ops *ops, if (data->iop.fmt !=3D ARM_64_LPAE_S1) return -EINVAL; =20 - return __arm_lpae_iopte_walk_dirty(data, &walk_data, ptep, lvl); + return __arm_lpae_iopte_walk(data, &walk_data, ptep, lvl); } =20 static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg) --=20 2.46.0 From nobody Fri Dec 19 10:36:47 2025 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 2FC1C1D4176 for ; Tue, 27 Aug 2024 18:17:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724782649; cv=none; b=O1hvNJ+GSVU9oBF66NzsrNCjnyT5Q73UVIqI2dslo3saExzUgA7F4fHnXeZ7t7pJRsqouMt3Lfs0J4CEfh+ZM71F/853YJq0iIM5+fkp4Ou+hdABDlPvODRbqS/tv6B7TlDJbmJcoIj/xYXm5BBAF2LFZUFeSUhqCytjzfivEhI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724782649; c=relaxed/simple; bh=0Rk9V2/hD0rJcjKDKxzcXvMS10n5ckBqPtI6KzWqjaU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tDkZAkFzCabpQWfvo1fKlvpJuF7AmZnRldur+xEvuHKyrJ3UETJk97fx51nNSCyrtKC0Se3p0gdQfgms7csXj6zOxK0k0qSdZI5f4mp9Ke6IKLkDQuMEx1qElOKjDgoILUTuXdld1Ejt42+xoAOU8DVwQNHhvBeh9c4aAegMayI= 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=badvCDmQ; arc=none smtp.client-ip=209.85.214.170 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="badvCDmQ" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-204f52fe74dso641385ad.1 for ; Tue, 27 Aug 2024 11:17:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724782647; x=1725387447; 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=VlnDL4DTfIpU6WguUty7oq+VmfQ4+6diTuDRQNVtIjA=; b=badvCDmQ9hq73FnLCsWSibnLEex+cMYmA0VT4SnF9SynduqXo8+XTohJ0f/AZxHwL4 /joB73bHzFZfp0ThcAisSCPRNUNLCFIfchoAftz908Wo2Pn6qtvt2V8OSKfpZftrCbYC TfZn3OY1B6ERFDlsIWumvBmaGAbsNEgeeC/dArVykNpLXnzzKv/tpK+Cx0J7jBBBfPus BP+BXjkqhXRoNMascwGeT8Sfg/OeZEOhzbrMuY1HkRwQYj1g3JTiKvTWSV/xrI+p75bQ CdmGOEmLF1yB1MLVAbOrhNmMjMqvnO6N82eQBwYx+eAL2raS93SyARpMYTPnco7ABx3b zWiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724782647; x=1725387447; 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=VlnDL4DTfIpU6WguUty7oq+VmfQ4+6diTuDRQNVtIjA=; b=k47Bn9gSqUJXRrSs73UM64HDLYFqVx1l5oqnoo7G+ZGTRAa/YAbqb3pShlo77xDPxW GBKhtUJ/rtwp4F1JTR4earmmVa+7A9MAq7oiIL2EFRvYDrx8wYSIBs8XVERdn8MSmIpC +9srOtJqYpNg3h2EMsTVgZpCwhLC5U4Q7h81V0TacfcsAWPu/lJr8tjuKzYohIEDdV+X zLG0XhD56iCCPzf5KRvCNZmhhslgOeFg02+YykWYqkMm3C0gxVxes68m0ALMXvMW5XdG X0/tFERHbjBzbbAbBI2CUyK/2OdZS4y0AOywkM3fvprZ0k5vbBwL8uoC+f6eQprL10Ux F9+Q== X-Forwarded-Encrypted: i=1; AJvYcCX1T+3rxqyYtC8TdEkWMWqmp3ewJVNzpQNhBx2YoYdCSf8QVaA8EIgYq6+xmAG4b62/dNR5xIhdjYoCFaw=@vger.kernel.org X-Gm-Message-State: AOJu0YyIfMioVHsH2hOJpWJNZPz4ssADDbY0F+zq774V8tzqRCQYHed5 Io/fpbkIJmfryq8/nF58W1cqnAJQAPvEwPm0hvRlclAf5LQWBwWF X-Google-Smtp-Source: AGHT+IH740SM6E9kgQZAZ/5lLwngeaj4TPfrfm6aQ5M9xb8MdaSEXtw7CS0r0ewtH7ZBKZzhgIkHbQ== X-Received: by 2002:a17:902:f60a:b0:203:a279:a144 with SMTP id d9443c01a7336-204df45d558mr40520575ad.25.1724782647112; Tue, 27 Aug 2024 11:17:27 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20385566551sm86532335ad.13.2024.08.27.11.17.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2024 11:17:26 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: Will Deacon , Robin Murphy , Rob Clark , Joerg Roedel , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 2/4] iommu/io-pgtable-arm: Re-use the pgtable walk for iova_to_phys Date: Tue, 27 Aug 2024 11:17:10 -0700 Message-ID: <20240827181717.187245-3-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827181717.187245-1-robdclark@gmail.com> References: <20240827181717.187245-1-robdclark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Rob Clark Re-use the generic pgtable walk path. Signed-off-by: Rob Clark --- drivers/iommu/io-pgtable-arm.c | 75 +++++++++++++++++----------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 0132f1eff688..efed8e519111 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_o= ps *ops, unsigned long iov data->start_level, ptep); } =20 -static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, - unsigned long iova) -{ - struct arm_lpae_io_pgtable *data =3D io_pgtable_ops_to_data(ops); - arm_lpae_iopte pte, *ptep =3D data->pgd; - int lvl =3D data->start_level; - - do { - /* Valid IOPTE pointer? */ - if (!ptep) - return 0; - - /* Grab the IOPTE we're interested in */ - ptep +=3D ARM_LPAE_LVL_IDX(iova, lvl, data); - pte =3D 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 =3D iopte_deref(pte, data); - } while (++lvl < ARM_LPAE_MAX_LEVELS); - - /* Ran out of page tables to walk */ - return 0; - -found_translation: - iova &=3D (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_pg= table *data, arm_lpae_iopte *ptep, int lvl); =20 +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 *ptep, size_t size) +{ + struct iova_to_phys_data *data =3D walk_data->data; + data->pte =3D *ptep; + data->lvl =3D 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 =3D io_pgtable_ops_to_data(ops); + struct iova_to_phys_data d; + struct io_pgtable_walk_data walk_data =3D { + .data =3D &d, + .visit =3D visit_iova_to_phys, + .addr =3D iova, + .end =3D iova + 1, + }; + int ret; + + ret =3D __arm_lpae_iopte_walk(data, &walk_data, data->pgd, data->start_le= vel); + if (ret) + return 0; + + iova &=3D (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,8 +775,10 @@ static int io_pgtable_visit(struct arm_lpae_io_pgtable= *data, return 0; } =20 - if (WARN_ON(!iopte_table(pte, lvl))) + if (!iopte_table(pte, lvl)) { + WARN_ON(!selftest_running); return -EINVAL; + } =20 ptep =3D iopte_deref(pte, data); return __arm_lpae_iopte_walk(data, walk_data, ptep, lvl + 1); --=20 2.46.0 From nobody Fri Dec 19 10:36:47 2025 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 ACC001D4604 for ; Tue, 27 Aug 2024 18:17:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724782654; cv=none; b=LyEzhz+byVfbfVnoyqtReN62/EdbzfzX8xOvs0LEwC7D0rlYYhP8GNPIyf9w6JQX6DLCmxntUNZfmFi0jkp+PydH3R8I1MwVGDkjVdJOgT2wxQsmm007IYL48wRoH7oWgl6emVpoLw0ZkIPTR+fmIoMnyGNEqsCmBXBIIxjdiJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724782654; c=relaxed/simple; bh=I90NUqSplO+OUpgx4frtAQS27LaYivRbF8zKE+14v70=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PiU6aDqkcE5irFrc1ush4sCGRq5lyU3dpZ5GLnQpPFirvewZKpCS8DpBQ7zKK8+rsGmLB+aNPW4ordlDdwaxjL4QsKJ9T4dgien2e08joDehOUpop81sFusXHRXClWidopmPqjSLyqk9HJB9oB9uzyUVpzppXbo3iY8o5TrKhNU= 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=PyS0z200; arc=none smtp.client-ip=209.85.214.176 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="PyS0z200" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-20230059241so48683475ad.3 for ; Tue, 27 Aug 2024 11:17:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724782651; x=1725387451; 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=VLUmHTIZzlGw27lOXBe2/x1CsKIYYG9Yp6GcbVarkT4=; b=PyS0z200nGIb5pMlYzDB1sVW51v6fHobvhRyQbtse7PtK+JFIxX4eAHnSv41NB3bAI WqMUL76aWGHJZ+bWfjV7v8bVDrzIlmSZOzd/gRtSoYspMTBEPBUM8gc7DplrHHKA0ucr bCzxMF51ljD4rWJcdVlpy8XeicJdpnF8L6xuXQ5DulX1guKgQV4eLYHbzSFoMwLBrb61 ECTBz4osn1pC626MCwIgpCUkTI9lyFvIhWTOWrd9pxyFl8C6qbIAzMFTgGN6RxS+HQQ0 KF/rVk5MTmzFA3nQCwzBDbDibVMMDCRAuz9UMnGHWFqj0mfbyPnZjEf2f5ExiYv/ttBw miaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724782651; x=1725387451; 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=VLUmHTIZzlGw27lOXBe2/x1CsKIYYG9Yp6GcbVarkT4=; b=P33w9cdiBDlHHMBL7AEu2TMnrF6eImoGNDzP5ba2Z7/WJRS5bjejEgkC+bH4nrRZeJ y9O+DDZVbGlu9/hPoPc9pOYpXImZNVMzSAeF9duCHjzG4EVXwM3IkcaNMJ5sGLM3eZC4 rRmiiM9Ub2V90SGB4Egs9siC1mjw+UuBrQiCMg61wMlqqCMwGNraIZH0yfoMOixwvAc4 Me8PQ0vJjzaXY4WPLeuNh3mVZ1F5RWggLiUoNxeytf7v+oCINmXWDjjx/id+XuwpSu+e UamQ/i9nzLySeyPlInRxqH4srArgmCix/vJOvPyyEEDnHdwY1BSI6C7Ma1TdhUcDHlBr NzdQ== X-Forwarded-Encrypted: i=1; AJvYcCU7dbeOAXoeIWMihc9Nlvj8He+gKvtIgVjWzozyL/mMWlB/jCb7WYAYLjtF9NyjFCnebBdA3w9aZBEIDbU=@vger.kernel.org X-Gm-Message-State: AOJu0YxbAkqFqOge5UnUUxjk3uHnBDAF89epWl6+DhFesuJt6lUlXlVC ZDAveIEH9XZEovwzGDZOX+IaDcDzdPriRGSM12aPwfY796ceaBiI X-Google-Smtp-Source: AGHT+IHYyoolcYxZtR5c29wHJT7jmBszW3F5rBHLKaZnAGuTG+FmizoxCTxOLMcJ10P4+O/V0/dwMA== X-Received: by 2002:a17:902:ce0c:b0:203:a0c3:b342 with SMTP id d9443c01a7336-203a0c3b4a4mr132648915ad.9.1724782650615; Tue, 27 Aug 2024 11:17:30 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20385704048sm85663225ad.215.2024.08.27.11.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2024 11:17:29 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: Will Deacon , Robin Murphy , Rob Clark , Joerg Roedel , Jason Gunthorpe , Joao Martins , Kevin Tian , Steven Price , Lu Baolu , Boris Brezillon , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 3/4] iommu/io-pgtable-arm: Add way to debug pgtable walk Date: Tue, 27 Aug 2024 11:17:11 -0700 Message-ID: <20240827181717.187245-4-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827181717.187245-1-robdclark@gmail.com> References: <20240827181717.187245-1-robdclark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 efed8e519111..11af49119f37 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_pgt= able_ops *ops, return iopte_to_paddr(d.pte, data) | iova; } =20 +static int visit_pgtable_walk(struct io_pgtable_walk_data *walk_data, int = lvl, + arm_lpae_iopte *ptep, size_t size) +{ + struct arm_lpae_io_pgtable_walk_data *data =3D walk_data->data; + data->ptes[data->level++] =3D *ptep; + return 0; +} + +static int arm_lpae_pgtable_walk(struct io_pgtable_ops *ops, unsigned long= iova, + void *wd) +{ + struct arm_lpae_io_pgtable *data =3D io_pgtable_ops_to_data(ops); + struct io_pgtable_walk_data walk_data =3D { + .data =3D wd, + .visit =3D visit_pgtable_walk, + .addr =3D iova, + .end =3D iova + 1, + }; + + ((struct arm_lpae_io_pgtable_walk_data *)wd)->level =3D 0; + + return __arm_lpae_iopte_walk(data, &walk_data, data->pgd, data->start_lev= el); +} + static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, struct io_pgtable_walk_data *walk_data, arm_lpae_iopte *ptep, int lvl) @@ -930,6 +954,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg) .unmap_pages =3D arm_lpae_unmap_pages, .iova_to_phys =3D arm_lpae_iova_to_phys, .read_and_clear_dirty =3D arm_lpae_read_and_clear_dirty, + .pgtable_walk =3D arm_lpae_pgtable_walk, }; =20 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 { }; }; =20 +/** + * 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 s= ize. * @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, --=20 2.46.0 From nobody Fri Dec 19 10:36:47 2025 Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) (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 BCB691D4608; Tue, 27 Aug 2024 18:17:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724782656; cv=none; b=lc4WMjKF7x8DAzlljMVTjS8C7SBFmuNYtO4/LnyUWUUBj6QvYQJYIPKFk1dVCuVDnsHWZTFDbmTuTyzX8ZPsxEF5k91LaFqXXeSnFg75ooggn5d/2FeD4PStG5uBB4u5uFMLvCYR3iYHEtg0KrlwQS6L8yNfb0qYPgcMoN5H69w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724782656; c=relaxed/simple; bh=Z9rdbPQfURPCIg572NnKyoFcQ2uLzoi++cMrYqDlAP4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=acYygBVZSm/yvlce6OZEISGrx9kqBlmseOoxeLL6yu0Wy4Umx1Si+SvhW2ijY3Qy9orGRenUVmn/3zu6gtdVZw9+DJk1vALdXzqk9JPcFcvwNUtSbrTW0UjtmC2JscsXcQwaT+Ztfzt37lu6hs2R3cDZHNdYTVdo0X5ENdxRbaw= 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=ZyD6V9Yu; arc=none smtp.client-ip=209.85.166.174 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="ZyD6V9Yu" Received: by mail-il1-f174.google.com with SMTP id e9e14a558f8ab-39e6b1ab200so1050255ab.0; Tue, 27 Aug 2024 11:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724782654; x=1725387454; 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=ZyD6V9YuWzZ2+6YJGYwEoTHggJ6+FFNoviksh9+aaaVAkbj7LGkSO1AMoVtXim8jmj FFb88a7JGN//+NGgA7FYbqPx5vmMfWtZm5Jt8iS7vDRr6o1u/In8zSBk2Yhl7FIMcAcM jO4ojQ3Cz29h/Auh0ORVFlJqLoxaJgod+0K5mboY5DPPiJojk7PD8cPnB4vqRrrqau8Z 2ylqL8YQbZU+0OnLTu3fvWtFbbITcR+ToDRMQ7qk7phYVBKY8I1BAgz1Xdd6SkZR04Vj h3vo/kADVyNCBciDl535kSH8Qu8fw9kq9CKtHEGnvuIRzPYysy98hZS8tFKubmAWYomz plug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724782654; x=1725387454; 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=CI+iMtHIwzQSTJqiN2pF72xHvOa84XhkRs53Cvkr+YntZbA4ixhwsG/4wvmhYygX8/ xduHmkw+J6nSspXkCPNvsC/YKSqzn9XLMopdHv65dh44kGioadez16IHTQbX7hKDqXW3 2Z759W82eLR//6e8oKw3fxSIsS+rbkFMVOXN7zm356jh7s5E6MIJWN+IcCNn8nShUWHm d8o/DvhiLdO/1YNaW4ZD/W0DpiOD5Q3pLkfYjhQWL6sKB3N+XfHg2HSq4qudzn5EyrjE cI1bpJFmI1tY8SgM2qBwLCxK5mwnUDcdIohxMG5CB1cDf1tM7Qnw8Rtgr4zJnOPpEgHK fABg== X-Forwarded-Encrypted: i=1; AJvYcCUpkHcp5Mt9ANXggrxXNUGRhU/GhurTmSTxCP166YX5TqO7SPVMJc4UeX57jqPmEkEjCmZTsxIbIjF645zd@vger.kernel.org, AJvYcCV3wuFHaznqEpg+R7yRLCVNlVpdDaWw1Zfh2hEETepTrxgCr0un0ziDqvMx2Op3yGpuBzE4X7o4X+81n+3N@vger.kernel.org X-Gm-Message-State: AOJu0Ywn1bqDM7qOT+slmI+3+FHhSg3pEc4XntrQhyxChVqeqscNA5ii lijMczSshgdvQNhvyJML/5FAOPDUSwySzHbSFzm4WH6DtiUBUVPg X-Google-Smtp-Source: AGHT+IGAgUs1zObwyhF7fTbdtha65n0BhLE2VwyP+bd4hlIhZyKR5Y1ftLH0i1qZ8R2IN6fgpq/FGA== X-Received: by 2002:a05:6e02:1d9b:b0:397:351b:2c0c with SMTP id e9e14a558f8ab-39e3c9c06dfmr170767125ab.17.1724782653624; Tue, 27 Aug 2024 11:17:33 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7cd9ad6e8e9sm8321211a12.86.2024.08.27.11.17.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2024 11:17:32 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: Will Deacon , Robin Murphy , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org (open list:DRM DRIVER for Qualcomm Adreno GPUs), dri-devel@lists.freedesktop.org (open list:DRM DRIVER for Qualcomm Adreno GPUs), freedreno@lists.freedesktop.org (open list:DRM DRIVER for Qualcomm Adreno GPUs), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 4/4] drm/msm: Extend gpu devcore dumps with pgtbl info Date: Tue, 27 Aug 2024 11:17:12 -0700 Message-ID: <20240827181717.187245-5-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827181717.187245-1-robdclark@gmail.com> References: <20240827181717.187245-1-robdclark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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_s= tate *state, drm_printf(p, " - dir=3D%s\n", info->flags & IOMMU_FAULT_WRITE ? "WRITE= " : "READ"); drm_printf(p, " - type=3D%s\n", info->type); drm_printf(p, " - source=3D%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]); } =20 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; =20 + if (state->fault_info.ttbr0) { + struct msm_gpu_fault_info *info =3D &state->fault_info; + struct msm_mmu *mmu =3D submit->aspace->mmu; + + msm_iommu_pagetable_params(mmu, &info->pgtbl_ttbr0, + &info->asid); + msm_iommu_pagetable_walk(mmu, info->iova, info->ptes); + } + state->bos =3D kcalloc(submit->nr_bos, sizeof(struct msm_gpu_state_bo), GFP_KERNEL); =20 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; }; =20 /** diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iomm= u.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(s= truct msm_mmu *mmu) return &iommu->domain->geometry; } =20 +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 =3D {}; + + if (mmu->type !=3D MSM_MMU_IOMMU_PAGETABLE) + return -EINVAL; + + pagetable =3D to_pagetable(mmu); + + if (!pagetable->pgtbl_ops->pgtable_walk) + return -EINVAL; + + pagetable->pgtbl_ops->pgtable_walk(pagetable->pgtbl_ops, iova, &wd); + + for (int i =3D 0; i < ARRAY_SIZE(wd.ptes); i++) + ptes[i] =3D wd.ptes[i]; + + return 0; +} + static const struct msm_mmu_funcs pagetable_funcs =3D { .map =3D msm_iommu_pagetable_map, .unmap =3D 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_m= mu *mmu, void *arg, struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent); =20 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, uint= 64_t ptes[4]); struct iommu_domain_geometry *msm_iommu_get_geometry(struct msm_mmu *mmu); =20 #endif /* __MSM_MMU_H__ */ --=20 2.46.0