From nobody Thu Dec 18 13:57:06 2025 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 C2527198E6F for ; Mon, 26 Aug 2024 17:15:57 +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=1724692559; cv=none; b=g0lqf+DR8RtPnNyF3zYmX/fW6jCrIlRW18ZWdI0wa+c3rCCBiy7i7Q29UJhBUTlCPcb/HOESkUo4sEh+fVodbJzYXTxpC1YQAZ3/DiYXUVuFAcoHoJ9lyWBwjDKKkKyD4TeLMQiWzQFoqca10x8w+XT0Qlzq7CyMv2xJbSwkhno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724692559; c=relaxed/simple; bh=IHBkbRTSRs1I3VQNuuBQURPtkVM0/9Lbyd7rf++i6iU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sRp+LZtMAXDLdhAbDkEukE14T7oB3ENm/m1p/b+ADZ/4y0/ioj9IGUYYsdiCoV7cjZN82BhCn9Rdkvx5EeK+2rDL/473NL+K608qX4pE8VkHzHPsEI9cXnu96xzCXP14yDnkbuZKCph7daowaUXM7dxCE345kExA0IlN2X51fbc= 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=VcCQmfOz; 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="VcCQmfOz" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7143ae1b48fso2566810b3a.1 for ; Mon, 26 Aug 2024 10:15:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724692557; x=1725297357; 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=VcCQmfOzWNzC9PjM5JxdMTQkNCm71JmTD3/YBqmR/c+omxltqzQ0a9dxfVnKdNkgn8 B+NauaPITTse+b2jrlqQXeTe7Z1Ds1jwAzA+2iOWzXqwGlvOVR7GDvxfO2X6CWP5D7cW 4Ub0E7lm3c5OrMG6AMTRzIvQ218jZZNSaSq46aq2P2AUEePH3jzCxTgC3lOfaCjGI9+q FG1Q4aFHfgebBG/qqAs868whSIaUuKIUhcEO+WkNve3fC0tkiriA0efbM+aoqY9pBTvF aJdr/g/Ws+Ecfx6NU2BUnDk6pQ86BJwygM9gwkzj4B+ARoYJ912ej81MAvWjpvM9e8KW myVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724692557; x=1725297357; 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=Y67wsChltzMDM/Tm0sv3fDAlxe3KxPGSCW5P/3RNxjZhZaxp+ldPtnUeKzk/D8QO9g TgSZ1reWhF/LzLuTMC/55UOuMXBw2+JTWXYXsZUmD3vlBekwzMjY0s35p2UaKHF1Gzgj 67EpKzPOsSVUsJk/dWqDSDmxL8i9CFKMOi14R1ipBhzKJzs9ugbfFG760gSLUyxwQrEx 16jYrLUvIGor308Ew0Orq3So+0A6sncLFaW2ityQKVu2+1TeONDHDJiEyVojh4auCYvv vB6hnFS/1DNriwKChnqjT6SMCQYRU5tBfo2cnHmiwpmRQlRqNml8kqwrILVWLBOJHFK3 IgEA== X-Forwarded-Encrypted: i=1; AJvYcCWvlFXwgX0r+dKeSJYRnbMYKfpBYFXk7bcw2Wba2D62YjgE8mXn2l+PEo6QDGSF64pEVyRtF5TTZR6dSpo=@vger.kernel.org X-Gm-Message-State: AOJu0Yxidac8BZg85JV9Q7g5kziwB+fcJHGw55G1B+rFWXvYMMsj94Nq RlXuUDFjstVIz0FP/q7Zd/YvLoBLW7rjj1R24yc+YQae0HfLxAat X-Google-Smtp-Source: AGHT+IFyw/mmqh3djt5tp2R0vCWdcanP5Sz+JyI69oHSQ3iIBkiy8Pb71WSJwf746F34gE42GQodbw== X-Received: by 2002:a05:6a21:3a46:b0:1c6:b0cc:c50f with SMTP id adf61e73a8af0-1cc8b49ba5dmr10427140637.25.1724692556800; Mon, 26 Aug 2024 10:15:56 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7cd9ac98152sm6824309a12.3.2024.08.26.10.15.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2024 10:15:56 -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 v8 1/4] iommu/io-pgtable-arm: Make pgtable walker more generic Date: Mon, 26 Aug 2024 10:15:38 -0700 Message-ID: <20240826171546.6777-2-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240826171546.6777-1-robdclark@gmail.com> References: <20240826171546.6777-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 Thu Dec 18 13:57:06 2025 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 7B9D11990AF for ; Mon, 26 Aug 2024 17:16:00 +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=1724692562; cv=none; b=ahXHdcWZNC8buV7VJ9KNPEHpxMVNrpwfdscjLrhcSC6o3JK3jC33TnztA5BpJz4k/8Ih6QEMuJcKslBboeXC23INt+nN72s1uD5l9AdzOkKjx71drXpJPmBu2paJo1U8kY2xPJxO48iNDI05YQbneCEtb1x9cCTFwfk6mSaS8Gs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724692562; c=relaxed/simple; bh=XGTqvhBSomuWVnpuTB9nRwhF8NvYdo4ZB99rM+0HxIc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aCLpB51lM2lb7iznVR9+dUqjmlHYJd9v14RNPsVDzP3meh+lYV4UVPB4luKCNhJmn9feN68Tht5kyu4MQqfuvvGVP2VdcuvHbL4MuCf0Fq8t7i53c49sSgNBfKyJ46mMk6VtMCrcbxsBpySEqcNKKxHcbQS4+Q7IEj0qr7qwMj8= 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=kqPjw/PY; 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="kqPjw/PY" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-201fba05363so35201425ad.3 for ; Mon, 26 Aug 2024 10:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724692560; x=1725297360; 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=9+I4ZaCB/sqpP5JzZUXf+AGUdGSF6g4dYvIuEdY7CXs=; b=kqPjw/PYXvT8GPzAa4RfqCg6w4V0K0JNWWf9lWGGhy9taLr5LNRKjO6qF81G/EmgW7 B6MnVTr++9HbEyDaNwqNpbwrfp7wEgziBsese+F7QMsPG2p8kkqyhfrMe+i95UJdv/R6 MfdBCugEm3l7OmGdTCXmNBdlWbUD96xO5QX6IvUGM3aHH7BXN3upnmt7/Ifg0kEAjy53 3QemRJy75nETTm48Rv2K/+Id/BTd+jcsibutdeaC+7vKbdE29U5EeobQjNgBhT5jW5Sl 4JudbjAlU0LgxIAa1KVksyl5+L1l120i6QNATWFsA9b+CeYC60CtpD716qxoCa+gW3/M CW4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724692560; x=1725297360; 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=9+I4ZaCB/sqpP5JzZUXf+AGUdGSF6g4dYvIuEdY7CXs=; b=K29HYDAkUSZ1ch4L8J6IQss82iDzl9mXQCsouX7x3QQG03d4VPKQYkAdjQt/ZNwHwu H06/7D2cKj+GzwGeKERNxyG837B7jC3Pi1cmkp4ArYqtxxxVQq+rQEHbOUBYFh7w+A5g b6nX0kMB7rMppo47dTJKs3tQdfuYgVHdaAmZ/58Mea4x525sbS8cf69lGY0GIF7QGKMq OWE/WURhFBwmxmePfZWE28Jg7JMIvQ2BFF2pckNy+9/qDZd9J0YgWEKB73ukB/b71l11 K3DgMByWeP9C6mw0pQRZOoXIL2bMhSF4b1rBSgjtLG2/aiA2AsNpzNR+t/wfOtEPjv/N /+9Q== X-Forwarded-Encrypted: i=1; AJvYcCWRhQlpfISy1qbqXXhd9/IwMNmB0ZAFnIjIzutET91nFaFj0zxqQfcbi+Jqlw2W14/WjBXvEVPqrf9idcs=@vger.kernel.org X-Gm-Message-State: AOJu0YwSafKNiAWl4nX8KBJ7RtIQaNc88qvF64EdpaFOndZUYobsbVE+ BiQ/WjeP7p19IvTdUHMwDks9UlsJzNvtGHNfaY1+63RWYk0qi3C3 X-Google-Smtp-Source: AGHT+IFDqoQr7ndvoqg0WiXE2EFba86vbWS6GZn4EuCOqNm05J6X0ruWnhG+tYye9U/muYuTqrThgA== X-Received: by 2002:a17:902:daca:b0:1fd:8c25:415d with SMTP id d9443c01a7336-204df48723cmr2286975ad.36.1724692559502; Mon, 26 Aug 2024 10:15:59 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20385ae6ebasm69617045ad.240.2024.08.26.10.15.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2024 10:15:58 -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 v8 2/4] iommu/io-pgtable-arm: Re-use the pgtable walk for iova_to_phys Date: Mon, 26 Aug 2024 10:15:39 -0700 Message-ID: <20240826171546.6777-3-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240826171546.6777-1-robdclark@gmail.com> References: <20240826171546.6777-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 | 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 0132f1eff688..f50ebea85dd8 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,7 +775,7 @@ static int io_pgtable_visit(struct arm_lpae_io_pgtable = *data, return 0; } =20 - if (WARN_ON(!iopte_table(pte, lvl))) + if (WARN_ON(!iopte_table(pte, lvl) && !selftest_running)) return -EINVAL; =20 ptep =3D iopte_deref(pte, data); --=20 2.46.0 From nobody Thu Dec 18 13:57:06 2025 Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) (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 2FEEC1991AD for ; Mon, 26 Aug 2024 17:16:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724692565; cv=none; b=m3JVFWyLpytzbbfBUvxejlrzs6qndg4wS97VmT5kVVaMP392QlaPizcCysEwFZXrbe3N/l0pnz1iGUy10kb/TKQcirX7QIGYavr2xuCKsFOoNucYXPvw60FdjITSU48OCz20g2Nk5ov3gHXmzg+KwKZ5UybZD4c4z23WWFXxlAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724692565; c=relaxed/simple; bh=Dm/PpuWGX/lF0MB+mMAk/NkdNLWRfPXi8uc0os6PuY0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nLSj0eed/uIBH1snNsPFzN9N8eD9etf33RYLXzDY9XGVd81O/qXnGmbP6H8XkSy1743Ov0V14mn1z0mq3xO0+c3OcFqEQt07ZGARVpXPzDgnDyu8C+DIp3Y+I5okN9YUpeg8Apv8KWDBJIRs3U+x9UCIX4kKAaMs8ON9pQoH5Zk= 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=ir8jA66A; arc=none smtp.client-ip=209.85.166.175 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="ir8jA66A" Received: by mail-il1-f175.google.com with SMTP id e9e14a558f8ab-39d20c4be31so16633095ab.1 for ; Mon, 26 Aug 2024 10:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724692563; x=1725297363; 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=JP4TZEK1BK3FCdoYwuXOrd9TRG8IyqaAd5V9ttXFyYQ=; b=ir8jA66AFqLA4DdxkWVmsfbU+OdCG6t36HGaJBcAR2QQSif+D8DneRmgFZddSOaHO6 JQXDc8dOUTEJDzYTQREcmOgrQ610ZnFULZ0P9ZFh1hK5pkVwc2TCznn2IYuJXT+YQh6n 12AXwcorsVRBpDihoyBYZzN5/3zgMfNVpFcFBw1R5C3/YgIyHZTJyYokjDINC5rtYdjC xvnuot2GZ17avgsCUK9a7bjwn/35iHsRGObr3NhKPCN5uS0d9/UIsP07SrNUFv3w2Wyn zeHhVHKUV9frXJEQLCTVdgwsbfbDJr3LQu+CeBGqg1V0a+87K7vlBFNmmgMi++L8cHon 0eSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724692563; x=1725297363; 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=JP4TZEK1BK3FCdoYwuXOrd9TRG8IyqaAd5V9ttXFyYQ=; b=qitgo9A7GKUL0/TshLbCCcRLtD9y5PVrBpBK+SKFdcYHgg6WTbFXQ/peZAp7DjSg5d 7lHJa1llqyBkWZctx7SDtxqq0Ipf1F7y3XnDjLjksliYEE7apImM5xijENrhN1ddtroX tX+wURvEW+E7oNWN96l7vlt7Ypk14ylyFAL+TTdDIJboeeXTlLiI/LgQr1ctSuBGPJ/W HtGojevqKV2peTKJUtHPY2IEcbvR83D08aGMpLbzRDC+KUcplYVQgChYds8/KR+abLnQ 7bD9mM7APrymef+VE4EbC8OnxDX9OAFxNb1cMxPfgSRG4MHMeVOmZhsBI7G8rjaGyTfm coHw== X-Forwarded-Encrypted: i=1; AJvYcCVQFPkrJoJhjSP/idULnB0jjo/Df5rTvTOHVVZcuU/Iw1Z6Tum+6ah8wc+o06jQf4IiVWXqRs2wiMUqPjs=@vger.kernel.org X-Gm-Message-State: AOJu0Yytr+xI6aQkEEwRDxb45Wy0T3A1zRCjiZFcngqv2Cs+F8zYqkYF +8HSK0BQxqNo9GUKk+RSlN7qML7HbM79TGEkeT8h6hZpPaitKaQZ X-Google-Smtp-Source: AGHT+IFzZhZ24BSgc0zToZ5EuWURN6G2xkvE2v3EkHzS1HwmPoHerM5RzvQaEMtBZgU9U98rh+O6OA== X-Received: by 2002:a05:6e02:1a8a:b0:39d:290b:6800 with SMTP id e9e14a558f8ab-39e3c9edf77mr129742785ab.28.1724692562965; Mon, 26 Aug 2024 10:16:02 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7cd9ad55283sm7884302a12.74.2024.08.26.10.16.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2024 10:16:02 -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 , Shameer Kolothum , Boris Brezillon , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 3/4] iommu/io-pgtable-arm: Add way to debug pgtable walk Date: Mon, 26 Aug 2024 10:15:40 -0700 Message-ID: <20240826171546.6777-4-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240826171546.6777-1-robdclark@gmail.com> References: <20240826171546.6777-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 f50ebea85dd8..2f57a50afe2c 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) @@ -928,6 +952,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 Thu Dec 18 13:57:06 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 A64C95644E; Mon, 26 Aug 2024 17:16:06 +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=1724692568; cv=none; b=QTO9UktC0+wnYofRmzjFaj+FKGNBZrdrLGxjb4lbWlfE9cYsZa64T05PdF0efSaAGYUCEVhmyOUUxEei91PAhPTUWF1U4OW3qlZRqXVWp0gmwcrx0vUtfTniMe6AUOZ2Iw5m8RwPyjtxjfR1TaLuz2UbpezfC3jLMP3WpUtHPyI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724692568; c=relaxed/simple; bh=Z9rdbPQfURPCIg572NnKyoFcQ2uLzoi++cMrYqDlAP4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HFsgyOzvy//rD+TGg4ujXOnTYULkpLCoDxArNb7pBgCiiErCjTC/jpD5UyZwMnZlnSKQwbPNQ4E7i6EXY8A/JjTl/ZooN6xGCjZ74noyOt9WizHn96MYIsDQzh6IF7pwmMW+b9biP8NUXL+kloMCrR/Of9SnnbgaO82QEN9LqwU= 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=Auk7aaoE; 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="Auk7aaoE" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-202508cb8ebso30550535ad.3; Mon, 26 Aug 2024 10:16:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724692566; x=1725297366; 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=Auk7aaoEmECbTLHlfAc1z+fGaBlqLg28//j6s3DSv1CCBIU/w7wwdrjzIuCFJgzvAv mLyUGEryAytSIEZhNOsxA9R1SN1DCRqMIigZP47iM4vCsx+DSSZsltoZYqDu5DsqCAhr GZLWqs6x34+j+kq4gH4E/tcrVzotOx7p+odn4k83kcuVX82sp8oXXEl07qYwcUkJyGu9 5E6THtV3kvxjh8eW8VQ+ueEK2/5TY00QdVqDVV8C43vr0f5xbYHEXmH9EDLZmpDNoNgy okW73r2uQ4Z0eO1+Cy/R9HnBEKS022G1ACs6qGURVpAk+sAtPp11xINTL6c7SipMtTEd TZCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724692566; x=1725297366; 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=WpYbLeypOfN6MFZ89bmxtElHwXhrzqKS4T+XqtCNZIZeZ4my2JlJ/mjAzVJZcJ+TdJ 7mctzIvdJ6dY+KBWeYm38MDjDmEnI1WkbJmbTAwy4Wjtpx2EcDFDpm6UJoIPTYpkFmiK Cwuqf2/2lAUI9nFzozPyHcMopwF8LvvedtHjpxXfC/aMqUGAoeCKhmb+CEac6qoO0hib I8Mk/Cb8GistXdScpJXp/gH8Z7nMpePm7F0KEMktDUllvNEX8EL+WbeNGOsgp1k/F07h oT17c+V5EZZqI/RgzO36s/tUdMweszfpw/RLxE5lJqHXzMHGy4mv6rmNeipCInqm7/yu HM/A== X-Forwarded-Encrypted: i=1; AJvYcCUB52eet2vxDh2pKKF1GeIGvmxq7kjujRp3etHCarcTuFaQVckfw0XbeWsK5ov4kDD1bfV19K9HGvrjuO0J@vger.kernel.org, AJvYcCWBP81l815JRnSxTycOpNFQUx4LKbsQ5qY/G/TtBXxwifXLDweIQfYBdRQW2Z+aAQTRbuUzgn/LDeb6i7J+@vger.kernel.org X-Gm-Message-State: AOJu0YzI0TDOpwqSOC/Qdo//JV+WKxE6y1OaXU6gff6BvHVP0hVWIX9H SbLX3NZI9NsY23U0PJAoNdc2aDCyiblBfv9lc0Qzed7zeK6tgfOw X-Google-Smtp-Source: AGHT+IHGL1MOQ7nhSehnfvO75y0Ls4GPWtSRbqyg7KY7kq6ZyQvUf9DWVxti63QNaWSL53DiyLEF1A== X-Received: by 2002:a17:903:186:b0:202:244e:a0cc with SMTP id d9443c01a7336-204df4d3543mr2327305ad.45.1724692565761; Mon, 26 Aug 2024 10:16:05 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-203855dbd96sm69825935ad.175.2024.08.26.10.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2024 10:16:05 -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 v8 4/4] drm/msm: Extend gpu devcore dumps with pgtbl info Date: Mon, 26 Aug 2024 10:15:41 -0700 Message-ID: <20240826171546.6777-5-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240826171546.6777-1-robdclark@gmail.com> References: <20240826171546.6777-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