From patchwork Sun May 15 20:20:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 12850082 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 2A9A8C433F5 for ; Sun, 15 May 2022 20:24:03 +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=O0hP1Ln1ta677/xDP2Tmqiq9Jr9WYNEoLWkjtOByiFQ=; b=SZqw1r0KXZFYQ1 swFM1uoX77nMnh0RmyBW1RHzayD82Xv3aTPOMBlr0XGBvhTtlhJMJem7hcgiSPZ3qYPTTwHdaTHyU khSi0iLyytxtolCFTkikbejpJnoleiUhQzx4ufsP/uYWHZ9fSDwSh/VDQQWuWhSPXtuRNsF9GCB7V aflSuwWf8898Z2zd3jU9ANYk4dMjPRr12cAUGPsoSB3smJuItW9aQkvw8MUUxk3EOUsT33Vsvux/E yqnmmQ8YtHdeC/T3vT76oHG71NXzE5BQPYllMhaFC64Rtr9jKBQbmGSB6HkByNFjxEsLtdiKiI+eH bpa5w3G4u0cX1fw+4wcw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nqKlX-004unc-Kj; Sun, 15 May 2022 20:22:59 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nqKk5-004u9C-2m; Sun, 15 May 2022 20:21:32 +0000 Received: from localhost.localdomain ([37.4.249.94]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MwwuJ-1nfhqj41CF-00yMXI; Sun, 15 May 2022 22:21:23 +0200 From: Stefan Wahren To: Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Lee Jones Cc: Peter Robinson , Melissa Wen , Phil Elwell , bcm-kernel-feedback-list@broadcom.com, Maxime Ripard , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren Subject: [PATCH 08/11] soc: bcm: bcm2835-power: Refactor ASB control Date: Sun, 15 May 2022 22:20:29 +0200 Message-Id: <20220515202032.3046-9-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220515202032.3046-1-stefan.wahren@i2se.com> References: <20220515202032.3046-1-stefan.wahren@i2se.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Zqx34iD9uP2vLVfJxyyrnXUaDcBAS1OAjj+1y5zlPa6QSvmg7dF lNniJXMsL7INUDUZVbU4O2kSzlZB4jjnbiAbXKC6KSplR7p7cmoPyuMaLHCxL9ikzuALSfl VYXJIXicKPowLJh6A66+fnP7HCu9Y2b1PK3x+x2iVCl4fPTj3IK8Sk46oPQXMdMKdw6+4WZ 6UZHATKF7UpguG4FWurGw== X-UI-Out-Filterresults: notjunk:1;V03:K0:wHxqaCRRoUs=:7jadS5BZLbCNTKKcTEADfW +aSAv/86dO5OsBydg79joGUnw/7GDqTV9kVQSarYMEjLR0w0+k+T9IVf44z1GlYwanKn5jWRh B+tKSiCk2lqwN9umJ06V6hOT7h2WVKAASD6mxoP37eDgY40c02hlocx5oQIjENoj1lAfGtIst r9heMmlAgkSwToJAIf8feiJJouW8Nl9b0RWucE1xleFB1S8OwsF3vxM9FA2v7EETpw9U0ncgl FcaW4b/XQglYtHoXSzz7rEAZSlaWUM5ZZ3HDhLTBCfym0iqkowwA9aXeiMCOvqbwHnOWDQbuH NarRhAtCCbxKLKFOCjhIUxYHIUJ/6X67LEjZPA/aSKSsjuNpPaPNISNc+KDK1lPB3OrF20wxa rCAdD2vj6XZf4XI651H1AAXz/LrBb03RXIgLhhB5qOkrMbDBLAUikD8RxNyeElpI0qGtpIiB2 nZLheFMqITZVHOSsug2CWz3JVHWN4CFnW0+wzEwmYZrDvQ7+DKC7/dDirljjMChp3dPNp9tVE hv3mEqM9bHlXEXFZTGftx5FCC4mPBobGIDOYmWbqSm8n69pQJETvNUeFlipEqvteHDL9aXNho ffHp0zyK0u4m41dqzac9uhHrtFNqDdSaLNAhUVt7omIUULuoYmz+iw7+WUJA4hvyqvZINGk4P 3zOFvtFhNaGSuPYD5vjXZMlkzSwFHHY/83urlDBoSJ1vyGVI08lBjU9WiJ2m6OP78ZfUJytLg yZxgTeDR0g9U36hU X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220515_132129_503151_1F953073 X-CRM114-Status: GOOD ( 12.17 ) 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 The functions to control the async AXI bridges are almost identical. So define a general function to handle it and keep the original ones as wrapper. This should make this driver easier to extend. Signed-off-by: Stefan Wahren Reviewed-by: Peter Robinson --- drivers/soc/bcm/bcm2835-power.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c index 1e0041ec8132..77dc9e62b207 100644 --- a/drivers/soc/bcm/bcm2835-power.c +++ b/drivers/soc/bcm/bcm2835-power.c @@ -148,7 +148,7 @@ struct bcm2835_power { struct reset_controller_dev reset; }; -static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) +static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable) { u64 start; @@ -158,7 +158,12 @@ static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) start = ktime_get_ns(); /* Enable the module's async AXI bridges. */ - ASB_WRITE(reg, ASB_READ(reg) & ~ASB_REQ_STOP); + if (enable) { + ASB_WRITE(reg, ASB_READ(reg) & ~ASB_REQ_STOP); + } else { + ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP); + } + while (ASB_READ(reg) & ASB_ACK) { cpu_relax(); if (ktime_get_ns() - start >= 1000) @@ -168,24 +173,14 @@ static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) return 0; } -static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg) +static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) { - u64 start; - - if (!reg) - return 0; - - start = ktime_get_ns(); - - /* Enable the module's async AXI bridges. */ - ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP); - while (!(ASB_READ(reg) & ASB_ACK)) { - cpu_relax(); - if (ktime_get_ns() - start >= 1000) - return -ETIMEDOUT; - } + return bcm2835_asb_control(power, reg, true); +} - return 0; +static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg) +{ + return bcm2835_asb_control(power, reg, false); } static int bcm2835_power_power_off(struct bcm2835_power_domain *pd, u32 pm_reg)