From patchwork Sun Nov 26 15:17:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Peter X-Patchwork-Id: 747452 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=svenpeter.dev header.i=@svenpeter.dev header.b="ezdyI/jx"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="s6+2g9E0" Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC41D110; Sun, 26 Nov 2023 07:17:18 -0800 (PST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 317325C0131; Sun, 26 Nov 2023 10:17:18 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Sun, 26 Nov 2023 10:17:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=svenpeter.dev; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1701011838; x= 1701098238; bh=9BqopU5P2Px1rSuq122+Z/QyeeLtFNsRvUhaSSz0syw=; b=e zdyI/jxZYTzfUTEFLakFWlSynjXobfWGWzQIhm+OCpQslUXsbD7z/ZsLyz+/UGLL ozme/EpYJtKHNPpvvAyLCb1qPWQ2SOGNT/BoXXmP8GO3roa0KLKAg+HgO5eQF0zs VJkp9NVhkUWF+fHX5VmJ+d0SYHZO3akv6BdANvXzBgc86M07YEyp6a40JWeoFwV3 WZE8yIxKeGHSBR4C+v0RBpQe7CtxUm+3xdtc733qs/kQzBEjGlwhDfkuS+OtHuhO uSI/N3P+IEh0OHbPfucwz0xThFixoapTz1mTMwJ56tr0BtwwtF9ECnXziUB4Epb8 n6pK3l4evE2CgxYZ/z8Mw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1701011838; x= 1701098238; bh=9BqopU5P2Px1rSuq122+Z/QyeeLtFNsRvUhaSSz0syw=; b=s 6+2g9E0kBaKNt/GTBJQPcSkV52YeUbnk23Qmv8F4LjozXhJBi6KzxzOZPSdtGW23 t1PVFKSZBVaL+kwotHSI8tYjGQgzxWc3FD1vIeI/FFTAyy+iHpQg+ZSmk40J9Mg2 pPbUw7QAo4xAhGq6WgcUJMxdv+/CemwsAVLdRBrPE6zdQ51e4UnSrQoQ29wHv097 Lu30lsozzZm1uM6hJot/lps+i1GHf/+WAqST60ttWsbmnmz88O4Ve4bGfbsZpmsc dFiIqkJguKvJfmyVF0vscWrgI8WzHzSaRLkW3oeueXlwi7bYoyvy3xIvgodVnVet /6FKYRpb5CV8v6fzjU/9g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudehledgjeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufhvvghn ucfrvghtvghruceoshhvvghnsehsvhgvnhhpvghtvghrrdguvghvqeenucggtffrrghtth gvrhhnpeejieehheekgedvjefhveekjefguddtfefhteehtdeiffelkeeiuedufeelkeej geenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsvh gvnhesshhvvghnphgvthgvrhdruggvvh X-ME-Proxy: Feedback-ID: i51094778:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 26 Nov 2023 10:17:15 -0500 (EST) From: Sven Peter To: Hector Martin , Sven Peter , Joerg Roedel , Will Deacon , Robin Murphy Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alyssa Rosenzweig , linux-arm-kernel@lists.infradead.org, asahi@lists.linux.dev, iommu@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/3] iommu: dart: Write to all DART_T8020_STREAM_SELECT Date: Sun, 26 Nov 2023 16:17:00 +0100 Message-Id: <20231126151701.16534-3-sven@svenpeter.dev> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20231126151701.16534-1-sven@svenpeter.dev> References: <20231126151701.16534-1-sven@svenpeter.dev> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We're about to add support for a DART variant that use more than 16 streams and requires writing to two separate stream select registers when issuing TLB flushes. Acked-by: Hector Martin Signed-off-by: Sven Peter --- drivers/iommu/apple-dart.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c index ee05f4824bfa..8b6b0cdba9b5 100644 --- a/drivers/iommu/apple-dart.c +++ b/drivers/iommu/apple-dart.c @@ -368,12 +368,14 @@ apple_dart_t8020_hw_stream_command(struct apple_dart_stream_map *stream_map, u32 command) { unsigned long flags; - int ret; + int ret, i; u32 command_reg; spin_lock_irqsave(&stream_map->dart->lock, flags); - writel(stream_map->sidmap[0], stream_map->dart->regs + DART_T8020_STREAM_SELECT); + for (i = 0; i < BITS_TO_U32(stream_map->dart->num_streams); i++) + writel(stream_map->sidmap[i], + stream_map->dart->regs + DART_T8020_STREAM_SELECT + 4 * i); writel(command, stream_map->dart->regs + DART_T8020_STREAM_COMMAND); ret = readl_poll_timeout_atomic(