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 1596E3A8744 for ; Wed, 18 Mar 2026 11:51:36 +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=1773834697; cv=none; b=pl+jdRSyyrGSapSXq5LZK9sHxQ3hZDRC1rQMWk2dCLk4bpvUQp9McdnmqnyF9RGY5OSELUmINTvrTcWsYNJM4gJyZYvl0Ld9AmzH1j8q0pcfEZmG/E2GeYTvxepBS2ucYB2qWkJK+ZHqoglfdWKsMP6ZoXLsFj552lo13hd95Iw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773834697; c=relaxed/simple; bh=i8Lg0F5Sff2OjmJ99ZYMxleYhhi3C92xSrIlLDkmBW0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=d87WdayzreWHlkrQ6ipUIr4gN6gAhwr+sM9mYaGO6QN0N4ntRbNJAA/7fcXrB4woiTr7ZahXXFsIYXe8nN7/y6c5ribcKzIcE+7vRS1Ca8DWSRqyQNtXgxkcMUBZ91tV23DGI53rCVKKetKiXitZWoDqG1EzZbIQ+o6fOSh6ots= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=o1293AFM; 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="o1293AFM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1356DC19421; Wed, 18 Mar 2026 11:51:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773834696; bh=i8Lg0F5Sff2OjmJ99ZYMxleYhhi3C92xSrIlLDkmBW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o1293AFMT0wWy4uR+N2ndfH2K0XjpZ0Zy4V7ZobeXBxIJOKtsp+8X/Wbs8l0Xdkbc EkClzoMMDIjmUdJNwtaYLvwVavonhBQwGXkbD096b+AsBfLaT74XxdK7g5WmwjcSH9 aunu8eZbuHu5cCWpdsJm3g+WI6DCDUZu8VpThtRgUCKLnLKFG15EUA01OIV+ggJB2S BWnnn1ulDQ0AtxPyojsiwtibPznE10ccNXpOWnZwAXS+QN7/Q8JRuaqTSnYwtQza7+ IktNFSgSQSf4ZEhhoEPkjR7F4UuxBT424l0eDECE8Wb+Sj2C/fvfRMvx7rB7BDW/Di mrTyGC2mCetIw== 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 6.1.y] pmdomain: bcm: bcm2835-power: Fix broken reset status read Date: Wed, 18 Mar 2026 07:51:33 -0400 Message-ID: <20260318115133.637923-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026031711-finalize-hatless-a7a3@gregkh> References: <2026031711-finalize-hatless-a7a3@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 cbcd1298ef5bd..95148c8313154 100644 --- a/drivers/soc/bcm/bcm2835-power.c +++ b/drivers/soc/bcm/bcm2835-power.c @@ -580,11 +580,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