Skip to content

Commit 2e75396

Browse files
mairacanalUlf Hansson
authored andcommitted
pmdomain: bcm: bcm2835-power: check if the ASB register is equal to enable
The commit c494a44 ("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: c494a44 ("soc: bcm: bcm2835-power: Refactor ASB control") Signed-off-by: Maíra Canal <mcanal@igalia.com> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Reviewed-by: Stefan 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: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 767881c commit 2e75396

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/pmdomain/bcm/bcm2835-power.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable
175175
}
176176
writel(PM_PASSWORD | val, base + reg);
177177

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

0 commit comments

Comments
 (0)