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 D3BF92690FB; Tue, 8 Apr 2025 11:46:17 +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=1744112777; cv=none; b=YJq45I+8Dgs0z6uzFTPY6tRQ1/sDpIuGXmLdVxHt5RjZis/yXYrmxGuNTIYj47r0yVZh8LsNVpIXnW56BEdoiuue+K7u1c0GgXwuKdPk/C9ejdiE2F2Kxa0R0jo6SQPq7XlXKVZax0u8MNNr8kWAcgBl6wAqj0vuqptgnR2K2Co= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744112777; c=relaxed/simple; bh=d6j+VxGd/QEnP5HMbl24Ob3kqDq9yjKkcbKixDESCqI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DFUMC9FlMZmkuG/zqdvJ7OsntSZt5GHQVpmjHSFB8OH8Swm92XCXjGDoDPFXGFrqT7G1crvcpn3T7gmgfBz76XpTny3byLLG/uDdlb9k1hH3oEAGZGMbSwMlQAU7tlC1vvBLbyV0jI+x7gzAg6FYVslvvUsBcMTk9fBoMJ/8VnY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=m6j7JQiE; 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="m6j7JQiE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59C7CC4CEE5; Tue, 8 Apr 2025 11:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744112777; bh=d6j+VxGd/QEnP5HMbl24Ob3kqDq9yjKkcbKixDESCqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m6j7JQiEaoGT4uDqzBpLviDYjafXIshOxtL/E4YriYaQRY6wNbCrXPdEMlOWkwV4Y fd/idrSVZ8JbULS3jjrrgEQlN2RIr3rCxBdlvax0jIb24R0FXsLbUyUst8F4Qx/JUC GZ/XLYD+XKZSY5vGGxbpFOgWwDQqaWrULkO4njaA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.15 193/279] clk: qcom: mmcc-sdm660: fix stuck video_subcore0 clock Date: Tue, 8 Apr 2025 12:49:36 +0200 Message-ID: <20250408104831.546523252@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104826.319283234@linuxfoundation.org> References: <20250408104826.319283234@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore 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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Barnabás Czémán [ Upstream commit 000cbe3896c56bf5c625e286ff096533a6b27657 ] This clock can't be enable with VENUS_CORE0 GDSC turned off. But that GDSC is under HW control so it can be turned off at any moment. Instead of checking the dependent clock we can just vote for it to enable later when GDSC gets turned on. Fixes: 5db3ae8b33de6 ("clk: qcom: Add SDM660 Multimedia Clock Controller (MMCC) driver") Signed-off-by: Barnabás Czémán Link: https://lore.kernel.org/r/20250315-clock-fix-v1-1-2efdc4920dda@mainlining.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/clk/qcom/mmcc-sdm660.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/qcom/mmcc-sdm660.c b/drivers/clk/qcom/mmcc-sdm660.c index 941993bc610df..04e2b0801ee42 100644 --- a/drivers/clk/qcom/mmcc-sdm660.c +++ b/drivers/clk/qcom/mmcc-sdm660.c @@ -2544,7 +2544,7 @@ static struct clk_branch video_core_clk = { static struct clk_branch video_subcore0_clk = { .halt_reg = 0x1048, - .halt_check = BRANCH_HALT, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x1048, .enable_mask = BIT(0), -- 2.39.5