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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8ECE7C433EF for ; Tue, 5 Jul 2022 09:25:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229591AbiGEJZH (ORCPT ); Tue, 5 Jul 2022 05:25:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbiGEJZH (ORCPT ); Tue, 5 Jul 2022 05:25:07 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CAF4CEA for ; Tue, 5 Jul 2022 02:25:05 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id cl1so16655790wrb.4 for ; Tue, 05 Jul 2022 02:25:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=ZW5lLkL4JDDf9YU7h/GJGKjkCyTulUg7IkJ5X2M8OE0=; b=CpNzyFgqsQd/DD8PMyj/53gIhGninW9JqnA2U3FFJTOPqE5SM3EkDrAdhwn+7ncT5v wKjohAnLgdC+n8Y+UXvJHDf7RYG5VaTRCd4Fc+uRINtx5aikqTNMbIqtV1nzjCPlk6nj D/0sZ0VLfEaIsUm3UnmE+bpDGWNXeaH/Lyw8ggXAyVBXoijGMVpfJlbrX4rfqEKD3bb6 uhQFDW/Q7u7w3Yq0l4IgTZkgzhb28Gyrzno9rxTV0SenCO9ZTDV5UPfBNTAsvX9nsPC0 qcyL9P/sBnSoRnd8AnS0YlfRh+Al/8plbYVUFILSlTeSfZmrUb+nZ0vZd+kObtXtFkp7 viYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=ZW5lLkL4JDDf9YU7h/GJGKjkCyTulUg7IkJ5X2M8OE0=; b=5RmcQTbE5qe958glI68X31n3unFJqtwUVarcFbZqRuFRrOf8L/KioIBkvk2iINoK0D lnCxCobplRdfK14BK8PeNCPAWYlH+rfq5Fa1ayu5YrPFveLvW7uqhW8Uo5ysdsuLdJAT dVTXagvutHwSDlhSubn26uXFCzxdC9g63Lx1pMvQPPFG+n8Sb9tv2CurlO5ZWBVhse23 pTlJg9p41vs35eLQb4ufm+1qLc+g1EU1sBDpjzIjXA2rz1LDt73coTMg98EJHr23i6LF 1Wzp67x/LAR6eXnrj3aA1mbW3xTU1YtkQhBxFQx/1P48SUVDbEW3tYPiyG20e3+yLkvU 2SMg== X-Gm-Message-State: AJIora9uRF8UjAI2xM4AlXDGTshF+RJiskulkct9k1cYgXTqnOHrbXoB bPU8kfj8xn4j5N/4zVYDZSlKsA== X-Google-Smtp-Source: AGRyM1ulejTrozItdDe8gUaSa6g97LeECzQY32rA9ATM/klopckLROa1qgzi/UICUNSR8vmGdeg9yQ== X-Received: by 2002:a5d:4f0b:0:b0:21d:705c:caf with SMTP id c11-20020a5d4f0b000000b0021d705c0cafmr3189291wru.55.1657013103855; Tue, 05 Jul 2022 02:25:03 -0700 (PDT) Received: from [192.168.10.46] (146725694.box.freepro.com. [130.180.211.218]) by smtp.googlemail.com with ESMTPSA id q7-20020a05600000c700b0021d76985929sm484157wrx.80.2022.07.05.02.25.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Jul 2022 02:25:03 -0700 (PDT) Message-ID: <653f63e5-c794-27fb-115a-7b051850991b@linaro.org> Date: Tue, 5 Jul 2022 11:25:01 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [PATCH 4/4] cpufreq: scmi: Support the power scale in micro-Watts in SCMI v3.1 Content-Language: en-US To: Lukasz Luba , linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Cc: amitk@kernel.org, rui.zhang@intel.com, viresh.kumar@linaro.org, rafael@kernel.org, dietmar.eggemann@arm.com, nm@ti.com, sboyd@kernel.org, sudeep.holla@arm.com, cristian.marussi@arm.com, matthias.bgg@gmail.com, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org References: <20220622145802.13032-1-lukasz.luba@arm.com> <20220622145802.13032-5-lukasz.luba@arm.com> From: Daniel Lezcano In-Reply-To: <20220622145802.13032-5-lukasz.luba@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On 22/06/2022 16:58, Lukasz Luba wrote: > The SCMI v3.1 adds support for power values in micro-Watts. They are not > always in milli-Watts anymore (ignoring the bogo-Watts). Thus, the power > must be converted conditionally before sending to Energy Model. Add the > logic which handles the needed checks and conversions. > > Signed-off-by: Lukasz Luba > --- > drivers/cpufreq/scmi-cpufreq.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c > index bfd35583d653..513a071845c2 100644 > --- a/drivers/cpufreq/scmi-cpufreq.c > +++ b/drivers/cpufreq/scmi-cpufreq.c > @@ -100,7 +100,7 @@ static int __maybe_unused > scmi_get_cpu_power(struct device *cpu_dev, unsigned long *power, > unsigned long *KHz) > { > - bool power_scale_mw = perf_ops->power_scale_mw_get(ph); > + enum scmi_power_scale power_scale = perf_ops->power_scale_get(ph); > unsigned long Hz; > int ret, domain; > > @@ -114,8 +114,8 @@ scmi_get_cpu_power(struct device *cpu_dev, unsigned long *power, > if (ret) > return ret; > > - /* Provide bigger resolution power to the Energy Model */ > - if (power_scale_mw) > + /* Convert the power to uW if it is mW (ignore bogoW) */ > + if (power_scale == SCMI_POWER_MILLIWATTS) > *power *= MICROWATT_PER_MILLIWATT; > > /* The EM framework specifies the frequency in KHz. */ > @@ -255,8 +255,9 @@ static int scmi_cpufreq_exit(struct cpufreq_policy *policy) > static void scmi_cpufreq_register_em(struct cpufreq_policy *policy) > { > struct em_data_callback em_cb = EM_DATA_CB(scmi_get_cpu_power); > - bool power_scale_mw = perf_ops->power_scale_mw_get(ph); > + enum scmi_power_scale power_scale = perf_ops->power_scale_get(ph); > struct scmi_data *priv = policy->driver_data; > + bool em_power_scale = false; Just pass 'false' to em_dev_register_perf_domain() > /* > * This callback will be called for each policy, but we don't need to > @@ -268,9 +269,13 @@ static void scmi_cpufreq_register_em(struct cpufreq_policy *policy) > if (!priv->nr_opp) > return; > > + if (power_scale == SCMI_POWER_MILLIWATTS > + || power_scale == SCMI_POWER_MICROWATTS) > + em_power_scale = true; > + > em_dev_register_perf_domain(get_cpu_device(policy->cpu), priv->nr_opp, > &em_cb, priv->opp_shared_cpus, > - power_scale_mw); > + em_power_scale); > } > > static struct cpufreq_driver scmi_cpufreq_driver = { -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog