Commit 2e75396f authored by Maíra Canal's avatar Maíra Canal Committed by Ulf Hansson
Browse files

pmdomain: bcm: bcm2835-power: check if the ASB register is equal to enable 



The commit c494a447 ("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: c494a447 ("soc: bcm: bcm2835-power: Refactor ASB control")
Signed-off-by: default avatarMaíra Canal <mcanal@igalia.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20231024101251.6357-2-mcanal@igalia.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 767881c4

drivers/pmdomain/bcm/bcm2835-power.c

+1 −1
Original line number Diff line number Diff line
@@ -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;