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 528803D34A5 for ; Fri, 20 Mar 2026 17:32:42 +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=1774027962; cv=none; b=iz0Oh6lwbpSrNfJQhJ64CnLkVPkMd8n1oNvj7po6ZSIdL+xsqdra38YR2FSi0mDyOmzaeCXqzz1S7A/GooZrEBcWwY2iE6Jm2+QJ4/08de0zQwr6Z+JRC0ErTkXaES2rJDF6S5zsMohPkg2pT2sGL9Exz4NPdqYy7NMsXdyd/z4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774027962; c=relaxed/simple; bh=L+RsUPAJJgH1CrgMNUPvgKOXrPZGPRBxGIkmRa7fkLk=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=WSFjUnT5bZd+CvUiUszzYzCEYDp+afn44tAnRJqGZNg2mmjqX1SBJcV/ZluIk2MCXj6dEs1xMTL+jJxUnBNFXx0BKVqDu6IntFumZgekkCR3Smuw6wnl7qYMGQO/K84yL0EFVKcUt/zqYytVzHVdvxARk5wqR5GjKxQF8Yk3hm8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=sMJRH/2f; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="sMJRH/2f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 400A1C4CEF7; Fri, 20 Mar 2026 17:32:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774027962; bh=L+RsUPAJJgH1CrgMNUPvgKOXrPZGPRBxGIkmRa7fkLk=; h=Subject:To:Cc:From:Date:From; b=sMJRH/2fqWR9Lv2JWZ+EJVF2uTItN3lqS+2ltWhf6ZNBAM5TQxpV6d8I829WyaKOn i1m0fWYxBYD2VZDDOYphG5M+2befwAeDXGxk4lSeMx9fPmA5bxCBGucJLPYIgXTpaY Ot2kLTYKoqEshrwMjkz6rt2+uqQ+5+cU30Y7ba+k= Subject: FAILED: patch "[PATCH] pmdomain: bcm: bcm2835-power: Increase ASB control timeout" failed to apply to 5.15-stable tree To: mcanal@igalia.com,ulf.hansson@linaro.org,wahrenst@gmx.net Cc: From: Date: Fri, 20 Mar 2026 18:32:26 +0100 Message-ID: <2026032026-divisive-wieldable-7957@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 The patch below does not apply to the 5.15-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 . 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-5.15.y git checkout FETCH_HEAD git cherry-pick -x b826d2c0b0ecb844c84431ba6b502e744f5d919a # git commit -s git send-email --to '' --in-reply-to '2026032026-divisive-wieldable-7957@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b826d2c0b0ecb844c84431ba6b502e744f5d919a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ADra=20Canal?= Date: Tue, 17 Mar 2026 19:41:49 -0300 Subject: [PATCH] pmdomain: bcm: bcm2835-power: Increase ASB control timeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 diff --git a/drivers/pmdomain/bcm/bcm2835-power.c b/drivers/pmdomain/bcm/bcm2835-power.c index 0450202bbee2..eee87a300532 100644 --- a/drivers/pmdomain/bcm/bcm2835-power.c +++ b/drivers/pmdomain/bcm/bcm2835-power.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -153,7 +154,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) { @@ -166,8 +166,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; @@ -176,11 +174,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; }