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 A887B269D15; Tue, 8 Apr 2025 12:35:33 +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=1744115733; cv=none; b=V1cIq5a6JeLaTemc+7EPNsNrKlxIcQOiE2mF+Z2h/xHHy4TvI150n6d4p2UkWnMXUxY7oMp7hYIxD8bRTVkoOvDciylY69tdL176gE2J3iGSEnTLq0PRJ13a7GtwbNoR1I4bnV658qLgwkPRiST3YSZq62XFusHtLzV4hbKZM/E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744115733; c=relaxed/simple; bh=rlTTTY02Ig6LLu6+Lsgpwgu6DvUzcRcq+3kn010W1XU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oghmCF7BBZL0MMFuOTXAePJd5LGNK6Nxk8LfuUNGEp/Jqdk+5vI0imWR8oaecD2bAt7yE/qU/Rp6wpcAtLhNQ8ixhmYcdzbMV8tEdyYmw/WTmaEAtDmx459MHIhzmEZvznqJLJjrLva10atdUGZxXF5+mSlHRl49G2BzwS4/nZ0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LDoQhtnW; 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="LDoQhtnW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3335AC4CEEA; Tue, 8 Apr 2025 12:35:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744115733; bh=rlTTTY02Ig6LLu6+Lsgpwgu6DvUzcRcq+3kn010W1XU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LDoQhtnWDt5ZObBgnzeA2w5Ja6txT39Bo7Hzrzhv+b6tD7bA2yc6ULGaUMD7HJvKU 3IIIC/eqWWKmujGmqtygV0x3KsVtnMNMT7iSNWvMLgHGXCzpboFVj+4tMStc4DC5uU KegeB7uqKxhAQ5G11d5hpHUO+UBoEr3r6g8hpHdA= 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 6.1 085/204] clk: qcom: mmcc-sdm660: fix stuck video_subcore0 clock Date: Tue, 8 Apr 2025 12:50:15 +0200 Message-ID: <20250408104822.851905422@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.266892317@linuxfoundation.org> References: <20250408104820.266892317@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 6.1-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 bc19a23e13f8a..4d187d6aba734 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