From nobody Sat Oct 4 17:29:45 2025 Received: from fout-a5-smtp.messagingengine.com (fout-a5-smtp.messagingengine.com [103.168.172.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB2452E765B for ; Thu, 14 Aug 2025 08:40:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.148 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755160855; cv=none; b=T88YMJXiv3ohBfy69TVv2bZfBZX7e4yq0pfQ+KqZiUbotkoasK+GFmMKx+bA2xMYL5K2lrmTSA9aoF4PlXQZxcIsmjPOkcV8tp4H09MpZFb7gK/IdsPBeVKjEph9lcQdad8dBezGzskqgzAQ5e9wXcWd5XfCipFJrHWF0Ki5m9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755160855; c=relaxed/simple; bh=mpHvjrYtpy7asIuYnTB4flgke7dzGuWpfolSDHarVSw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=I+qZYKcx6vEt8ncKZyi9HopecJoA5HsibDcI8LKMQQ8WgcLlydQ5NK3ucUUQUNS5f17iBqyqIUxHvkvY5fKAPDTAF6cCZcqfDneI26ha3gnGgPXaNZLmNyegotJauMaRVq8eI3EVG1v+nZMYCRWRI+zUCviwUShB6Kel34P3Kmw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net; spf=pass smtp.mailfrom=jannau.net; dkim=pass (2048-bit key) header.d=jannau.net header.i=@jannau.net header.b=Lko/orpi; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=b0G/73GG; arc=none smtp.client-ip=103.168.172.148 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=jannau.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=jannau.net header.i=@jannau.net header.b="Lko/orpi"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="b0G/73GG" Received: from phl-compute-10.internal (phl-compute-10.internal [10.202.2.50]) by mailfout.phl.internal (Postfix) with ESMTP id B36D5EC020C; Thu, 14 Aug 2025 04:40:52 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-10.internal (MEProxy); Thu, 14 Aug 2025 04:40:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jannau.net; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1755160852; x=1755247252; bh=dInGrJE+Wye5FBXM3QXXiTdcsGBJk2tEBTfaT2DZ2P0=; b= Lko/orpi4SK6byknfmhH4e98miSBxF84PL7TaHkXdNJcTZkiL+mtDS6ENTs8jY4W frcJ2jPFiZ6cP2ueYCgdW8bQO2/gxlqA/cqcrPOLkbzdDEP47rqctEi7XNyI+5Tj /Qs29MGL7wt0vk8WF0Xf0Jb2v4yXxefP7qFk9/8StJs2H6uSsqVGJta9/+ssOn7j 7q/Zq/RjuwkxuVY+jpJRmrW13ZqjVBvxuBDgaQhhOkqHeb5hWfnE2j0Bh9/PiezR T7JrGEfYsShE5L6JefI7FL8oRZdz1uw+pjEtcfti5oilRA6aIVZDl81136M/uwAB 3PU+Q8zeC6AqvY4Fqaz4fA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1755160852; x= 1755247252; bh=dInGrJE+Wye5FBXM3QXXiTdcsGBJk2tEBTfaT2DZ2P0=; b=b 0G/73GGv25R4Dn57qSO1jTgpX7OXss73gTjqFM7Oo3rBZ5BGDq4jzLtwdLcgOanY bjp5QjzyzBT8cykXLBCOmP1FQqtA+tIzLXbTjQUP0DHHQu3aFQd86c9yWe7q73hr BdpTW7Njh+nSaI5w1bXHphvxRSQP4lny15JFDRavBg2433A+tBtKcybfBchSG9Us yHUtXm5g9kV99OoJYEy8S0apSaF/ZQVN2ZJadLIUqG5XwzYXAsFOhxkwJIzWtYxC ieK+ZzAl+nriRFYqMtrirzltak4flimoH1+06LqNMarczUWKYynqw7wRABUueejm 7kH9AWIvedwKZbhpYMSQQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddugedtiedvucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpeflrghnnhgv ucfirhhunhgruhcuoehjsehjrghnnhgruhdrnhgvtheqnecuggftrfgrthhtvghrnhepfe ehheeileduffehteeihfdvtdelffdutdeludduiedutedvfeffheekhefgtedtnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhesjhgrnhhnrg hurdhnvghtpdhnsggprhgtphhtthhopeduvddpmhhouggvpehsmhhtphhouhhtpdhrtghp thhtohepfihilhhlsehkvghrnhgvlhdrohhrghdprhgtphhtthhopehiohhmmhhusehlih hsthhsrdhlihhnuhigrdguvghvpdhrtghpthhtohepmhgrrhgtrghnsehmrghrtggrnhdr shhtpdhrtghpthhtoheprhhosghinhdrmhhurhhphhihsegrrhhmrdgtohhmpdhrtghpth htohepjhhorhhoseeksgihthgvshdrohhrghdprhgtphhtthhopegrshgrhhhisehlihhs thhsrdhlihhnuhigrdguvghvpdhrtghpthhtoheplhhinhhugidqrghrmhdqkhgvrhhnvg hlsehlihhsthhsrdhinhhfrhgruggvrggurdhorhhgpdhrtghpthhtohepnhgvrghlsehg ohhmphgrrdguvghvpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkh gvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i47b949f6:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 14 Aug 2025 04:40:51 -0400 (EDT) From: Janne Grunau Date: Thu, 14 Aug 2025 10:40:24 +0200 Subject: [PATCH 1/3] iommu: apple-dart: Make the hw register fields u32s Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250814-apple-dart-4levels-v1-1-db2214a78c08@jannau.net> References: <20250814-apple-dart-4levels-v1-0-db2214a78c08@jannau.net> In-Reply-To: <20250814-apple-dart-4levels-v1-0-db2214a78c08@jannau.net> To: Sven Peter , Alyssa Rosenzweig , Neal Gompa , Joerg Roedel , Will Deacon , Robin Murphy Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Janne Grunau , Hector Martin X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1124; i=j@jannau.net; s=yk2024; h=from:subject:message-id; bh=Ah2FtuAI2Pz9rAwG3UdfiegkoAw7DTu7B/zqezSouiI=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhoy5C/lm/zDfVRph9d3OmFnl3Qox5ramw3xB3WnW0k+PW 19PLNXpKGVhEONikBVTZEnSftnBsLpGMab2QRjMHFYmkCEMXJwCMJEFWgz/fVoq+NS6AxoKJN5e knb75SSVz7j72+tXuYv5/73SXcn6jJFhV1DhUYYXrw7tf+Yl/OjfxDvTdPWuF8TWmktYRbRuSD3 PDgA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 From: Hector Martin The registers are 32-bit and the offsets definitely don't need 64 bits either, these should've been u32s. Signed-off-by: Hector Martin Signed-off-by: Janne Grunau Reviewed-by: Sven Peter --- drivers/iommu/apple-dart.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c index 190f28d76615159527649cd288df395a50d950ef..e72a93e78e26ca61b233c83d439= dbdfadf040fc6 100644 --- a/drivers/iommu/apple-dart.c +++ b/drivers/iommu/apple-dart.c @@ -166,22 +166,22 @@ struct apple_dart_hw { =20 int max_sid_count; =20 - u64 lock; - u64 lock_bit; + u32 lock; + u32 lock_bit; =20 - u64 error; + u32 error; =20 - u64 enable_streams; + u32 enable_streams; =20 - u64 tcr; - u64 tcr_enabled; - u64 tcr_disabled; - u64 tcr_bypass; + u32 tcr; + u32 tcr_enabled; + u32 tcr_disabled; + u32 tcr_bypass; =20 - u64 ttbr; - u64 ttbr_valid; - u64 ttbr_addr_field_shift; - u64 ttbr_shift; + u32 ttbr; + u32 ttbr_valid; + u32 ttbr_addr_field_shift; + u32 ttbr_shift; int ttbr_count; }; =20 --=20 2.50.1 From nobody Sat Oct 4 17:29:45 2025 Received: from fout-a5-smtp.messagingengine.com (fout-a5-smtp.messagingengine.com [103.168.172.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2D9D2E888D for ; Thu, 14 Aug 2025 08:40:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.148 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755160857; cv=none; b=X5tfBJt0vLnmkanL2yx4v/c8S5CsSXB/QokgdLJjk+ppgMIklFfimfl0s+94aNJzObVQ9yogQlf1OY4F08c+CvNgEepu/58E+349LOSI3eAO7PpIpFV6MTS9B47fmkXHRDxKFV88kplkpbPPkfVlSHJS9yEOGa44olm70HkptqA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755160857; c=relaxed/simple; bh=u34tLGr9zKf+eUJvu9KqUtTGJjAwKIJZ0Bs64nHQ7BQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kuTcdqq8SBQGxIgg1TREXV4XLLxJVeMLGKfG8OeXfIHS+brG50xk7gXUBfwJtpHCMyMYknEA04AIk0vQbwcfuD3bwsRtzmRbW16poqul2xJgikqJTQ9/qpeYPrutVN2w2ZCf6gdL5Cb8Xv54XWBYJcBEnPQlUmUBl8RLvdewQIg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net; spf=pass smtp.mailfrom=jannau.net; dkim=pass (2048-bit key) header.d=jannau.net header.i=@jannau.net header.b=cnFR2QcV; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=m8NdXwMM; arc=none smtp.client-ip=103.168.172.148 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=jannau.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=jannau.net header.i=@jannau.net header.b="cnFR2QcV"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="m8NdXwMM" Received: from phl-compute-04.internal (phl-compute-04.internal [10.202.2.44]) by mailfout.phl.internal (Postfix) with ESMTP id 11EFFEC021B; Thu, 14 Aug 2025 04:40:55 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Thu, 14 Aug 2025 04:40:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jannau.net; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1755160855; x=1755247255; bh=aKXq92/heg/5bgLIDr5SS2U1n4Nz7US13osiHoCM+c4=; b= cnFR2QcVPA/qoKaoex4smscDklnVgmbGjFLdtyk7NRo8gi07GxZAV+vQWbmzN2vU TdLFMYB2Do2fQjHUgDO/G/6+CPVBMn044ojZGxYRkdJedwdQ2pSenqt0wXdRCHw5 xzWWjTyQcl2euEICyUpX//VDhxc8EXDzu7H2nBJ2Ec+8GodN/UdK4dab7wnxCKZi DvnVXsGmP/oDf92XqEpU0uGx/JX/iqnQ3mxqWCXvRO+XjR6cTXLSonCJiU4Xl+G+ bDCvyq0N5stto1d6OnJfCzCyl8A8aPQhdZl6Tchiq43iSraQKNWCoRYN0rHKWmH+ FLqhfIEhVb8uLZCv/yFdjg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1755160855; x= 1755247255; bh=aKXq92/heg/5bgLIDr5SS2U1n4Nz7US13osiHoCM+c4=; b=m 8NdXwMMmvOJgRwjCPoQi+XonS86fVyre0yqAfRo0D0qTPh8XSn/rR1Qoa7g7SyCF gZ7QvMcXjB6nwTG3tGF4P9atMbuRGJEmKNqvYci8AIC/3ENUttLa9Ml9LNYhpyBF wLS+un5dmk2xw/Dj9DIBkKiAM/exDz9HR/JaLNggIVmG2Rs+sddSVt4a3wklBtQO B+YLb8ToS2Z9Lb8TsZzGPZiSgNMpscwDU2piJftU/dL68YvHrk0FCPvKourtzn3E wchuA8MVuBr18TuzIx21OQ6oLcPA7XdOuD7rvyx/oRe/5ouRyK0aJM9UaxS0eJW/ JS+hX4UWQVSvIMWeBUeVg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddugedtieefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpeflrghnnhgv ucfirhhunhgruhcuoehjsehjrghnnhgruhdrnhgvtheqnecuggftrfgrthhtvghrnhepfe ehheeileduffehteeihfdvtdelffdutdeludduiedutedvfeffheekhefgtedtnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhesjhgrnhhnrg hurdhnvghtpdhnsggprhgtphhtthhopeduvddpmhhouggvpehsmhhtphhouhhtpdhrtghp thhtohepfihilhhlsehkvghrnhgvlhdrohhrghdprhgtphhtthhopehiohhmmhhusehlih hsthhsrdhlihhnuhigrdguvghvpdhrtghpthhtohepmhgrrhgtrghnsehmrghrtggrnhdr shhtpdhrtghpthhtoheprhhosghinhdrmhhurhhphhihsegrrhhmrdgtohhmpdhrtghpth htohepjhhorhhoseeksgihthgvshdrohhrghdprhgtphhtthhopegrshgrhhhisehlihhs thhsrdhlihhnuhigrdguvghvpdhrtghpthhtoheplhhinhhugidqrghrmhdqkhgvrhhnvg hlsehlihhsthhsrdhinhhfrhgruggvrggurdhorhhgpdhrtghpthhtohepnhgvrghlsehg ohhmphgrrdguvghvpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkh gvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i47b949f6:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 14 Aug 2025 04:40:54 -0400 (EDT) From: Janne Grunau Date: Thu, 14 Aug 2025 10:40:25 +0200 Subject: [PATCH 2/3] iommu: io-pgtable: Add 4-level page table support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250814-apple-dart-4levels-v1-2-db2214a78c08@jannau.net> References: <20250814-apple-dart-4levels-v1-0-db2214a78c08@jannau.net> In-Reply-To: <20250814-apple-dart-4levels-v1-0-db2214a78c08@jannau.net> To: Sven Peter , Alyssa Rosenzweig , Neal Gompa , Joerg Roedel , Will Deacon , Robin Murphy Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Janne Grunau , Hector Martin X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=9115; i=j@jannau.net; s=yk2024; h=from:subject:message-id; bh=Q7TPabYm+Pa2jKndVkDAFT0tfiuAYSdcrbJxMFXXxTI=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhoy5C/kq5S5sWsQptm4C/6/7jRtmxDN/V8oVVF+1M7V5+ u3VuYZeHaUsDGJcDLJiiixJ2i87GFbXKMbUPgiDmcPKBDKEgYtTACbioc7IcHHKSofQlZKB5Uki Zax17vrlm27lRqgenLAr5+OcnkqWREaGLZuK+VljtvMIr5qcyJm0RGoj29G+82tkPlVdult+/po 4MwA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 From: Hector Martin DARTs on t602x SoCs are of the t8110 variant but have an IAS of 42, which means optional support for an extra page table level. Refactor the PTE management to support an arbitrary level count, and then calculate how many levels we need for any given configuration. Signed-off-by: Hector Martin Signed-off-by: Janne Grunau Reviewed-by: Sven Peter --- drivers/iommu/io-pgtable-dart.c | 143 ++++++++++++++++++++++++------------= ---- include/linux/io-pgtable.h | 1 + 2 files changed, 89 insertions(+), 55 deletions(-) diff --git a/drivers/iommu/io-pgtable-dart.c b/drivers/iommu/io-pgtable-dar= t.c index 679bda1047977602f468ef905b48aeeebcd7a234..9a63c80a2786bf70fc2544b1f96= d2e4c8591c2f8 100644 --- a/drivers/iommu/io-pgtable-dart.c +++ b/drivers/iommu/io-pgtable-dart.c @@ -27,8 +27,9 @@ =20 #define DART1_MAX_ADDR_BITS 36 =20 -#define DART_MAX_TABLES 4 -#define DART_LEVELS 2 +#define DART_MAX_TABLE_BITS 2 +#define DART_MAX_TABLES BIT(DART_MAX_TABLE_BITS) +#define DART_MAX_LEVELS 4 /* Includes TTBR level */ =20 /* Struct accessors */ #define io_pgtable_to_data(x) \ @@ -68,6 +69,7 @@ struct dart_io_pgtable { struct io_pgtable iop; =20 + int levels; int tbl_bits; int bits_per_level; =20 @@ -156,44 +158,45 @@ static dart_iopte dart_install_table(dart_iopte *tabl= e, return old; } =20 -static int dart_get_table(struct dart_io_pgtable *data, unsigned long iova) +static int dart_get_index(struct dart_io_pgtable *data, unsigned long iova= , int level) { - return (iova >> (3 * data->bits_per_level + ilog2(sizeof(dart_iopte)))) & - ((1 << data->tbl_bits) - 1); + return (iova >> (level * data->bits_per_level + ilog2(sizeof(dart_iopte))= )) & + ((1 << data->bits_per_level) - 1); } =20 -static int dart_get_l1_index(struct dart_io_pgtable *data, unsigned long i= ova) -{ - - return (iova >> (2 * data->bits_per_level + ilog2(sizeof(dart_iopte)))) & - ((1 << data->bits_per_level) - 1); -} - -static int dart_get_l2_index(struct dart_io_pgtable *data, unsigned long i= ova) +static int dart_get_last_index(struct dart_io_pgtable *data, unsigned long= iova) { =20 return (iova >> (data->bits_per_level + ilog2(sizeof(dart_iopte)))) & ((1 << data->bits_per_level) - 1); } =20 -static dart_iopte *dart_get_l2(struct dart_io_pgtable *data, unsigned lon= g iova) +static dart_iopte *dart_get_last(struct dart_io_pgtable *data, unsigned lo= ng iova) { dart_iopte pte, *ptep; - int tbl =3D dart_get_table(data, iova); + int level =3D data->levels; + int tbl =3D dart_get_index(data, iova, level); + + if (tbl > (1 << data->tbl_bits)) + return NULL; =20 ptep =3D data->pgd[tbl]; if (!ptep) return NULL; =20 - ptep +=3D dart_get_l1_index(data, iova); - pte =3D READ_ONCE(*ptep); + while (--level > 1) { + ptep +=3D dart_get_index(data, iova, level); + pte =3D READ_ONCE(*ptep); =20 - /* Valid entry? */ - if (!pte) - return NULL; + /* Valid entry? */ + if (!pte) + return NULL; =20 - /* Deref to get level 2 table */ - return iopte_deref(pte, data); + /* Deref to get next level table */ + ptep =3D iopte_deref(pte, data); + } + + return ptep; } =20 static dart_iopte dart_prot_to_pte(struct dart_io_pgtable *data, @@ -230,6 +233,7 @@ static int dart_map_pages(struct io_pgtable_ops *ops, u= nsigned long iova, int ret =3D 0, tbl, num_entries, max_entries, map_idx_start; dart_iopte pte, *cptep, *ptep; dart_iopte prot; + int level =3D data->levels; =20 if (WARN_ON(pgsize !=3D cfg->pgsize_bitmap)) return -EINVAL; @@ -240,31 +244,36 @@ static int dart_map_pages(struct io_pgtable_ops *ops,= unsigned long iova, if (!(iommu_prot & (IOMMU_READ | IOMMU_WRITE))) return -EINVAL; =20 - tbl =3D dart_get_table(data, iova); + tbl =3D dart_get_index(data, iova, level); + + if (tbl > (1 << data->tbl_bits)) + return -ENOMEM; =20 ptep =3D data->pgd[tbl]; - ptep +=3D dart_get_l1_index(data, iova); - pte =3D READ_ONCE(*ptep); - - /* no L2 table present */ - if (!pte) { - cptep =3D iommu_alloc_pages_sz(gfp, tblsz); - if (!cptep) - return -ENOMEM; - - pte =3D dart_install_table(cptep, ptep, 0, data); - if (pte) - iommu_free_pages(cptep); - - /* L2 table is present (now) */ + while (--level > 1) { + ptep +=3D dart_get_index(data, iova, level); pte =3D READ_ONCE(*ptep); - } =20 - ptep =3D iopte_deref(pte, data); + /* no table present */ + if (!pte) { + cptep =3D iommu_alloc_pages_sz(gfp, tblsz); + if (!cptep) + return -ENOMEM; + + pte =3D dart_install_table(cptep, ptep, 0, data); + if (pte) + iommu_free_pages(cptep); + + /* L2 table is present (now) */ + pte =3D READ_ONCE(*ptep); + } + + ptep =3D iopte_deref(pte, data); + } =20 /* install a leaf entries into L2 table */ prot =3D dart_prot_to_pte(data, iommu_prot); - map_idx_start =3D dart_get_l2_index(data, iova); + map_idx_start =3D dart_get_last_index(data, iova); max_entries =3D DART_PTES_PER_TABLE(data) - map_idx_start; num_entries =3D min_t(int, pgcount, max_entries); ptep +=3D map_idx_start; @@ -293,13 +302,13 @@ static size_t dart_unmap_pages(struct io_pgtable_ops = *ops, unsigned long iova, if (WARN_ON(pgsize !=3D cfg->pgsize_bitmap || !pgcount)) return 0; =20 - ptep =3D dart_get_l2(data, iova); + ptep =3D dart_get_last(data, iova); =20 /* Valid L2 IOPTE pointer? */ if (WARN_ON(!ptep)) return 0; =20 - unmap_idx_start =3D dart_get_l2_index(data, iova); + unmap_idx_start =3D dart_get_last_index(data, iova); ptep +=3D unmap_idx_start; =20 max_entries =3D DART_PTES_PER_TABLE(data) - unmap_idx_start; @@ -330,13 +339,13 @@ static phys_addr_t dart_iova_to_phys(struct io_pgtabl= e_ops *ops, struct dart_io_pgtable *data =3D io_pgtable_ops_to_data(ops); dart_iopte pte, *ptep; =20 - ptep =3D dart_get_l2(data, iova); + ptep =3D dart_get_last(data, iova); =20 /* Valid L2 IOPTE pointer? */ if (!ptep) return 0; =20 - ptep +=3D dart_get_l2_index(data, iova); + ptep +=3D dart_get_last_index(data, iova); =20 pte =3D READ_ONCE(*ptep); /* Found translation */ @@ -353,21 +362,37 @@ static struct dart_io_pgtable * dart_alloc_pgtable(struct io_pgtable_cfg *cfg) { struct dart_io_pgtable *data; - int tbl_bits, bits_per_level, va_bits, pg_shift; + int levels, max_tbl_bits, tbl_bits, bits_per_level, va_bits, pg_shift; + + /* + * Old 4K page DARTs can use up to 4 top-level tables. + * Newer ones only ever use a maximum of 1. + */ + if (cfg->pgsize_bitmap =3D=3D SZ_4K) + max_tbl_bits =3D DART_MAX_TABLE_BITS; + else + max_tbl_bits =3D 0; =20 pg_shift =3D __ffs(cfg->pgsize_bitmap); bits_per_level =3D pg_shift - ilog2(sizeof(dart_iopte)); =20 va_bits =3D cfg->ias - pg_shift; =20 - tbl_bits =3D max_t(int, 0, va_bits - (bits_per_level * DART_LEVELS)); - if ((1 << tbl_bits) > DART_MAX_TABLES) + levels =3D max_t(int, 2, (va_bits - max_tbl_bits + bits_per_level - 1) / = bits_per_level); + + if (levels > (DART_MAX_LEVELS - 1)) + return NULL; + + tbl_bits =3D max_t(int, 0, va_bits - (bits_per_level * levels)); + + if (tbl_bits > max_tbl_bits) return NULL; =20 data =3D kzalloc(sizeof(*data), GFP_KERNEL); if (!data) return NULL; =20 + data->levels =3D levels + 1; /* Table level counts as one level */ data->tbl_bits =3D tbl_bits; data->bits_per_level =3D bits_per_level; =20 @@ -403,6 +428,7 @@ apple_dart_alloc_pgtable(struct io_pgtable_cfg *cfg, vo= id *cookie) return NULL; =20 cfg->apple_dart_cfg.n_ttbrs =3D 1 << data->tbl_bits; + cfg->apple_dart_cfg.n_levels =3D data->levels; =20 for (i =3D 0; i < cfg->apple_dart_cfg.n_ttbrs; ++i) { data->pgd[i] =3D @@ -422,24 +448,31 @@ apple_dart_alloc_pgtable(struct io_pgtable_cfg *cfg, = void *cookie) return NULL; } =20 -static void apple_dart_free_pgtable(struct io_pgtable *iop) +static void apple_dart_free_pgtables(struct dart_io_pgtable *data, dart_io= pte *ptep, int level) { - struct dart_io_pgtable *data =3D io_pgtable_to_data(iop); - dart_iopte *ptep, *end; - int i; + dart_iopte *end; + dart_iopte *start =3D ptep; =20 - for (i =3D 0; i < (1 << data->tbl_bits) && data->pgd[i]; ++i) { - ptep =3D data->pgd[i]; + if (level > 1) { end =3D (void *)ptep + DART_GRANULE(data); =20 while (ptep !=3D end) { dart_iopte pte =3D *ptep++; =20 if (pte) - iommu_free_pages(iopte_deref(pte, data)); + apple_dart_free_pgtables(data, iopte_deref(pte, data), level - 1); } - iommu_free_pages(data->pgd[i]); } + iommu_free_pages(start); +} + +static void apple_dart_free_pgtable(struct io_pgtable *iop) +{ + struct dart_io_pgtable *data =3D io_pgtable_to_data(iop); + int i; + + for (i =3D 0; i < (1 << data->tbl_bits) && data->pgd[i]; ++i) + apple_dart_free_pgtables(data, data->pgd[i], data->levels - 1); =20 kfree(data); } diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h index 138fbd89b1e633b8dad7a931d507c4809e40a171..8a823c6f2b4a88cbb96273d3aaf= 972b6a4c222a3 100644 --- a/include/linux/io-pgtable.h +++ b/include/linux/io-pgtable.h @@ -180,6 +180,7 @@ struct io_pgtable_cfg { struct { u64 ttbr[4]; u32 n_ttbrs; + u32 n_levels; } apple_dart_cfg; =20 struct { --=20 2.50.1 From nobody Sat Oct 4 17:29:45 2025 Received: from fhigh-a4-smtp.messagingengine.com (fhigh-a4-smtp.messagingengine.com [103.168.172.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF54E2E2DD0 for ; Thu, 14 Aug 2025 08:40:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.155 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755160861; cv=none; b=fCbzxZrzCRYYU6FkcwPFY5aibDQOP5zUvn0GKGles9iB1KBkT4PuR2xYXz8UFlDyPnM6gepems6a8Il2/WDlnYbXEjJeDAuxlz0rj2vzEjpbK2q///gWOJXd0R3UKyaDoJeAYQEWvZbUdB57A/rIHm0v95yZJBZuZxDKftrZVyM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755160861; c=relaxed/simple; bh=gWJwlS88i16HpoPuqvaPOKo986ultjZxcO66aCiGV/c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oFQlVdWbRDg9r/08k3rzDv6ouIGz2GsloK3iG1Wrun1MHAYoyMcSYJxUHcJbGF/OKFhr8N56v+WhJZYn9yu2BBuaC66vGqyfe+RV+s1/AfKfHNhunmxC1t3CuxnqYN2XUi3s5TxEj4S3LmW6wjsYZTEOLHqcMqlPfoG0jZ5wfmY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net; spf=pass smtp.mailfrom=jannau.net; dkim=pass (2048-bit key) header.d=jannau.net header.i=@jannau.net header.b=QUwWwTlG; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=QvZZkPt0; arc=none smtp.client-ip=103.168.172.155 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jannau.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=jannau.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=jannau.net header.i=@jannau.net header.b="QUwWwTlG"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="QvZZkPt0" Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfhigh.phl.internal (Postfix) with ESMTP id 01A1614001A4; Thu, 14 Aug 2025 04:40:57 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Thu, 14 Aug 2025 04:40:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jannau.net; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1755160856; x=1755247256; bh=bLfHLlJrKDPCs/FZhmHqK0Zp1Gpj5ygoSbCyX153n2Y=; b= QUwWwTlGGlUdh5D2EoYElGo4npNi9nDOcuOvtBZ9OWlu6yTnd1Z9NrQ1jBEabcZ3 6VbadAiTU/7b1it/1GM7XY292nR0UHUBWxstu4hL7C3kwukUdX80sKfmaVC6fubH I/8bAxa/ZYF0ebrrZZ1pVORmqRP8B6ZFdpdgMJ8QTAXTFgRm1mJC5zaMm5/gMNu9 0l5J6nEhKkSca7oAXZA/lO5RuM4ZWNy/+7SMJsQQjbwrdE7LgZ7MK4Xr/c+lfx0m Q9bKKw7OToFQwV+5E0QX4hRqT8VJiKbNe1LZS96XoyD8H1WYQL0u1mZIxqzsCc0U ZFvyUSdhsGKpSDNwEW+2Bw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1755160856; x= 1755247256; bh=bLfHLlJrKDPCs/FZhmHqK0Zp1Gpj5ygoSbCyX153n2Y=; b=Q vZZkPt0+rLKd8n6m/AcekTro7Nl3Q76TNOYw8LTtjI2u1OmyjansK5LsPsD2ynRA NxWBwalFpxD/ad0k4TIuo2K+p0hjPoo/jP7IBNq4VllVbOMJOBMFNWrtXTuwrdUB KvHL4XTQAyFu0dl7mSZwu8+zElq0xj1InW7SiVtmzcDoQIBmzqoYMDyWTJp7dOYu evrupFXmaJxwq+N57vQWcNn46Zp1/gOXKw1W4zlWxR5Sy8ScDJSClklA0yLdTRnT CPy6dSAkhaMEO/AB61fvbWx97NhHVu99ZmYTHw3o5OYH4H8st7hMfAKbvtlOida9 4+4biEfWT9/MVPJ9bJDfQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddugedtieefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpeflrghnnhgv ucfirhhunhgruhcuoehjsehjrghnnhgruhdrnhgvtheqnecuggftrfgrthhtvghrnhepfe ehheeileduffehteeihfdvtdelffdutdeludduiedutedvfeffheekhefgtedtnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhesjhgrnhhnrg hurdhnvghtpdhnsggprhgtphhtthhopeduvddpmhhouggvpehsmhhtphhouhhtpdhrtghp thhtohepfihilhhlsehkvghrnhgvlhdrohhrghdprhgtphhtthhopehiohhmmhhusehlih hsthhsrdhlihhnuhigrdguvghvpdhrtghpthhtohepmhgrrhgtrghnsehmrghrtggrnhdr shhtpdhrtghpthhtoheprhhosghinhdrmhhurhhphhihsegrrhhmrdgtohhmpdhrtghpth htohepjhhorhhoseeksgihthgvshdrohhrghdprhgtphhtthhopegrshgrhhhisehlihhs thhsrdhlihhnuhigrdguvghvpdhrtghpthhtoheplhhinhhugidqrghrmhdqkhgvrhhnvg hlsehlihhsthhsrdhinhhfrhgruggvrggurdhorhhgpdhrtghpthhtohepnhgvrghlsehg ohhmphgrrdguvghvpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkh gvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i47b949f6:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 14 Aug 2025 04:40:56 -0400 (EDT) From: Janne Grunau Date: Thu, 14 Aug 2025 10:40:26 +0200 Subject: [PATCH 3/3] iommu: apple-dart: Add 4-level page table support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250814-apple-dart-4levels-v1-3-db2214a78c08@jannau.net> References: <20250814-apple-dart-4levels-v1-0-db2214a78c08@jannau.net> In-Reply-To: <20250814-apple-dart-4levels-v1-0-db2214a78c08@jannau.net> To: Sven Peter , Alyssa Rosenzweig , Neal Gompa , Joerg Roedel , Will Deacon , Robin Murphy Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Janne Grunau , Hector Martin X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4726; i=j@jannau.net; s=yk2024; h=from:subject:message-id; bh=i3kAZWxlRfiQa+q5rET420js2FzDp/g4XWlOhDOKngU=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhoy5C/kmZwqe6Ti8S/vm27rkGRaaz7tWtj17l9L/41Hmw ss9p8rcO0pZGMS4GGTFFFmStF92MKyuUYypfRAGM4eVCWQIAxenAExkiybDf9+Eb056a2zqmyuO GGTyHChsa5ZM/Fl4ofTofcFGCV57N0aGTRnv8pdf0L1aZH5lkf6hvORI3lsKMX+6VopcutnxcfZ afgA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 From: Hector Martin The T8110 variant DART implementation on T602x SoCs indicates an IAS of 42, which requires an extra page table level. The extra level is optional, but let's implement it. Since the driver failed at IO page table creation with 42-bit IAS add "apple,t6020-dart" as separate compatible using the T8110 HW data. Later it might be useful to restrict this based on the actual attached devices, since most won't need that much address space anyway. Signed-off-by: Hector Martin Signed-off-by: Janne Grunau --- drivers/iommu/apple-dart.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c index e72a93e78e26ca61b233c83d439dbdfadf040fc6..bb48e8603d6c84bcf107294d851= c2f2fc1273298 100644 --- a/drivers/iommu/apple-dart.c +++ b/drivers/iommu/apple-dart.c @@ -133,6 +133,7 @@ #define DART_T8110_TCR 0x1000 #define DART_T8110_TCR_REMAP GENMASK(11, 8) #define DART_T8110_TCR_REMAP_EN BIT(7) +#define DART_T8110_TCR_FOUR_LEVEL BIT(3) #define DART_T8110_TCR_BYPASS_DAPF BIT(2) #define DART_T8110_TCR_BYPASS_DART BIT(1) #define DART_T8110_TCR_TRANSLATE_ENABLE BIT(0) @@ -177,6 +178,7 @@ struct apple_dart_hw { u32 tcr_enabled; u32 tcr_disabled; u32 tcr_bypass; + u32 tcr_4level; =20 u32 ttbr; u32 ttbr_valid; @@ -217,6 +219,7 @@ struct apple_dart { u32 pgsize; u32 num_streams; u32 supports_bypass : 1; + u32 four_level : 1; =20 struct iommu_group *sid2group[DART_MAX_STREAMS]; struct iommu_device iommu; @@ -305,13 +308,16 @@ static struct apple_dart_domain *to_dart_domain(struc= t iommu_domain *dom) } =20 static void -apple_dart_hw_enable_translation(struct apple_dart_stream_map *stream_map) +apple_dart_hw_enable_translation(struct apple_dart_stream_map *stream_map,= int levels) { struct apple_dart *dart =3D stream_map->dart; int sid; =20 + WARN_ON(levels !=3D 3 && levels !=3D 4); + WARN_ON(levels =3D=3D 4 && !dart->four_level); for_each_set_bit(sid, stream_map->sidmap, dart->num_streams) - writel(dart->hw->tcr_enabled, dart->regs + DART_TCR(dart, sid)); + writel(dart->hw->tcr_enabled | (levels =3D=3D 4 ? dart->hw->tcr_4level := 0), + dart->regs + DART_TCR(dart, sid)); } =20 static void apple_dart_hw_disable_dma(struct apple_dart_stream_map *stream= _map) @@ -569,7 +575,8 @@ apple_dart_setup_translation(struct apple_dart_domain *= domain, for (; i < stream_map->dart->hw->ttbr_count; ++i) apple_dart_hw_clear_ttbr(stream_map, i); =20 - apple_dart_hw_enable_translation(stream_map); + apple_dart_hw_enable_translation(stream_map, + pgtbl_cfg->apple_dart_cfg.n_levels); stream_map->dart->hw->invalidate_tlb(stream_map); } =20 @@ -614,7 +621,7 @@ static int apple_dart_finalize_domain(struct apple_dart= _domain *dart_domain, dart_domain->domain.pgsize_bitmap =3D pgtbl_cfg.pgsize_bitmap; dart_domain->domain.geometry.aperture_start =3D 0; dart_domain->domain.geometry.aperture_end =3D - (dma_addr_t)DMA_BIT_MASK(dart->ias); + (dma_addr_t)DMA_BIT_MASK(pgtbl_cfg.ias); dart_domain->domain.geometry.force_aperture =3D true; =20 dart_domain->finalized =3D true; @@ -807,6 +814,8 @@ static int apple_dart_of_xlate(struct device *dev, if (cfg_dart) { if (cfg_dart->pgsize !=3D dart->pgsize) return -EINVAL; + if (cfg_dart->ias !=3D dart->ias) + return -EINVAL; } =20 cfg->supports_bypass &=3D dart->supports_bypass; @@ -1137,6 +1146,7 @@ static int apple_dart_probe(struct platform_device *p= dev) dart->ias =3D FIELD_GET(DART_T8110_PARAMS3_VA_WIDTH, dart_params[2]); dart->oas =3D FIELD_GET(DART_T8110_PARAMS3_PA_WIDTH, dart_params[2]); dart->num_streams =3D FIELD_GET(DART_T8110_PARAMS4_NUM_SIDS, dart_params= [3]); + dart->four_level =3D dart->ias > 36; break; } =20 @@ -1169,9 +1179,9 @@ static int apple_dart_probe(struct platform_device *p= dev) =20 dev_info( &pdev->dev, - "DART [pagesize %x, %d streams, bypass support: %d, bypass forced: %d] i= nitialized\n", + "DART [pagesize %x, %d streams, bypass support: %d, bypass forced: %d, A= S %d -> %d] initialized\n", dart->pgsize, dart->num_streams, dart->supports_bypass, - dart->pgsize > PAGE_SIZE); + dart->pgsize > PAGE_SIZE, dart->ias, dart->oas); return 0; =20 err_sysfs_remove: @@ -1292,6 +1302,7 @@ static const struct apple_dart_hw apple_dart_hw_t8110= =3D { .tcr_enabled =3D DART_T8110_TCR_TRANSLATE_ENABLE, .tcr_disabled =3D 0, .tcr_bypass =3D DART_T8110_TCR_BYPASS_DAPF | DART_T8110_TCR_BYPASS_DART, + .tcr_4level =3D DART_T8110_TCR_FOUR_LEVEL, =20 .ttbr =3D DART_T8110_TTBR, .ttbr_valid =3D DART_T8110_TTBR_VALID, --=20 2.50.1