All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Wahren <stefan.wahren@i2se.com>
To: Florian Fainelli <f.fainelli@gmail.com>,
	Ray Jui <rjui@broadcom.com>,
	Scott Branden <sbranden@broadcom.com>,
	Nicolas Saenz Julienne <nsaenz@kernel.org>,
	Lee Jones <lee.jones@linaro.org>
Cc: Peter Robinson <pbrobinson@gmail.com>,
	Melissa Wen <melissa.srw@gmail.com>,
	Phil Elwell <phil@raspberrypi.com>,
	bcm-kernel-feedback-list@broadcom.com,
	Maxime Ripard <maxime@cerno.tech>,
	devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	Stefan Wahren <stefan.wahren@i2se.com>
Subject: [PATCH 09/11] soc: bcm: bcm2835-power: Resolve ASB register macros
Date: Sun, 15 May 2022 22:20:30 +0200	[thread overview]
Message-ID: <20220515202032.3046-10-stefan.wahren@i2se.com> (raw)
In-Reply-To: <20220515202032.3046-1-stefan.wahren@i2se.com>

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 <stefan.wahren@i2se.com>
---
 drivers/soc/bcm/bcm2835-power.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c
index 77dc9e62b207..fa0a13035794 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,10 @@ 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 +159,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 +623,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


WARNING: multiple messages have this Message-ID (diff)
From: Stefan Wahren <stefan.wahren@i2se.com>
To: Florian Fainelli <f.fainelli@gmail.com>,
	Ray Jui <rjui@broadcom.com>,
	Scott Branden <sbranden@broadcom.com>,
	Nicolas Saenz Julienne <nsaenz@kernel.org>,
	Lee Jones <lee.jones@linaro.org>
Cc: Peter Robinson <pbrobinson@gmail.com>,
	Melissa Wen <melissa.srw@gmail.com>,
	Phil Elwell <phil@raspberrypi.com>,
	bcm-kernel-feedback-list@broadcom.com,
	Maxime Ripard <maxime@cerno.tech>,
	devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	Stefan Wahren <stefan.wahren@i2se.com>
Subject: [PATCH 09/11] soc: bcm: bcm2835-power: Resolve ASB register macros
Date: Sun, 15 May 2022 22:20:30 +0200	[thread overview]
Message-ID: <20220515202032.3046-10-stefan.wahren@i2se.com> (raw)
In-Reply-To: <20220515202032.3046-1-stefan.wahren@i2se.com>

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 <stefan.wahren@i2se.com>
---
 drivers/soc/bcm/bcm2835-power.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c
index 77dc9e62b207..fa0a13035794 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,10 @@ 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 +159,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 +623,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

  parent reply	other threads:[~2022-05-15 20:21 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-15 20:20 [PATCH 00/11] soc: bcm2835-power: Prepare BCM2711 V3D support Stefan Wahren
2022-05-15 20:20 ` Stefan Wahren
2022-05-15 20:20 ` [PATCH 01/11] dt-bindings: soc: bcm: bcm2835-pm: Convert bindings to DT schema Stefan Wahren
2022-05-15 20:20   ` Stefan Wahren
2022-05-15 20:20 ` [PATCH 02/11] dt-bindings: soc: bcm: bcm2835-pm: Introduce reg-names Stefan Wahren
2022-05-15 20:20   ` Stefan Wahren
2022-05-15 20:20 ` [PATCH 03/11] dt-bindings: soc: bcm: bcm2835-pm: Add support for bcm2711 Stefan Wahren
2022-05-15 20:20   ` Stefan Wahren
2022-05-18  0:55   ` Rob Herring
2022-05-18  0:55     ` Rob Herring
2022-05-15 20:20 ` [PATCH 04/11] ARM: dts: bcm2835/bcm2711: Introduce reg-names in watchdog node Stefan Wahren
2022-05-15 20:20   ` Stefan Wahren
2022-05-31 12:55   ` Peter Robinson
2022-05-31 12:55     ` Peter Robinson
2022-05-15 20:20 ` [PATCH 05/11] ARM: dts: bcm2711: Use proper compatible in PM/Watchdog node Stefan Wahren
2022-05-15 20:20   ` Stefan Wahren
2022-05-31 12:56   ` Peter Robinson
2022-05-31 12:56     ` Peter Robinson
2022-05-15 20:20 ` [PATCH 06/11] mfd: bcm2835-pm: Use 'reg-names' to get resources Stefan Wahren
2022-05-15 20:20   ` Stefan Wahren
2022-05-31 14:54   ` Peter Robinson
2022-05-31 14:54     ` Peter Robinson
2022-05-31 17:12     ` Stefan Wahren
2022-05-31 17:12       ` Stefan Wahren
2022-05-15 20:20 ` [PATCH 07/11] mfd: bcm2835-pm: Add support for BCM2711 Stefan Wahren
2022-05-15 20:20   ` Stefan Wahren
2022-05-31 15:08   ` Peter Robinson
2022-05-31 15:08     ` Peter Robinson
2022-05-31 17:27     ` Stefan Wahren
2022-05-31 17:27       ` Stefan Wahren
2022-05-31 20:11       ` Peter Robinson
2022-05-31 20:11         ` Peter Robinson
2022-05-31 22:03         ` Stefan Wahren
2022-05-31 22:03           ` Stefan Wahren
2022-06-01 11:09           ` Peter Robinson
2022-06-01 11:09             ` Peter Robinson
2022-05-15 20:20 ` [PATCH 08/11] soc: bcm: bcm2835-power: Refactor ASB control Stefan Wahren
2022-05-15 20:20   ` Stefan Wahren
2022-05-31 15:18   ` Peter Robinson
2022-05-31 15:18     ` Peter Robinson
2022-05-15 20:20 ` Stefan Wahren [this message]
2022-05-15 20:20   ` [PATCH 09/11] soc: bcm: bcm2835-power: Resolve ASB register macros Stefan Wahren
2022-05-31 15:47   ` Peter Robinson
2022-05-31 15:47     ` Peter Robinson
2022-05-31 17:34     ` Stefan Wahren
2022-05-31 17:34       ` Stefan Wahren
2022-05-15 20:20 ` [PATCH 10/11] soc: bcm: bcm2835-power: Add support for BCM2711's RPiVid ASB Stefan Wahren
2022-05-15 20:20   ` Stefan Wahren
2022-05-31 15:58   ` Peter Robinson
2022-05-31 15:58     ` Peter Robinson
2022-05-15 20:20 ` [PATCH 11/11] soc: bcm: bcm2835-power: Bypass power_on/off() calls Stefan Wahren
2022-05-15 20:20   ` Stefan Wahren
2022-05-31 16:03   ` Peter Robinson
2022-05-31 16:03     ` Peter Robinson
2022-05-18 20:22 ` [PATCH 00/11] soc: bcm2835-power: Prepare BCM2711 V3D support Florian Fainelli
2022-05-18 20:22   ` Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220515202032.3046-10-stefan.wahren@i2se.com \
    --to=stefan.wahren@i2se.com \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=devicetree@vger.kernel.org \
    --cc=f.fainelli@gmail.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-rpi-kernel@lists.infradead.org \
    --cc=maxime@cerno.tech \
    --cc=melissa.srw@gmail.com \
    --cc=nsaenz@kernel.org \
    --cc=pbrobinson@gmail.com \
    --cc=phil@raspberrypi.com \
    --cc=rjui@broadcom.com \
    --cc=sbranden@broadcom.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.