From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C229CC433E3 for ; Mon, 20 Jul 2020 16:34:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9CA6322CBB for ; Mon, 20 Jul 2020 16:34:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595262896; bh=4OjDOctGjCwaUP/tk71zHt2xEFdgrp0lwlJPrqAa36s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2kP9T6imkcf94mTxXNAvX/qXA/sWLc7LRAMK/NXXTBRICUR9nf9aO6shMvmlaHF1L AOdIuUymtCY3lyuOK/u0EoIE+rTQo314GMw/gpgFd9ZsVkyeiFwRvFjkdoF1k3cd53 DaSXTB+Od/CT8xfKyMsU5J8HqFS4qNt6EA6J5HS8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731405AbgGTPzB (ORCPT ); Mon, 20 Jul 2020 11:55:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:53800 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731116AbgGTPy5 (ORCPT ); Mon, 20 Jul 2020 11:54:57 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4BECD22D00; Mon, 20 Jul 2020 15:54:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260496; bh=4OjDOctGjCwaUP/tk71zHt2xEFdgrp0lwlJPrqAa36s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uwWJ7yYdQTWqUhTLoXMSUm6IdePIvKMdWjcmIcXwj4xORiR3P9B4BEv4We00fUHwj zD7gbTSQxuQPCZ0QgO5GQ16gIZBLeSf0kCv3zclYjp+y1FmItLbtypd7ouFBeQO5lk sr4+t+czgC/bIHmGIhDie5ZDnoCgw6hSevqGHZbg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Finley Xiao , Viresh Kumar , Amit Kucheria , Daniel Lezcano Subject: [PATCH 4.19 123/133] thermal/drivers/cpufreq_cooling: Fix wrong frequency converted from power Date: Mon, 20 Jul 2020 17:37:50 +0200 Message-Id: <20200720152809.664822211@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152803.732195882@linuxfoundation.org> References: <20200720152803.732195882@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Finley Xiao commit 371a3bc79c11b707d7a1b7a2c938dc3cc042fffb upstream. The function cpu_power_to_freq is used to find a frequency and set the cooling device to consume at most the power to be converted. For example, if the power to be converted is 80mW, and the em table is as follow. struct em_cap_state table[] = { /* KHz mW */ { 1008000, 36, 0 }, { 1200000, 49, 0 }, { 1296000, 59, 0 }, { 1416000, 72, 0 }, { 1512000, 86, 0 }, }; The target frequency should be 1416000KHz, not 1512000KHz. Fixes: 349d39dc5739 ("thermal: cpu_cooling: merge frequency and power tables") Cc: # v4.13+ Signed-off-by: Finley Xiao Acked-by: Viresh Kumar Reviewed-by: Amit Kucheria Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20200619090825.32747-1-finley.xiao@rock-chips.com Signed-off-by: Viresh Kumar Signed-off-by: Greg Kroah-Hartman --- drivers/thermal/cpu_cooling.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -278,11 +278,11 @@ static u32 cpu_power_to_freq(struct cpuf int i; struct freq_table *freq_table = cpufreq_cdev->freq_table; - for (i = 1; i <= cpufreq_cdev->max_level; i++) - if (power > freq_table[i].power) + for (i = 0; i < cpufreq_cdev->max_level; i++) + if (power >= freq_table[i].power) break; - return freq_table[i - 1].frequency; + return freq_table[i].frequency; } /**