From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 147982C08D4 for ; Fri, 20 Mar 2026 21:55:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774043719; cv=none; b=Qf8pyVPIdpYe1s9JGMsPTJ5sqE2Z40HcrtjRIOdCxfiAkIFwgU49CgW93Np6Sfl2GOs3jZ3Xs36lOSW/AntBmH8BR57sSOK89pRf3xMJ2YZ+LvvDMjV+r+ynU07uWvVT+o6j2qAnT9gLJnyIajBGty8fB2Ipl8eHyIkrhpECfL0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774043719; c=relaxed/simple; bh=v7I+LC+RfXP6f3DtDvvSgNBw3BTq53g0UHH83qLv1go=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MsJJOuNPifGXMMY4bm7QfPwmlqv1RWu0vy33jAPa84N96E3NlX1UaDBSuLXuiMFCSA4oRvmOS0NuaoVh7yjhFvuAHCXmubxvH92+UMlFoyG0NAKRA1Ef2jOTBOZe+sUP+kKt8LDRKDOFKSm10EpgabgITJW0GykoZC0toGTtfjI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=epF3chJS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="epF3chJS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1CCEDC4CEF7; Fri, 20 Mar 2026 21:55:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774043718; bh=v7I+LC+RfXP6f3DtDvvSgNBw3BTq53g0UHH83qLv1go=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=epF3chJSPR3MtIlPVIajnvZgyEBarxMGzYud4m+rdufsjpSEjO+1DF4o7AaM2YX3x CJT5y/If0oWcx0Vr8OhwimZB5vhKf+WwwLXQ8pugCOYr2VQ8+nYQTyPwIWnt7UpvuW pXz6YdbkkU3tr93ad1rqoSGfQkGGsJBhDb4jseQwQnJ1R9LotpwOnWucCtIIQZK1y/ pNaj7KyUg+aMgP9YXrMiyK9Kj0sepYCIodlYp/LjOwpdsiBQrrC0mDuE0IYfDAAky4 ASffq7mMI9HkSajJ/lKMKk2/6oAAhF6QrFj4GBTh6SZb0On9olTGiN3b6UV1727pvx OSr7PrcSoe9KA== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Ma=C3=ADra=20Canal?= , Stefan Wahren , Ulf Hansson , Sasha Levin Subject: [PATCH 6.1.y] pmdomain: bcm: bcm2835-power: Increase ASB control timeout Date: Fri, 20 Mar 2026 17:55:16 -0400 Message-ID: <20260320215516.133026-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026032025-rift-subsiding-e2e9@gregkh> References: <2026032025-rift-subsiding-e2e9@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Maíra Canal [ Upstream commit b826d2c0b0ecb844c84431ba6b502e744f5d919a ] The bcm2835_asb_control() function uses a tight polling loop to wait for the ASB bridge to acknowledge a request. During intensive workloads, this handshake intermittently fails for V3D's master ASB on BCM2711, resulting in "Failed to disable ASB master for v3d" errors during runtime PM suspend. As a consequence, the failed power-off leaves V3D in a broken state, leading to bus faults or system hangs on later accesses. As the timeout is insufficient in some scenarios, increase the polling timeout from 1us to 5us, which is still negligible in the context of a power domain transition. Also, replace the open-coded ktime_get_ns()/ cpu_relax() polling loop with readl_poll_timeout_atomic(). Cc: stable@vger.kernel.org Fixes: 670c672608a1 ("soc: bcm: bcm2835-pm: Add support for power domains under a new binding.") Signed-off-by: Maíra Canal Reviewed-by: Stefan Wahren Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/soc/bcm/bcm2835-power.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c index cbcd1298ef5bd..5842f0dc657e2 100644 --- a/drivers/soc/bcm/bcm2835-power.c +++ b/drivers/soc/bcm/bcm2835-power.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -152,7 +153,6 @@ 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; switch (reg) { @@ -165,8 +165,6 @@ static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable break; } - start = ktime_get_ns(); - /* Enable the module's async AXI bridges. */ if (enable) { val = readl(base + reg) & ~ASB_REQ_STOP; @@ -175,11 +173,9 @@ 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) == enable) { - cpu_relax(); - if (ktime_get_ns() - start >= 1000) - return -ETIMEDOUT; - } + if (readl_poll_timeout_atomic(base + reg, val, + !!(val & ASB_ACK) != enable, 0, 5)) + return -ETIMEDOUT; return 0; } -- 2.51.0