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 BCA343D6691 for ; Wed, 18 Mar 2026 12:39:32 +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=1773837572; cv=none; b=Bl79PfOFCkZfH8FhRrJXYaPAs1YUQbswcLqM/xZwLkaQrgAIAlsATB+0i038fxlkn4u172FtX1mElt8ecFgCb03dclHEcFnof0O2UYu5oKjkDBg2CIzoOkQamEZN0VZy0d05kh4JfXgYsH3GlSEw4FGd3uuazw82xg9AE3/i028= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773837572; c=relaxed/simple; bh=Hd3KjOute50UKVsHNlFYsH/xaKzPsQ7yQvhCqpRUvEQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bBJleU8Zk13niwI3CPOOr4b6xGqO7hcrIIhi1mHVdTJz7P2qUcOGcVHLvgkaVzCmKrwa/fPots2yjiunClZxWj3UdPqNto+ZJ9jMVQF1YJ9skO//EH4Vq3cHirmse1Zgw7SsNJqmA5iIg2/VL3jh2BKppvax0fvqu/md2uLQ/4Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OdGFO9yp; 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="OdGFO9yp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFCECC19421; Wed, 18 Mar 2026 12:39:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773837572; bh=Hd3KjOute50UKVsHNlFYsH/xaKzPsQ7yQvhCqpRUvEQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OdGFO9ypkqFZ3T5Mcp9SRs6K+Gav34njam6lQA71axDPW9SDCDBNJd/rl2ddcnJMl EUQMUuZd8BuVYskPoxAXV8AEXL4ci6YA+V5gBazUcjqRirJWIT8QkD9ThPvinJeA0j kkuxv5xDVSPZJ9HD+KyS+FC+AP0OtMCZbCb3ZUd9i0D4t8fF9Fqvo3evN1yJv8LKyK CU9AeapD7NZsRt46W9Z/JIlVMD3agATzpg8gwbfsrLcqn0u+k6zu+EABTFsebKBHrN KMSR5MDGTOu/7fkPRSAcQBer20RHhv87hjP1P0vNAXc7091muVAwHdvSNRqUT+b1BL vXWJl3Dk0M/sA== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Ma=C3=ADra=20Canal?= , Florian Fainelli , Stefan Wahren , Ulf Hansson , Sasha Levin Subject: [PATCH 5.15.y] pmdomain: bcm: bcm2835-power: Fix broken reset status read Date: Wed, 18 Mar 2026 08:39:29 -0400 Message-ID: <20260318123929.703978-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026031712-system-washbasin-aaf4@gregkh> References: <2026031712-system-washbasin-aaf4@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 550bae2c0931dbb664a61b08c21cf156f0a5362a ] bcm2835_reset_status() has a misplaced parenthesis on every PM_READ() call. Since PM_READ(reg) expands to readl(power->base + (reg)), the expression: PM_READ(PM_GRAFX & PM_V3DRSTN) computes the bitwise AND of the register offset PM_GRAFX with the bitmask PM_V3DRSTN before using the result as a register offset, reading from the wrong MMIO address instead of the intended PM_GRAFX register. The same issue affects the PM_IMAGE cases. Fix by moving the closing parenthesis so PM_READ() receives only the register offset, and the bitmask is applied to the value returned by the read. Fixes: 670c672608a1 ("soc: bcm: bcm2835-pm: Add support for power domains under a new binding.") Signed-off-by: Maíra Canal Reviewed-by: Florian Fainelli Reviewed-by: Stefan Wahren Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/soc/bcm/bcm2835-power.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c index 1e0041ec81323..050389869035a 100644 --- a/drivers/soc/bcm/bcm2835-power.c +++ b/drivers/soc/bcm/bcm2835-power.c @@ -566,11 +566,11 @@ static int bcm2835_reset_status(struct reset_controller_dev *rcdev, switch (id) { case BCM2835_RESET_V3D: - return !PM_READ(PM_GRAFX & PM_V3DRSTN); + return !(PM_READ(PM_GRAFX) & PM_V3DRSTN); case BCM2835_RESET_H264: - return !PM_READ(PM_IMAGE & PM_H264RSTN); + return !(PM_READ(PM_IMAGE) & PM_H264RSTN); case BCM2835_RESET_ISP: - return !PM_READ(PM_IMAGE & PM_ISPRSTN); + return !(PM_READ(PM_IMAGE) & PM_ISPRSTN); default: return -EINVAL; } -- 2.51.0