aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaíra Canal <[email protected]>2023-10-24 07:10:40 -0300
committerUlf Hansson <[email protected]>2023-10-24 12:44:24 +0200
commit2e75396f1df61e1f1d26d0d703fc7292c4ae4371 (patch)
treea633629867c8a839da8ac27ac0aab6c031626a5a
parent767881c470b3140c33795031c4e4d65572731c1c (diff)
pmdomain: bcm: bcm2835-power: check if the ASB register is equal to enable
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] Signed-off-by: Ulf Hansson <[email protected]>
-rw-r--r--drivers/pmdomain/bcm/bcm2835-power.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pmdomain/bcm/bcm2835-power.c b/drivers/pmdomain/bcm/bcm2835-power.c
index 1a179d4e011c..d2f0233cb620 100644
--- a/drivers/pmdomain/bcm/bcm2835-power.c
+++ b/drivers/pmdomain/bcm/bcm2835-power.c
@@ -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;