From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795059738; b=WIYXNxsyCSqBXWkAKQoVQkrPvwJPvFuSh0JnXb1UUZOHG4tzV9iXid5yAtWtEP56HfTB x3/g+oSExDhMbtQ52J1Ea7Uk3FcOpfv/4j7lr1I2J+B6X1tjoNs9PJO5xnvmClHEKWY0R Kc8a7iEmpB22NNpU1uK4MJ5R4O8P8OWnkk87Y9m/nLqKSU5l+MEMEHpB+KEzkx+lREUDB NLSqIRHscICIQ3bqG6jOqCuZ9jbhv7MdTnrhjXLskWy3f7R0/KuuWB5qdfbwlvWwYjE+V 978Uu349taf7sxeNnWb5HLw6qSET++Yte4GmhafZvQqqGaIkNhJ7/vBDcitwum11bpw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795059738; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=tLSMqJBbrE6P0LiEe3l0gpXxHPG9jRCzaeV5vUCTPhM=; b=2SmJGCfyLWeRpjI5pqQibXd8Z60noO4mG811WRM645FmcznmLHaI52ljFTaTgWgtXlgQ WTrQaNAV2EUGOtZkn3O1hhU+Ky1StuZs611yHT81kM5lntnbKA6Dp4Kb7FOMJBlDus3dw RA80K34hohJXhQDQuiNfn0ugK5FVCvFVMOdFv+URtPdmRrT1JMwbCa5BXPHxq8XpgKPYj h61JbOYW9RZEHm27cgvOBsEfIVy1B69owOlw5ZJ7LFQqjDZbKUpvrpYbiRWQ9Eeu7h40u ywDgDSFwmVfxajlaF3tBj0Ikb3PdsrGYFXndwTzAPjyNUfwxReN/r9w2Oi/+3zzoSOg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=nJzzQ5FB; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF58F606A336; Thu, 19 Nov 2026 03:42:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=nJzzQ5FB Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10CCC1F000C4; Thu, 19 Nov 2026 03:42:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795059738; bh=tLSMqJBbrE6P0LiEe3l0gpXxHPG9jRCzaeV5vUCTPhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nJzzQ5FBT96cyorC3VRBJ5y56JgQk4rjoRTUyjX3NPAGThkcDCmJjy8hmh0KtN7hc yrQnpHWqfVGZLXmjRKMqmWzlYqvzCjbtGCYbn4cvqW/65Tn87sOSRCB0/fDBrB8giM ncvhCLriEsJ+2yk3u12OwVmxjdVIxDl93flarkbU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai , alsa-devel@alsa-project.org, Maxime Ripard , Stephen Boyd , Sasha Levin Subject: [PATCH 5.10 0949/1848] ASoC: tlv320aic32x4: div: Switch to determine_rate Date: Wed, 18 Nov 2026 15:49:47 +0100 Message-ID: <20261118145956.761154714@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Maxime Ripard [ Upstream commit 2b6c9b0eee89379fda238d543c5acf098a2ac5a5 ] The tlv320aic32x4 divider clocks implements a mux with a set_parent hook, but doesn't provide a determine_rate implementation. This is a bit odd, since set_parent() is there to, as its name implies, change the parent of a clock. However, the most likely candidate to trigger that parent change is a call to clk_set_rate(), with determine_rate() figuring out which parent is the best suited for a given rate. The other trigger would be a call to clk_set_parent(), but it's far less used, and it doesn't look like there's any obvious user for that clock. So, the set_parent hook is effectively unused, possibly because of an oversight. However, it could also be an explicit decision by the original author to avoid any reparenting but through an explicit call to clk_set_parent(). The driver does implement round_rate() though, which means that we can change the rate of the clock, but we will never get to change the parent. However, It's hard to tell whether it's been done on purpose or not. Since we'll start mandating a determine_rate() implementation, let's convert the round_rate() implementation to a determine_rate(), which will also make the current behavior explicit. And if it was an oversight, the clock behaviour can be adjusted later on. Cc: Jaroslav Kysela Cc: Liam Girdwood Cc: Mark Brown Cc: Takashi Iwai Cc: alsa-devel@alsa-project.org Signed-off-by: Maxime Ripard Link: https://lore.kernel.org/r/20221018-clk-range-checks-fixes-v4-67-971d5077e7d2@cerno.tech Signed-off-by: Stephen Boyd Stable-dep-of: 8cf9607d2d85 ("ASoC: tlv320aic32x4: Prevent division by zero in divider callbacks") Signed-off-by: Sasha Levin --- sound/soc/codecs/tlv320aic32x4-clk.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/tlv320aic32x4-clk.c b/sound/soc/codecs/tlv320aic32x4-clk.c index 2f78e6820c75a..96979243d3a6a 100644 --- a/sound/soc/codecs/tlv320aic32x4-clk.c +++ b/sound/soc/codecs/tlv320aic32x4-clk.c @@ -326,16 +326,17 @@ static int clk_aic32x4_div_set_rate(struct clk_hw *hw, unsigned long rate, AIC32X4_DIV_MASK, divisor); } -static long clk_aic32x4_div_round_rate(struct clk_hw *hw, unsigned long rate, - unsigned long *parent_rate) +static int clk_aic32x4_div_determine_rate(struct clk_hw *hw, + struct clk_rate_request *req) { unsigned long divisor; - divisor = DIV_ROUND_UP(*parent_rate, rate); + divisor = DIV_ROUND_UP(req->best_parent_rate, req->rate); if (divisor > 128) return -EINVAL; - return DIV_ROUND_UP(*parent_rate, divisor); + req->rate = DIV_ROUND_UP(req->best_parent_rate, divisor); + return 0; } static unsigned long clk_aic32x4_div_recalc_rate(struct clk_hw *hw, @@ -354,7 +355,7 @@ static const struct clk_ops aic32x4_div_ops = { .prepare = clk_aic32x4_div_prepare, .unprepare = clk_aic32x4_div_unprepare, .set_rate = clk_aic32x4_div_set_rate, - .round_rate = clk_aic32x4_div_round_rate, + .determine_rate = clk_aic32x4_div_determine_rate, .recalc_rate = clk_aic32x4_div_recalc_rate, }; @@ -382,7 +383,7 @@ static const struct clk_ops aic32x4_bdiv_ops = { .set_parent = clk_aic32x4_bdiv_set_parent, .get_parent = clk_aic32x4_bdiv_get_parent, .set_rate = clk_aic32x4_div_set_rate, - .round_rate = clk_aic32x4_div_round_rate, + .determine_rate = clk_aic32x4_div_determine_rate, .recalc_rate = clk_aic32x4_div_recalc_rate, }; -- 2.53.0