From patchwork Sun Nov 26 16:20:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Peter X-Patchwork-Id: 13468891 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 486DAC4167B for ; Sun, 26 Nov 2023 16:21:09 +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: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:In-Reply-To:References: List-Owner; bh=ldiXvbK2AnVUVYAfOaA0DMHJLQkYZ1c8iRqLEVVg7/g=; b=Ja1XJlDGXoWSNz 76TlmHmELU9D8csGkcLzkLOE8/Wx5bieW2eiVP4TTDR6Gan8hOtfbWbuZiLNAp41ER//FFDshzvwE 31C+p/OgOS4UySxYSAWxBWbrPsjjUnXLT6lK0+XNE0D5i+ypNFTBcKnWY3jxdK3htBnyuk1WCx8NF RzxxuUw8/43Uc8H+1PhNpnIF9bjO9ixCVkCRacQ2WfV97NpTtuSNLr4JebmxEJwB4mMB/86m1ZSPN 9GX3Xa03lKVIOTm7V1YcruQkYdmGkueQiW7DJDkUM9Y0tokvdw52LFlMZbzkRN+v3651+5KzhXIk3 JyvMIGKofSupynE7egQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r7Hrz-00Cnpc-2d; Sun, 26 Nov 2023 16:20:31 +0000 Received: from out1-smtp.messagingengine.com ([66.111.4.25]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7Hrw-00CniJ-1d for linux-arm-kernel@lists.infradead.org; Sun, 26 Nov 2023 16:20:29 +0000 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 093F35C0162; Sun, 26 Nov 2023 11:20:19 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 26 Nov 2023 11:20:19 -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:message-id:mime-version:reply-to:sender :subject:subject:to:to; s=fm1; t=1701015619; x=1701102019; bh=Qy P8UlmkQUxctXvsLY+u2IDuION9oeAKPUhsirOlXLA=; b=mz9yoPopTnP5Pp9VMl d2z+GxcdEHJ0tmL5X3c0HKcOBIgBBPogGES9smTlQf/Y7YpXCFNuyR/cbd4eblDR U6itJOlmN29E0epnkGmKfcmml1kGtIIC8knv6lWDBXqAyizfMmZZ8uixkEfL9s0l gz64qKje4FM0BruZ0MVm/5QhsyanRTIhxhKBvMRD0t46o+qW88VhK6tOT1V8nhgi NLeR2JdE2uT0WNdG6vPoFqDD+9uRIQTDDM19javDpLi8/BW3yD9a35v/LmdOCh+s GmtmzU+bP2ys02U4p/7K2B8wDTEsX3PfdUs0GrgusNVLm+cGbN0qyt8614odS95O qWqA== 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:message-id:mime-version: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=1701015619; x=1701102019; bh=QyP8UlmkQUxct XvsLY+u2IDuION9oeAKPUhsirOlXLA=; b=pYW6R4XCzRWd0vTqOJWtxZ77G2Xa0 tiANXLIVKppJ2E10z+/38o4klXtIPbKRjbPZi0unsaPsdbWSkXKDPre2IDOZMDca 3fMLyDSrRIdACt1SgcX6EPjR0nfz6GpRo0+KhEsos1aOIq+mwzrrF1IfPsMgU/Il Yl8JMJPkrG/dBGxFcUjkinRSPBoW+jCImanE7oeCzAwFjNv2KAgh7Cx44BwZ9/3Z ufgv2gtu5LCLod4X9+evU0B0azE0ziOhagcQNvM+MbNC/hxFh1X3IB5qZWRU/EUW dKzARYnqNs7VRYa86/mEFocyApbgQik8UTYqlJu27PmINuvmOk6wIaHQQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudehledgledtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomhepufhvvghnucfr vghtvghruceoshhvvghnsehsvhgvnhhpvghtvghrrdguvghvqeenucggtffrrghtthgvrh hnpeeludffieehueevtdffvedtueelleejuddugfettdevhfefffdvgffhjeehgfelleen ucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsvhgvnh esshhvvghnphgvthgvrhdruggvvh X-ME-Proxy: Feedback-ID: i51094778:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 26 Nov 2023 11:20:16 -0500 (EST) From: Sven Peter To: Hector Martin , Sven Peter , Joerg Roedel , Will Deacon , Robin Murphy Cc: Alyssa Rosenzweig , asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] iommu: dart: Use readl instead of readl_relaxed for consistency Date: Sun, 26 Nov 2023 17:20:09 +0100 Message-Id: <20231126162009.17934-1-sven@svenpeter.dev> X-Mailer: git-send-email 2.39.3 (Apple Git-145) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231126_082028_612731_2BDE42EC X-CRM114-Status: GOOD ( 10.50 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org While the readl_relaxed in apple_dart_suspend is correct the rest of the driver uses the non-relaxed variants everywhere and the single readl_relaxed is inconsistent and possibly confusing. Signed-off-by: Sven Peter Reviewed-by: Neal Gompa Acked-by: Hector Martin --- 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 59cf256bf40f..c7f047ce0a7a 100644 --- a/drivers/iommu/apple-dart.c +++ b/drivers/iommu/apple-dart.c @@ -1272,7 +1272,7 @@ static __maybe_unused int apple_dart_suspend(struct device *dev) unsigned int sid, idx; for (sid = 0; sid < dart->num_streams; sid++) { - dart->save_tcr[sid] = readl_relaxed(dart->regs + DART_TCR(dart, sid)); + dart->save_tcr[sid] = readl(dart->regs + DART_TCR(dart, sid)); for (idx = 0; idx < dart->hw->ttbr_count; idx++) dart->save_ttbr[sid][idx] = readl(dart->regs + DART_TTBR(dart, sid, idx));