FAILED: patch "[PATCH] pmdomain: bcm: bcm2835-power: check if the ASB register is" failed to apply to 6.5-stable tree

The patch below does not apply to the 6.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.5.y
git checkout FETCH_HEAD
git cherry-pick -x 2e75396f1df61e1f1d26d0d703fc7292c4ae4371
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023112257-putdown-prozac-affa@gregkh' --subject-prefix 'PATCH 6.5.y' HEAD^..

Possible dependencies:

2e75396f1df6 ("pmdomain: bcm: bcm2835-power: check if the ASB register is equal to enable")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 2e75396f1df61e1f1d26d0d703fc7292c4ae4371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ADra=20Canal?= <[email protected]>
Date: Tue, 24 Oct 2023 07:10:40 -0300
Subject: [PATCH] pmdomain: bcm: bcm2835-power: check if the ASB register is
equal to enable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The commit c494a447c14e ("soc: bcm: bcm2835-power: Refactor ASB control") refactored the ASB control by using a general function to handle both the enable and disable. But this patch introduced a subtle regression:
we need to check if !!(readl(base + reg) & ASB_ACK) == enable, not just check if (readl(base + reg) & ASB_ACK) == true.

Currently, this is causing an invalid register state in V3D when unloading and loading the driver, because bcm2835_asb_disable() will return -ETIMEDOUT and bcm2835_asb_power_off() will fail to disable the ASB slave for V3D.

Fixes c494a447c14e ("soc: bcm: bcm2835-power: Refactor ASB control")

Signed-off-by Maíra Canal <[email protected]>

Reviewed-by Florian Fainelli <[email protected]>

Reviewed-by Stefan Wahren <[email protected]>

Cc [email protected]

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Ulf Hansson <[email protected]>

drivers/pmdomain/bcm/bcm2835-power.c +1 -1

index 1a179d4e011c..d2f0233cb620 100644
@@ -175,7 +175,7 @@ static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable
  	}
  	writel(PM_PASSWORD | val, base + reg);
 
-	while (readl(base + reg) & ASB_ACK) {
+	while (!!(readl(base + reg) & ASB_ACK) == enable) {
  		cpu_relax();
  		if (ktime_get_ns() - start >= 1000)
  			return -ETIMEDOUT;

Hi,

Am 22.11.23 um 19:52 schrieb [email protected]:

Quoted 17 lines

The patch below does not apply to the 6.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.5.y
git checkout FETCH_HEAD
git cherry-pick -x 2e75396f1df61e1f1d26d0d703fc7292c4ae4371
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023112257-putdown-prozac-affa@gregkh' --subject-prefix 'PATCH 6.5.y' HEAD^..

Possible dependencies:

Quoted 1 line

2e75396f1df6 ("pmdomain: bcm: bcm2835-power: check if the ASB register is equal to enable")

the reason why this doesn't apply is that the driver has been moved recently from soc/bcm/ to pmdomain/bcm/ . In this tree the directory pmdomain doesn't exist.

@Maíra Do you want to send the adapted patch to linux-stable?

https://www.kernel.org/doc/Documentation/process/stable-kernel-rules.rst

Best regards

Quoted 50 lines

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

 From 2e75396f1df61e1f1d26d0d703fc7292c4ae4371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ADra=20Canal?= <[email protected]>
Date: Tue, 24 Oct 2023 07:10:40 -0300
Subject: [PATCH] pmdomain: bcm: bcm2835-power: check if the ASB register is equal to enable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The commit c494a447c14e ("soc: bcm: bcm2835-power: Refactor ASB control") refactored the ASB control by using a general function to handle both the enable and disable. But this patch introduced a subtle regression:
we need to check if !!(readl(base + reg) & ASB_ACK) == enable, not just check if (readl(base + reg) & ASB_ACK) == true.

Currently, this is causing an invalid register state in V3D when unloading and loading the driver, because bcm2835_asb_disable() will return -ETIMEDOUT and bcm2835_asb_power_off() will fail to disable the ASB slave for V3D.

Fixes c494a447c14e ("soc: bcm: bcm2835-power: Refactor ASB control")

Signed-off-by Maíra Canal <[email protected]>

Reviewed-by Florian Fainelli <[email protected]>

Reviewed-by Stefan Wahren <[email protected]>

Cc [email protected]

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Ulf Hansson <[email protected]>

drivers/pmdomain/bcm/bcm2835-power.c +0 -0

index 1a179d4e011c..d2f0233cb620 100644
@@ -175,7 +175,7 @@ static int bcm2835_asb_control(struct 

bcm2835_power *power, u32 reg, bool enable
      }
      writel(PM_PASSWORD | val, base + reg);

-    while (readl(base + reg) & ASB_ACK) {
+    while (!!(readl(base + reg) & ASB_ACK) == enable) { cpu_relax();
          if (ktime_get_ns() - start >= 1000) return -ETIMEDOUT;