From patchwork Fri Feb 28 16:32:08 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: 13996753 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 607A5C282C6 for ; Fri, 28 Feb 2025 16:33:56 +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=IiHYz26Y9rAkIayxSR8TSBYL/nYvR4vAeybzGj5ivZ8=; b=FJ/aK4Pw9MedvkKZiUkm+W/tOY 0Rf3UQ44LxIrOIDhwc1Ehy6YY0qBf6NvZhxD7oYLTECDe3PPt4D2ICWoNkm4gzAgLYiEElUkIWPDx sXcI3Pefc4rm5MOffq5Tzv2tamftCiOfNuRrcaS2Bgym8mDifQdRpi+LnXtQjNyHfMwkUevvnuhuX q4q11+tAwBAOsUImeZxJ0Op9PRf3V2zme/5tjWSJHezAxKFSydo5/fZfxktzMQW9zyOu2w5T+1U3a 2xlUjIPEqkrOu6YG4sbkr3Y0j25CooMhqlFbh4rKulVSQw0LQm7ASauGhCO6EHhn05RxTK74Ylssz 1g4QzrIQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1to3J5-0000000BgwI-0tjZ; Fri, 28 Feb 2025 16:33:47 +0000 Received: from tor.source.kernel.org ([2600:3c04::f03c:95ff:fe5e:7468]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1to3HV-0000000BgAu-3OAw for linux-arm-kernel@lists.infradead.org; Fri, 28 Feb 2025 16:32:09 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 9FDEF61FAC; Fri, 28 Feb 2025 16:32:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id DB10EC4CEE5; Fri, 28 Feb 2025 16:32:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740760328; bh=tsTyrgfGR1TF3kJGjt+QWLhzUmq3p9YOvm4Cf0N//Kg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=eV7LK789topPlHHfQSTWx1vv9ntC6T22GrooijacKuLr8M6EEjQ5tX5cutpeYfbnU KGsheLpfaRH34RrL60jRz4BdzXv7ZWOKF++3ZGQ4MqtQb4yqZsSV0LVbGm9mqsU5X2 GMWuqPplDh3f0dNV8NOH2FaxSIR53VPCJKAFHCxcvvA5DCnJwbPbdHAfZD3TUQ/GDQ Pyc3hC/mT07W4s+d2BOLLspcRnckUBHQyLCuBMESlbJx+JcKKKnLgTmGxW2sD9gCP0 GSheXggVDPYt0kYqk2RjaAp8QIkKfi+EmdB94vZaViUVujD0GwbwoxPpDuwXWz/BMt SgOALH7gTP0vQ== 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 CCE30C282D1; Fri, 28 Feb 2025 16:32:08 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Fri, 28 Feb 2025 17:32:08 +0100 Subject: [PATCH v2 2/2] iommu: apple-dart: Allow mismatched bypass support MIME-Version: 1.0 Message-Id: <20250228-isp-dart-v2-2-0ead81a90e2d@gmail.com> References: <20250228-isp-dart-v2-0-0ead81a90e2d@gmail.com> In-Reply-To: <20250228-isp-dart-v2-0-0ead81a90e2d@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=1740760327; l=2163; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=JQSupRxxeo02jeCiSjlLYXGm5UYUz824xOI4n+kLsIc=; b=NIJtNGenNUqCGcrYn+CSg5iwM1CMxzExqc+CYKhhPQo7i/RgO9AE9OfTxrviHYf4OG5lC8nJg OGL27PZVqIaAgrswsqJtotv4GAOiML7r1Pe8wVGJdZ2W5H+Kw+Q2c34 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-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 Signed-off-by: Sasha Finkelstein Reviewed-by: Alyssa Rosenzweig --- 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;