From nobody Sat Feb 7 20:10:45 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6C6E11B4F15; Thu, 27 Feb 2025 16:56:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740675368; cv=none; b=q4K+ypgMAES37orrn/zGonitBLBhWmXjR/tAwHd/00T5jKsojpDwd90pgRbkNtR0kPltqFplde3DDsdKGE9Zhxr1TIAaJF4+Hj7XX1/L+az+NwvwIFIgG3pp8vFK9/MGo/keUNcT2Alhs2s9eKwXX9YNZZWlp0eTTt1iMHgkX28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740675368; c=relaxed/simple; bh=4UiMkKkA2k7XmYBH6m4C6kTI8TjWMvHDne3q7Wmshd8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Xm98MD+9JlW8MJA4YnXur+zMcEyPyJLOSt4a9u82vQ1vuoyYJJQtOT7anNy4fpHP2bRO5O9N+YkBdmLp7CPGz0KCEoEz6r03IvGHPxg3vj2JZ3NlNQQYF63WfyKJeB6PbqSv0QJB8eaodN71wipk6Em2k13RRaoHqZjjI9OHkm8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=r3WXj7Zf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="r3WXj7Zf" Received: by smtp.kernel.org (Postfix) with ESMTPS id 039B5C4CEE7; Thu, 27 Feb 2025 16:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740675368; bh=4UiMkKkA2k7XmYBH6m4C6kTI8TjWMvHDne3q7Wmshd8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=r3WXj7Zf9qbAc4E44AOSlvzhMW8gE1wOPf+XLxyFDJfByYEYpiuwzAE3i65/G8kyO 60YB0MdyzN95iADRDOKAJBg5Bx4hjlRKVjuLv+vL47fRZZPv0EyYVA4S03iwvcmCjv VpGWnW4zCpwHraa4KfdmZG+nScj3iOIDKf6qBBesR8FMshSSo8eHjoSu7yPCIXf3qC bfUXHYo42MPHIo1IUqoq4xSVmX9GUXeB9ewt8dVqp3Lw25lTRHoJ8x0+Nhag1WDe7y 0z0pOQ2CeeL03jp38KB87WLdvAMNdBEkOjGOidaVDE+QTUJWrm8EsL+sTAYGtV1Wlq bNR85VXu28Qyw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2E65C282C1; Thu, 27 Feb 2025 16:56:07 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Thu, 27 Feb 2025 17:56:03 +0100 Subject: [PATCH 1/2] iommu: apple-dart: Increase MAX_DARTS_PER_DEVICE to 3 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: <20250227-isp-dart-v1-1-161e91ef4f46@gmail.com> References: <20250227-isp-dart-v1-0-161e91ef4f46@gmail.com> In-Reply-To: <20250227-isp-dart-v1-0-161e91ef4f46@gmail.com> To: Sven Peter , Janne Grunau , Alyssa Rosenzweig , 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, Sasha Finkelstein , Hector Martin X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1740675366; l=643; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=VLb6ei5YDATwjI9GwTuWhThgZUr54hxXR+bLrvtteos=; b=nGennlX6EccZFKEYMqV//HecoBeGHkhvWIENZ1kzeI1LmLGnOIbWsPLane7YabErGkJ94lnzi EDuLvx5Cd4UCBm8e92qD8T/Q5beHjuc2U6wmjryWx2nGorcigYKmfbH X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= X-Endpoint-Received: by B4 Relay for fnkl.kernel@gmail.com/20241124 with auth_id=283 X-Original-From: Sasha Finkelstein Reply-To: fnkl.kernel@gmail.com From: Hector Martin ISP needs this. Signed-off-by: Hector Martin Signed-off-by: Sasha Finkelstein Reviewed-by: Alyssa Rosenzweig --- drivers/iommu/apple-dart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c index 95ba3caeb40177901086076416874b9905a1f40a..edb2fb22333506d7c64ad1b6321= df00ebfd07747 100644 --- a/drivers/iommu/apple-dart.c +++ b/drivers/iommu/apple-dart.c @@ -36,7 +36,7 @@ =20 #define DART_MAX_STREAMS 256 #define DART_MAX_TTBR 4 -#define MAX_DARTS_PER_DEVICE 2 +#define MAX_DARTS_PER_DEVICE 3 =20 /* Common registers */ =20 --=20 2.48.1 From nobody Sat Feb 7 20:10:45 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6C7311B85DF; Thu, 27 Feb 2025 16:56:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740675368; cv=none; b=XTfL8JWb1CLcY7HAPJ5hLf2TwqEphsKZ3LwMCcqnU2xbplJvxCVceivLjq0pfOaYPzk8mJj4H3b2FlKcP3k6eCWz/jb1OSYssUZswnk75MHHWJHVHEBGO9zvP5upQk1daBpP25LoRRiY7SwxpGUzmSJauvONDFrWul2Wd+3/EeI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740675368; c=relaxed/simple; bh=7HnH0tkGi++tfrMg4A08fP3/JgYCMXFck9UdnyuZJUs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hD0WAfK27BTK3u/fNdojqFcDvrmrJR1uPs8rG2gbENIhee5X6S9hWQ4Uu3lV08ZpmRv658PsK/KVOCChzNU3AIrfnfjMy6ZOUFdiGVUItH7P4y1Wz7mZ/z//H+mFzyLMhFACbvGvAAGnacdIEcj6zsmFAwj9aWqjU9u+Ft4oKbk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=udyyN6QF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="udyyN6QF" Received: by smtp.kernel.org (Postfix) with ESMTPS id 185F3C4CEE8; Thu, 27 Feb 2025 16:56:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740675368; bh=7HnH0tkGi++tfrMg4A08fP3/JgYCMXFck9UdnyuZJUs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=udyyN6QF3gJwdGi82uRXy1tzgOU7TXWlRPmdUlftb9igMmTr9KWTJHIVQdQCP0xjC p9zo264hg3iIvw3m3l7l0v5+qjAn36NUP/DPGXJ6v+GBvVXW770vxgLJuZPIr6d5ca zfyMSVLGdv9e3RNF2R/Rdt2S0bjkgVJ3ZPUgQNEn7OAMdNq6IG+g+Rnu0qmZuhLuax JqTZckq5slG6yr4FLb8yNNL8PEb6yVZxkSS3CJal8ufMtzF3ejs2IqQXwAhvpfoGmd QIRXRJBC+/yzR8jS1TnRRmaoJBICCBZKUef1bhKBsxTII8XFXNrT6TsbXG/8460pUk 2IybkQuOlVzUQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08632C282C6; Thu, 27 Feb 2025 16:56:08 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Thu, 27 Feb 2025 17:56:04 +0100 Subject: [PATCH 2/2] iommu: apple-dart: Allow mismatched bypass 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: <20250227-isp-dart-v1-2-161e91ef4f46@gmail.com> References: <20250227-isp-dart-v1-0-161e91ef4f46@gmail.com> In-Reply-To: <20250227-isp-dart-v1-0-161e91ef4f46@gmail.com> To: Sven Peter , Janne Grunau , Alyssa Rosenzweig , 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, Sasha Finkelstein , Hector Martin X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1740675366; l=2179; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=oluYR6lIJ3W34r9MjQqDF6TqqSgqgYrQRwERY4BEI9Q=; b=eSN3v9XIi1argWNG7Tks59zvBzP73SHZjZmG7g7vHKGjGjGTcH8kxslRl9ra2VlQRsSOi+cNx TvD1Mx+i6jVD/mlzanTcUEi2j/UABzguTp0j3oJDjvGU15w3aEgz8t6 X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= X-Endpoint-Received: by B4 Relay for fnkl.kernel@gmail.com/20241124 with auth_id=283 X-Original-From: Sasha Finkelstein Reply-To: fnkl.kernel@gmail.com From: Hector Martin This is needed by ISP, which has DART0 with bypass and DART1/2 without. Signed-off-by: Hector Martin Signed-off-by: Sasha Finkelstein --- drivers/iommu/apple-dart.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c index edb2fb22333506d7c64ad1b6321df00ebfd07747..a41ad0627be003f2b0ce42a128c= 3b04bb2537d56 100644 --- a/drivers/iommu/apple-dart.c +++ b/drivers/iommu/apple-dart.c @@ -277,6 +277,9 @@ struct apple_dart_domain { * @streams: streams for this device */ struct apple_dart_master_cfg { + /* Intersection of DART capabilitles */ + u32 supports_bypass : 1; + struct apple_dart_stream_map stream_maps[MAX_DARTS_PER_DEVICE]; }; =20 @@ -684,7 +687,7 @@ static int apple_dart_attach_dev_identity(struct iommu_= domain *domain, struct apple_dart_stream_map *stream_map; int i; =20 - if (!cfg->stream_maps[0].dart->supports_bypass) + if (!cfg->supports_bypass) return -EINVAL; =20 for_each_stream_map(i, cfg, stream_map) @@ -792,20 +795,25 @@ static int apple_dart_of_xlate(struct device *dev, return -EINVAL; sid =3D args->args[0]; =20 - if (!cfg) + if (!cfg) { cfg =3D kzalloc(sizeof(*cfg), GFP_KERNEL); + + /* Will be ANDed with DART capabilities */ + cfg->supports_bypass =3D true; + } if (!cfg) return -ENOMEM; dev_iommu_priv_set(dev, cfg); =20 cfg_dart =3D cfg->stream_maps[0].dart; if (cfg_dart) { - if (cfg_dart->supports_bypass !=3D dart->supports_bypass) - return -EINVAL; if (cfg_dart->pgsize !=3D dart->pgsize) return -EINVAL; } =20 + if (!dart->supports_bypass) + cfg->supports_bypass =3D false; + for (i =3D 0; i < MAX_DARTS_PER_DEVICE; ++i) { if (cfg->stream_maps[i].dart =3D=3D dart) { set_bit(sid, cfg->stream_maps[i].sidmap); @@ -945,7 +953,7 @@ static int apple_dart_def_domain_type(struct device *de= v) =20 if (cfg->stream_maps[0].dart->pgsize > PAGE_SIZE) return IOMMU_DOMAIN_IDENTITY; - if (!cfg->stream_maps[0].dart->supports_bypass) + if (!cfg->supports_bypass) return IOMMU_DOMAIN_DMA; =20 return 0; --=20 2.48.1