From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) (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 14C2D3232; Sat, 28 Jan 2023 11:11:41 +0000 (UTC) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 769B73200437; Sat, 28 Jan 2023 06:11:39 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 28 Jan 2023 06:11:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=svenpeter.dev; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1674904299; x= 1674990699; bh=95cFYESovP/5VNc+cPvOHG0EQFnShh8vh/vZRQA6QEE=; b=d zeyfbiWH4qMpOpayK7ptqs/ng+h+UgBQdxg/M4/Mz7jQPHAh/1PCYaBYJIM3sFXS 8nlSvqzTb+0krb/EMFEDzd7lw0nQPwC3T+/xbt4EPVmb1cU8FThiW99FA/h/6nOW nPbgsE0YeWFmP05XvIP4BCGnHg0e9slquaog6aKjpJlvYPAshVFKj7DMqQAA7gQW JrybH740/n8ns0hpT/SWhxVOI1R2PCpREIs40xJao2DKG2zTGrXc/vNVwZtpBsXE 2b+bCnnOyKwAjzNLsA4ljovkKS8KQ+Ku+Ay6pHYxe/jL5COFdgKG5VYh2aU1+yy3 coBtuvkoUGsPauhpxnJVg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding: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=fm3; t=1674904299; x=1674990699; bh=95cFYESovP/5V Nc+cPvOHG0EQFnShh8vh/vZRQA6QEE=; b=ROaUUwA60NdlI0CcuJvUlvx9txZuX hlp6qf5PB7wiihk5tUJVba2gOwg8WcyArMzhnlL8+2B1oHYaOaDbqDbST8gPB87t mwmIskktVbBlrOnzr5wfCUD//megIbNXEsQYbQRvQxwcd+yz4WmGxAnPxKDb4tU4 e5D28B+Ni0fwjAmh0rUC/B8O9XxUFYUJWlaDgzhnM4UHfPL0hwbzoq9Do6aw9oQW rASYPbPnyvRtg/8TYN4f6SBGDtaC90ueRt02HZaDX6UsjNn4l/7/co2s24BWKY7y i3J1AxOp6sjcxdigYbd6izvIyuMIgPFVY63S8qG1zVIBmrBFgL9Djsswg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedruddvkedgvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufhvvghn ucfrvghtvghruceoshhvvghnsehsvhgvnhhpvghtvghrrdguvghvqeenucggtffrrghtth gvrhhnpeejieehheekgedvjefhveekjefguddtfefhteehtdeiffelkeeiuedufeelkeej geenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehsvh gvnhesshhvvghnphgvthgvrhdruggvvh X-ME-Proxy: Feedback-ID: i51094778:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 28 Jan 2023 06:11:37 -0500 (EST) From: Sven Peter To: Hector Martin , Sven Peter , Joerg Roedel , Will Deacon , Robin Murphy Cc: Rob Herring , Krzysztof Kozlowski , 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 3/4] iommu: dart: Write to all DART_T8020_STREAM_SELECT Date: Sat, 28 Jan 2023 12:11:13 +0100 Message-Id: <20230128111114.4049-4-sven@svenpeter.dev> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20230128111114.4049-1-sven@svenpeter.dev> References: <20230128111114.4049-1-sven@svenpeter.dev> Precedence: bulk X-Mailing-List: asahi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. 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 7d8b2b90cdb6..7579c97a9062 100644 --- a/drivers/iommu/apple-dart.c +++ b/drivers/iommu/apple-dart.c @@ -372,12 +372,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( -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 E9BB7C27C76 for ; Sat, 28 Jan 2023 11:13:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hejqsHx4RaCUAVBqEd3f1aEGwFZx2g4QaMWQntkdwrc=; b=O90qR4EjhTSp7Y r+OYV5l9i8WAvB4qquGn6vSpeNFbwNWvw9kQaPOKeeroYWCarlnl5FcYbZr6Y07NDJJWv3bra1ND2 LnxOGwzGFnaJTrBO6cV836SI3mVxvZPV9tTUIOz3OCCAYELx/9ELT440NU29i2UBW9mikyKzJWOQ/ gCnvFCZoM2LKc8gww7xT13OTiILNEqhIOIJZWhs4NbDA55u04RvEfjxUwjhXTvvZl6XxY77oWTyC2 /wfBDHu9OyZz6jBOtqi0Ts4ypk2W1Bn0RvM43CV/UopaWmEH/njUaBMOLJSabI9ZfeDDVhj1efu5A CHQzQhYaVlPfsmX3OTsQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pLj7r-0004Jd-EH; Sat, 28 Jan 2023 11:12:03 +0000 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pLj7V-0004Di-2O for linux-arm-kernel@lists.infradead.org; Sat, 28 Jan 2023 11:11:42 +0000 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 769B73200437; Sat, 28 Jan 2023 06:11:39 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 28 Jan 2023 06:11:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=svenpeter.dev; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1674904299; x= 1674990699; bh=95cFYESovP/5VNc+cPvOHG0EQFnShh8vh/vZRQA6QEE=; b=d zeyfbiWH4qMpOpayK7ptqs/ng+h+UgBQdxg/M4/Mz7jQPHAh/1PCYaBYJIM3sFXS 8nlSvqzTb+0krb/EMFEDzd7lw0nQPwC3T+/xbt4EPVmb1cU8FThiW99FA/h/6nOW nPbgsE0YeWFmP05XvIP4BCGnHg0e9slquaog6aKjpJlvYPAshVFKj7DMqQAA7gQW JrybH740/n8ns0hpT/SWhxVOI1R2PCpREIs40xJao2DKG2zTGrXc/vNVwZtpBsXE 2b+bCnnOyKwAjzNLsA4ljovkKS8KQ+Ku+Ay6pHYxe/jL5COFdgKG5VYh2aU1+yy3 coBtuvkoUGsPauhpxnJVg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding: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=fm3; t=1674904299; x=1674990699; bh=95cFYESovP/5V Nc+cPvOHG0EQFnShh8vh/vZRQA6QEE=; b=ROaUUwA60NdlI0CcuJvUlvx9txZuX hlp6qf5PB7wiihk5tUJVba2gOwg8WcyArMzhnlL8+2B1oHYaOaDbqDbST8gPB87t mwmIskktVbBlrOnzr5wfCUD//megIbNXEsQYbQRvQxwcd+yz4WmGxAnPxKDb4tU4 e5D28B+Ni0fwjAmh0rUC/B8O9XxUFYUJWlaDgzhnM4UHfPL0hwbzoq9Do6aw9oQW rASYPbPnyvRtg/8TYN4f6SBGDtaC90ueRt02HZaDX6UsjNn4l/7/co2s24BWKY7y i3J1AxOp6sjcxdigYbd6izvIyuMIgPFVY63S8qG1zVIBmrBFgL9Djsswg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedruddvkedgvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufhvvghn ucfrvghtvghruceoshhvvghnsehsvhgvnhhpvghtvghrrdguvghvqeenucggtffrrghtth gvrhhnpeejieehheekgedvjefhveekjefguddtfefhteehtdeiffelkeeiuedufeelkeej geenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehsvh gvnhesshhvvghnphgvthgvrhdruggvvh X-ME-Proxy: Feedback-ID: i51094778:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 28 Jan 2023 06:11:37 -0500 (EST) From: Sven Peter To: Hector Martin , Sven Peter , Joerg Roedel , Will Deacon , Robin Murphy Cc: Rob Herring , Krzysztof Kozlowski , 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 3/4] iommu: dart: Write to all DART_T8020_STREAM_SELECT Date: Sat, 28 Jan 2023 12:11:13 +0100 Message-Id: <20230128111114.4049-4-sven@svenpeter.dev> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20230128111114.4049-1-sven@svenpeter.dev> References: <20230128111114.4049-1-sven@svenpeter.dev> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230128_031141_162703_147E37CE X-CRM114-Status: GOOD ( 10.16 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. 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 7d8b2b90cdb6..7579c97a9062 100644 --- a/drivers/iommu/apple-dart.c +++ b/drivers/iommu/apple-dart.c @@ -372,12 +372,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( -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel