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 D83B0C433EF for ; Tue, 7 Jun 2022 20:45:28 +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=MLDGmHNTrsPBqFctut8UXukRxUp/wVy7NlQvBi60cAA=; b=H4ulmD+TOXj158 c2IW6Od8o9n0NAqgt1EP1M/Bs80LVhXykhLeFJdX+HY3kjbYcXBULq0jL8u2o7DYifJWZbZ4VlthK zLRaQKgRAHNJOUfukDwu8zVsaVd4YzBpNYhbZ17P/JJI+CldQFwYJ3yT7zw0AV+NTqMuPQOPg5fxH zSnt/SEdiuaBq1al4e8+DSEL8XRlhK6echHh2GDZA8prdZvX77TQFNa4H7zY5wwsKmSCIf/9ELoPo KeCHYAUEbmG5gW6NlKQXicUst5nQaXY2deqW7/naq3Yt/45uN4qKS0YSrPkuAwzfcwgrATH2gJbZf eXtqZeeKDxyXfmrGboeQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyg3u-009aMV-9C; Tue, 07 Jun 2022 20:44:26 +0000 Received: from mout.kundenserver.de ([217.72.192.73]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyg2a-009ZcI-Lx for linux-arm-kernel@lists.infradead.org; Tue, 07 Jun 2022 20:43:07 +0000 Received: from localhost.localdomain ([37.4.249.155]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MxVfj-1na6uH0ufB-00xuiT; Tue, 07 Jun 2022 22:42:56 +0200 From: Stefan Wahren To: Florian Fainelli , Ray Jui , Scott Branden , Lee Jones Cc: Peter Robinson , Melissa Wen , Phil Elwell , bcm-kernel-feedback-list@broadcom.com, Maxime Ripard , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren Subject: [PATCH V3 09/11] soc: bcm: bcm2835-power: Resolve ASB register macros Date: Tue, 7 Jun 2022 22:42:24 +0200 Message-Id: <20220607204226.8703-10-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220607204226.8703-1-stefan.wahren@i2se.com> References: <20220607204226.8703-1-stefan.wahren@i2se.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:TO0tcJhnc6nhVz7iEf0cEFHoHRyEGHAlr/i1E9NHLoKByewzB/J hyUBqfRDttjveiaVdHwzt357GJF9Oe6GPSorJlyJYsJ5LqZipZbWt9lvELJWl4laaX5tlUm 7Fvbk+lHu4r7NW5p0LowYno4vuCyDn70kiREiTozMnEjCqd7ZlbWB0JFTI/3/mVxIoppowk cNbeHiKvO8e25/ssZmC1g== X-UI-Out-Filterresults: notjunk:1;V03:K0:n6ovhqRBigY=:cuHDaTY5kjmUVkxZ1plKZr AVWZoZ4tF9bspBhvblEcptCiOVy/kJk2kOnboSUMH9ggtJiQbBh8jUXAWm6eFyHJjIksa6wx0 849a/w4l5wkY4m/i9RFxz9JUUG68qQVRAUh1p+xsIkk9OVr/9Te+/AwRZYIiIjUzOTMNOVhiu zbU18MvXAzkSfFMRx3rQGjWuGwoKWEwZ9zY1bS5N3T9bshvu/WDfz8A5VVOSbOY3Lnk7bXiGv INQcpO7AjE91DhceUohDZR3ca5tvBS/bDSbPTCEiMzo9jTWA08r62reHSo9zv7CvGzuVvJRhY ALCMxCxX+p/3m0ENqmPEBYR/q7zpBPcYLBMoHCRRWQVDt1TWcucIJmaHM8mfpDSs78KHGswSn 9Nv4uvvYhA5MrJDNsVxV+I3m9ZInSe/3lpE95zXeSlMAZ5Oen7L6bie07hhOW9zGyKRViVNx9 sAupSSvmThqOUeKjwVEIdon6PwDYSsUiKpXrgBOJC43auaW2+lG1wcqcd4C45fr3f14xNMU93 BI7KcDdN44gSaKBptz2Q2pVESDugcEY9G8zvsYBaHzjVYKqXYYTZ5fp8kxo7mkCvIeIEgX381 r99a8EoHIP0ZVgfPRV1HdhjovBt35DWcz8A4HCQGVqqaQr5Cow0WDlil0v2htjfZnK9IZZXVI 6McKmCMgKAdzHNEuLijWZZRP/S9jA3hih61AHfX0tiUutLDg/Eid8JuSdd5BGFJYpHKtMITnX u0jSp++CbcXRhrQ+0k9L925kRsdhwXUyF+J2BtzqCWrdb6zVFffWiu9GEmw= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220607_134305_087945_855DE090 X-CRM114-Status: GOOD ( 14.42 ) 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 The macros in order to access the ASB registers have a hard coded base address. So extending them for other platforms would make them harder to read. As a solution resolve these macros. Signed-off-by: Stefan Wahren Reviewed-by: Peter Robinson --- drivers/soc/bcm/bcm2835-power.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c index 77dc9e62b207..9c352f66e6d5 100644 --- a/drivers/soc/bcm/bcm2835-power.c +++ b/drivers/soc/bcm/bcm2835-power.c @@ -126,9 +126,6 @@ #define ASB_AXI_BRDG_ID 0x20 -#define ASB_READ(reg) readl(power->asb + (reg)) -#define ASB_WRITE(reg, val) writel(PM_PASSWORD | (val), power->asb + (reg)) - struct bcm2835_power_domain { struct generic_pm_domain base; struct bcm2835_power *power; @@ -150,7 +147,9 @@ struct bcm2835_power { static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable) { + void __iomem *base = power->asb; u64 start; + u32 val; if (!reg) return 0; @@ -159,12 +158,13 @@ static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable /* Enable the module's async AXI bridges. */ if (enable) { - ASB_WRITE(reg, ASB_READ(reg) & ~ASB_REQ_STOP); + val = readl(base + reg) & ~ASB_REQ_STOP; } else { - ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP); + val = readl(base + reg) | ASB_REQ_STOP; } + writel(PM_PASSWORD | val, base + reg); - while (ASB_READ(reg) & ASB_ACK) { + while (readl(base + reg) & ASB_ACK) { cpu_relax(); if (ktime_get_ns() - start >= 1000) return -ETIMEDOUT; @@ -622,7 +622,7 @@ static int bcm2835_power_probe(struct platform_device *pdev) power->base = pm->base; power->asb = pm->asb; - id = ASB_READ(ASB_AXI_BRDG_ID); + id = readl(power->asb + ASB_AXI_BRDG_ID); if (id != 0x62726467 /* "BRDG" */) { dev_err(dev, "ASB register ID returned 0x%08x\n", id); return -ENODEV; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09FCDC43334 for ; Wed, 8 Jun 2022 03:22:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230461AbiFHDWs (ORCPT ); Tue, 7 Jun 2022 23:22:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231946AbiFHDVz (ORCPT ); Tue, 7 Jun 2022 23:21:55 -0400 Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18AAD1F0FE4 for ; Tue, 7 Jun 2022 13:43:08 -0700 (PDT) Received: from localhost.localdomain ([37.4.249.155]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MxVfj-1na6uH0ufB-00xuiT; Tue, 07 Jun 2022 22:42:56 +0200 From: Stefan Wahren To: Florian Fainelli , Ray Jui , Scott Branden , Lee Jones Cc: Peter Robinson , Melissa Wen , Phil Elwell , bcm-kernel-feedback-list@broadcom.com, Maxime Ripard , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren Subject: [PATCH V3 09/11] soc: bcm: bcm2835-power: Resolve ASB register macros Date: Tue, 7 Jun 2022 22:42:24 +0200 Message-Id: <20220607204226.8703-10-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220607204226.8703-1-stefan.wahren@i2se.com> References: <20220607204226.8703-1-stefan.wahren@i2se.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:TO0tcJhnc6nhVz7iEf0cEFHoHRyEGHAlr/i1E9NHLoKByewzB/J hyUBqfRDttjveiaVdHwzt357GJF9Oe6GPSorJlyJYsJ5LqZipZbWt9lvELJWl4laaX5tlUm 7Fvbk+lHu4r7NW5p0LowYno4vuCyDn70kiREiTozMnEjCqd7ZlbWB0JFTI/3/mVxIoppowk cNbeHiKvO8e25/ssZmC1g== X-UI-Out-Filterresults: notjunk:1;V03:K0:n6ovhqRBigY=:cuHDaTY5kjmUVkxZ1plKZr AVWZoZ4tF9bspBhvblEcptCiOVy/kJk2kOnboSUMH9ggtJiQbBh8jUXAWm6eFyHJjIksa6wx0 849a/w4l5wkY4m/i9RFxz9JUUG68qQVRAUh1p+xsIkk9OVr/9Te+/AwRZYIiIjUzOTMNOVhiu zbU18MvXAzkSfFMRx3rQGjWuGwoKWEwZ9zY1bS5N3T9bshvu/WDfz8A5VVOSbOY3Lnk7bXiGv INQcpO7AjE91DhceUohDZR3ca5tvBS/bDSbPTCEiMzo9jTWA08r62reHSo9zv7CvGzuVvJRhY ALCMxCxX+p/3m0ENqmPEBYR/q7zpBPcYLBMoHCRRWQVDt1TWcucIJmaHM8mfpDSs78KHGswSn 9Nv4uvvYhA5MrJDNsVxV+I3m9ZInSe/3lpE95zXeSlMAZ5Oen7L6bie07hhOW9zGyKRViVNx9 sAupSSvmThqOUeKjwVEIdon6PwDYSsUiKpXrgBOJC43auaW2+lG1wcqcd4C45fr3f14xNMU93 BI7KcDdN44gSaKBptz2Q2pVESDugcEY9G8zvsYBaHzjVYKqXYYTZ5fp8kxo7mkCvIeIEgX381 r99a8EoHIP0ZVgfPRV1HdhjovBt35DWcz8A4HCQGVqqaQr5Cow0WDlil0v2htjfZnK9IZZXVI 6McKmCMgKAdzHNEuLijWZZRP/S9jA3hih61AHfX0tiUutLDg/Eid8JuSdd5BGFJYpHKtMITnX u0jSp++CbcXRhrQ+0k9L925kRsdhwXUyF+J2BtzqCWrdb6zVFffWiu9GEmw= Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The macros in order to access the ASB registers have a hard coded base address. So extending them for other platforms would make them harder to read. As a solution resolve these macros. Signed-off-by: Stefan Wahren Reviewed-by: Peter Robinson --- drivers/soc/bcm/bcm2835-power.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c index 77dc9e62b207..9c352f66e6d5 100644 --- a/drivers/soc/bcm/bcm2835-power.c +++ b/drivers/soc/bcm/bcm2835-power.c @@ -126,9 +126,6 @@ #define ASB_AXI_BRDG_ID 0x20 -#define ASB_READ(reg) readl(power->asb + (reg)) -#define ASB_WRITE(reg, val) writel(PM_PASSWORD | (val), power->asb + (reg)) - struct bcm2835_power_domain { struct generic_pm_domain base; struct bcm2835_power *power; @@ -150,7 +147,9 @@ struct bcm2835_power { static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable) { + void __iomem *base = power->asb; u64 start; + u32 val; if (!reg) return 0; @@ -159,12 +158,13 @@ static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable /* Enable the module's async AXI bridges. */ if (enable) { - ASB_WRITE(reg, ASB_READ(reg) & ~ASB_REQ_STOP); + val = readl(base + reg) & ~ASB_REQ_STOP; } else { - ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP); + val = readl(base + reg) | ASB_REQ_STOP; } + writel(PM_PASSWORD | val, base + reg); - while (ASB_READ(reg) & ASB_ACK) { + while (readl(base + reg) & ASB_ACK) { cpu_relax(); if (ktime_get_ns() - start >= 1000) return -ETIMEDOUT; @@ -622,7 +622,7 @@ static int bcm2835_power_probe(struct platform_device *pdev) power->base = pm->base; power->asb = pm->asb; - id = ASB_READ(ASB_AXI_BRDG_ID); + id = readl(power->asb + ASB_AXI_BRDG_ID); if (id != 0x62726467 /* "BRDG" */) { dev_err(dev, "ASB register ID returned 0x%08x\n", id); return -ENODEV; -- 2.25.1