From patchwork Fri Mar 7 20:07:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein via B4 Relay X-Patchwork-Id: 14007109 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1F460C19F32 for ; Fri, 7 Mar 2025 20:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=n7ahAhPaVbmvJ+GYrCpR7reVXxCTe1j1GHD20Jn19pE=; b=EcCZO2ZvRKbzozVbVn1bFObEpN JcEBHMo2rRVqjAuxT/uP1RNhrK2CH+MkNJpK+demZAU06vssWJTIZLxkgUXhnC6X1sFatisaDdis5 sFRyxFui85ugZyvhHfCI24tazp/7sGN1pXtCxwmnKnUYBNdT6k4zltyk26LNr2apI8BOQVxMpfu9n OxA9131Zd2/vnuHNZMYRM+qns1M0knxpa13OnTyF0xTe67KMG/BI8F0MHUlmxeprWtQPRs5iuP6lG iPU35xRI0/4li0UKCo6aH87yBcqEvb+ZXuLtLn9bT8U876TNUrWQu1u0dDJEMWZaNZ2G+nw8PpdOY uMwkCa3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tqe0j-0000000FRru-00VR; Fri, 07 Mar 2025 20:09:33 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tqdz5-0000000FRZk-2e5k for linux-arm-kernel@lists.infradead.org; Fri, 07 Mar 2025 20:07:52 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id ACAED5C61E5; Fri, 7 Mar 2025 20:05:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 07BCAC4CEE7; Fri, 7 Mar 2025 20:07:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741378070; bh=IbehU3J+OYsV0YR19msdwmo9VEnGilX4b2l/J/pWEKE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=pqWoUP0N4DJSJV1hyYYl/yQbVSqn4JGxlUsQfKaW5tdj1ub2Eu+tGgoYfug+PrOrE eSAzQAZnFZPbUNb4zeV8rZY4JeN5YWkvfvivyqJM0ZJ9PNJsFeRt8YX++9J6Qr4YE1 aHHf2Yk0+sJD+g/HlVK/O2AolXsik5hGrJTvqY0s1Ub54ZwrSSxYm2LUQ9/wQa9gYM mnlix4S0nr8kXzg+jYbT59cdj+Jk5oXdKX5RD57LRYPFOZYiyAHb1MS1fnn8YRBQMB kkPuBn3ah+MOQVHNIcgdLyVgVi89gMdVX8RM8keABs3BHLlC2kNALc3fX/82AHxwaG Qn2YDzAx+onWw== 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 E76D8C28B23; Fri, 7 Mar 2025 20:07:49 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Fri, 07 Mar 2025 21:07:45 +0100 Subject: [PATCH v3 1/2] iommu: apple-dart: Increase MAX_DARTS_PER_DEVICE to 3 MIME-Version: 1.0 Message-Id: <20250307-isp-dart-v3-1-684fe4489591@gmail.com> References: <20250307-isp-dart-v3-0-684fe4489591@gmail.com> In-Reply-To: <20250307-isp-dart-v3-0-684fe4489591@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=1741378068; l=698; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=lnQqB1BR4mWIGODXOGI5G9lt91LbhceR/0LaO+MRnP8=; b=hb786voX2A/Zpfx3df/i6HBELMfG+WChRQ+gVPjf13bM7zHlP5dR/JwTCojn8llcpbX90nexF PK1W1aIzQaYB/s5G7gj1BOAxx9vqxvreXXoTQpErQTiKqYEeOtsrraY 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250307_120751_732425_536F006F X-CRM114-Status: UNSURE ( 9.95 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: fnkl.kernel@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Hector Martin ISP needs this. Signed-off-by: Hector Martin Reviewed-by: Alyssa Rosenzweig Signed-off-by: Sasha Finkelstein --- 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..edb2fb22333506d7c64ad1b6321df00ebfd07747 100644 --- a/drivers/iommu/apple-dart.c +++ b/drivers/iommu/apple-dart.c @@ -36,7 +36,7 @@ #define DART_MAX_STREAMS 256 #define DART_MAX_TTBR 4 -#define MAX_DARTS_PER_DEVICE 2 +#define MAX_DARTS_PER_DEVICE 3 /* Common registers */ From patchwork Fri Mar 7 20:07:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein via B4 Relay X-Patchwork-Id: 14007111 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8AA0DC28B23 for ; Fri, 7 Mar 2025 20:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gr6ROetsJY2cCEly0Qtya6BXvmAkeMOiZVwnUxiS3ZQ=; b=zUHvaBSF1fIIqMz4JFWfAIQODq ezl8yCaDcfh+h7iw+Hy5OLEhBTnKfbNb5HeK7ANeQBJd1YdzWpriZufRYsDZNtz1ce1gmxr+9oVR2 y8Dp60NT2E+6PgFADPlgMRaQNc2d2MUqjCyjxVFrWimSb4LJed9H58+VIc5yU1T5IVuf1kyqTBsPV g1gKyi/ex9bVlPjvuai2AH0kpjHbig6RAu5QoZNgceQWxrPtt0W2aI6rOwAovtL48yibobWzOx+lT vq9PmFArt+FrIIg8L+9HhkM7jXdOGiQMuf+lmWcyrs7SyITqsAOzCpvj8XXu4dcbmW9aaER0fdrZz QRYYr1EQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tqe3w-0000000FSSH-1oIq; Fri, 07 Mar 2025 20:12:52 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tqdz5-0000000FRZm-3ARE for linux-arm-kernel@lists.infradead.org; Fri, 07 Mar 2025 20:07:53 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id C711B5C61E8; Fri, 7 Mar 2025 20:05:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 12084C4CEE8; Fri, 7 Mar 2025 20:07:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741378070; bh=KA79ZbiEBvPYyWfzjjnUellynBK/ryTNjq2ShoxsjFA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=IbatuPWVSNByvLc1+CYBlKj/PqfCXXv01QymwjMRJu/N3rxFoUulaWzfHgKPXhZLk wc7j8rKZYZ5CQclCfYnzKFXHBrqEaqiFFWsbsDkKa5ioZtMYfXr9qC/ByWDo4ZTtXl 4+dWmZmZi1jfqjfqnejl+d23lkN3vH+XlRAgm3cjEgwyJl+Y9fXJ822A/AkWCxfypV c9MBQwvh7wP4+u/tZTC0XIymnOTIyWZ+dN4PDCifWuxZB20sDwlghqcqJTBKIXaQfk ANb2988indqdM3OOk1dAXIfJyztPczeaQzwWOz5uV4v+iq6AkyyIZ/J0K+VkEienae 0QPQD4g4CyrrA== 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 0269FC28B27; Fri, 7 Mar 2025 20:07:50 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Fri, 07 Mar 2025 21:07:46 +0100 Subject: [PATCH v3 2/2] iommu: apple-dart: Allow mismatched bypass support MIME-Version: 1.0 Message-Id: <20250307-isp-dart-v3-2-684fe4489591@gmail.com> References: <20250307-isp-dart-v3-0-684fe4489591@gmail.com> In-Reply-To: <20250307-isp-dart-v3-0-684fe4489591@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=1741378068; l=2218; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=3aDy2S8QXy8OI20z2hGDfoi8k/VVP4EgGDhon31Nli0=; b=kttzfDkZosiRjwEHcNhPQmIYNEUFg22THIwPw0L5LDLgXk/s/Jour4qoEVJ9RHWofnriYfCGE D3ru2R4mrUXCVs5ej3ujynhnGtQO4iSbPJvsFLF/CFfPNrplsNJA+Am 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250307_120751_916348_06F0BB7A X-CRM114-Status: GOOD ( 14.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: fnkl.kernel@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Hector Martin This is needed by ISP, which has DART0 with bypass and DART1/2 without. Signed-off-by: Hector Martin Reviewed-by: Alyssa Rosenzweig Signed-off-by: Sasha Finkelstein --- drivers/iommu/apple-dart.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c index edb2fb22333506d7c64ad1b6321df00ebfd07747..13ccb801f52a4d34f6653f78e92787af7dfed1bc 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]; }; @@ -684,7 +687,7 @@ static int apple_dart_attach_dev_identity(struct iommu_domain *domain, struct apple_dart_stream_map *stream_map; int i; - if (!cfg->stream_maps[0].dart->supports_bypass) + if (!cfg->supports_bypass) return -EINVAL; for_each_stream_map(i, cfg, stream_map) @@ -792,20 +795,24 @@ static int apple_dart_of_xlate(struct device *dev, return -EINVAL; sid = args->args[0]; - if (!cfg) + if (!cfg) { cfg = kzalloc(sizeof(*cfg), GFP_KERNEL); + + /* Will be ANDed with DART capabilities */ + cfg->supports_bypass = true; + } if (!cfg) return -ENOMEM; dev_iommu_priv_set(dev, cfg); cfg_dart = cfg->stream_maps[0].dart; if (cfg_dart) { - if (cfg_dart->supports_bypass != dart->supports_bypass) - return -EINVAL; if (cfg_dart->pgsize != dart->pgsize) return -EINVAL; } + cfg->supports_bypass &= dart->supports_bypass; + for (i = 0; i < MAX_DARTS_PER_DEVICE; ++i) { if (cfg->stream_maps[i].dart == dart) { set_bit(sid, cfg->stream_maps[i].sidmap); @@ -945,7 +952,7 @@ static int apple_dart_def_domain_type(struct device *dev) 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; return 0;