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 DF1AA268685; Tue, 8 Apr 2025 11:45:10 +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=1744112711; cv=none; b=IW11s7qcVeAELADVpuUl6v3/f7o5q7l+gKXtMjJi3pbTpFd3jqcDfVVPzozYN/7UTT68xGqSQxEdamg5X2D2NvU94C+dw45I27on5+Qol9Z4KpCkhOK9vv2UCICRaYE2LvFtURkAOxGTHFZhz36GZzdidsJRWrcfaXVCGxj6T9c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744112711; c=relaxed/simple; bh=tJBui0EFcxjuWZvq19v84UK2+peoa5bSAL0dRKU/iqo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d73KNbhxqtaQeuFnHZ6RfIve7/Fxq4J4h2XmhOyYI0zMfIaEhbGEwYHLZLuy8WmJMG3E/WHQJgjtTd7ifxpdWmtzzjQV3euJnnDaL61bVYNYh2ymColI4ZdfPTplMhFoIsBYT4BxixAB4rC2b1fMCn5n6rEgjceC7xJcLxde4j0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1sXE7JQv; 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="1sXE7JQv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72029C4AF09; Tue, 8 Apr 2025 11:45:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744112710; bh=tJBui0EFcxjuWZvq19v84UK2+peoa5bSAL0dRKU/iqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1sXE7JQvRvntI5v6opssTB4h6HLPUgq5Iu5B7EA+7nVC7EfNdwNeI1JTt+Wm2Edpa ap16nFB7Zw5OZ85HU4GcPF6Kip8imGvRD4pfRUpdfDys7inTfzSCS7JwOiq73+6in1 Obc6tKZJuHJuwm1ELw05NUAfeMzhQTUG+3TDEaBI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, zuoqian , Dan Carpenter , Viresh Kumar , Sasha Levin Subject: [PATCH 5.15 130/279] cpufreq: scpi: compare kHz instead of Hz Date: Tue, 8 Apr 2025 12:48:33 +0200 Message-ID: <20250408104829.850109234@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-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: zuoqian [ Upstream commit 4742da9774a416908ef8e3916164192c15c0e2d1 ] The CPU rate from clk_get_rate() may not be divisible by 1000 (e.g., 133333333). But the rate calculated from frequency(kHz) is always divisible by 1000 (e.g., 133333000). Comparing the rate causes a warning during CPU scaling: "cpufreq: __target_index: Failed to change cpu frequency: -5". When we choose to compare kHz here, the issue does not occur. Fixes: 343a8d17fa8d ("cpufreq: scpi: remove arm_big_little dependency") Signed-off-by: zuoqian Reviewed-by: Dan Carpenter Signed-off-by: Viresh Kumar Signed-off-by: Sasha Levin --- drivers/cpufreq/scpi-cpufreq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/scpi-cpufreq.c b/drivers/cpufreq/scpi-cpufreq.c index 763692e327b18..35b20c74dbfc7 100644 --- a/drivers/cpufreq/scpi-cpufreq.c +++ b/drivers/cpufreq/scpi-cpufreq.c @@ -47,8 +47,9 @@ static unsigned int scpi_cpufreq_get_rate(unsigned int cpu) static int scpi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index) { - u64 rate = policy->freq_table[index].frequency * 1000; + unsigned long freq_khz = policy->freq_table[index].frequency; struct scpi_data *priv = policy->driver_data; + unsigned long rate = freq_khz * 1000; int ret; ret = clk_set_rate(priv->clk, rate); @@ -56,7 +57,7 @@ scpi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index) if (ret) return ret; - if (clk_get_rate(priv->clk) != rate) + if (clk_get_rate(priv->clk) / 1000 != freq_khz) return -EIO; return 0; -- 2.39.5