From patchwork Tue Mar 14 10:33:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Luba X-Patchwork-Id: 69478 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1678360wrd; Tue, 14 Mar 2023 03:38:13 -0700 (PDT) X-Google-Smtp-Source: AK7set+2tv6ItVetK0b14HVOiqxQDTsqCqPVGNTtJrn/a+vLFxlRRkjSIiTZt630kc5vE5uPfW5J X-Received: by 2002:a17:902:ab82:b0:19b:da8:1ce6 with SMTP id f2-20020a170902ab8200b0019b0da81ce6mr30195952plr.55.1678790293244; Tue, 14 Mar 2023 03:38:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678790293; cv=none; d=google.com; s=arc-20160816; b=t35HzT3CNVOq5p6As61gu8i0m6r4fRBsPDjhnvdZM6YD3klYjZikF6+ccyGm8rcGzF YvwiWKol3QcO/9tVHtBcbZAXktQCc9aghoaaHcfWzDQQe8IeEnnCa3o8Pt21n023tDfy Tv4T8y4A/V/rTOuQuwoPKawNgH4vJkllH5iKAUaDNRs/l7B8T/nBYUSs3MwS3DeC7KnP MRuH8k+Iig7b3TsSS8z1BUhpWMWhN7Sm855kvokCLB3gBDs5ufDzziBJYDC3kQNl0qKj kClcyDNIiIN0Sm/gIIhMXhFaIANrLh577tpfGrm7RMmKDKzcAv7ZmfiNlJdp6sZtQDZa 3ulw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=4RoofPA592oFIYtUUp0PNd4H+b9XUctQukmAJ5tZNt0=; b=dC6Hu1Nx4Cj/jKwQ2k36MaYThzpBBExeYQaGj11OBdM3ZIC1sBNA2vmJu5WO+sSFy0 scVymIIKhbSPFmZNSzy9fsUoQPacq7pw20IfXO/AaevtOrc1+a4QzmpwUFW6q9WfkkLZ Evs05iaEYSIpc5YIe+phdytRJL+yduQ43B5mJ9A+gjNdEj3sI2FP2vMDhBRhtFO90Jjk E9jX6AOmo6hCqMUI6hN74VOBlZpq9Fo/61Bo14Q0yHfxeZZxfk0J/Bm7wcqjlmdjEtkc f066GjOfdfbOI36KvXW25pTs9ji2Bhtc8Yv0ze+Pb5DycBqVOzC+DHVe1zSzxkiverhb 7xZQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f30-20020a17090a702100b00233e561533dsi2093628pjk.61.2023.03.14.03.38.00; Tue, 14 Mar 2023 03:38:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229810AbjCNKf3 (ORCPT + 99 others); Tue, 14 Mar 2023 06:35:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231421AbjCNKfN (ORCPT ); Tue, 14 Mar 2023 06:35:13 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 729AD10430; Tue, 14 Mar 2023 03:34:43 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AA2D21474; Tue, 14 Mar 2023 03:35:06 -0700 (PDT) Received: from e123648.arm.com (unknown [10.57.19.101]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3333A3F71A; Tue, 14 Mar 2023 03:34:20 -0700 (PDT) From: Lukasz Luba To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, rafael@kernel.org Cc: lukasz.luba@arm.com, dietmar.eggemann@arm.com, rui.zhang@intel.com, amit.kucheria@verdurent.com, amit.kachhap@gmail.com, daniel.lezcano@linaro.org, viresh.kumar@linaro.org, len.brown@intel.com, pavel@ucw.cz, Pierre.Gondois@arm.com, ionela.voinescu@arm.com, rostedt@goodmis.org, mhiramat@kernel.org Subject: [PATCH 03/17] PM: EM: Refactor em_pd_get_efficient_state() to be more flexible Date: Tue, 14 Mar 2023 10:33:43 +0000 Message-Id: <20230314103357.26010-4-lukasz.luba@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230314103357.26010-1-lukasz.luba@arm.com> References: <20230314103357.26010-1-lukasz.luba@arm.com> X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760339210683939504?= X-GMAIL-MSGID: =?utf-8?q?1760339210683939504?= Prepare em_pd_get_efficient_state() for the upcoming changes and make it possible to re-use. Return an index for the best performance state. The function arguments that are introduced should allow to work on different performance state arrays. The caller of em_pd_get_efficient_state() should be able to use the index either on the default or the modifiable EM table. Signed-off-by: Lukasz Luba --- include/linux/energy_model.h | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h index b9caa01dfac4..8069f526c9d8 100644 --- a/include/linux/energy_model.h +++ b/include/linux/energy_model.h @@ -175,33 +175,35 @@ void em_dev_unregister_perf_domain(struct device *dev); /** * em_pd_get_efficient_state() - Get an efficient performance state from the EM - * @pd : Performance domain for which we want an efficient frequency - * @freq : Frequency to map with the EM + * @state: List of performance states, in ascending order + * @nr_perf_states: Number of performance states + * @freq: Frequency to map with the EM + * @pd_flags: Performance Domain flags * * It is called from the scheduler code quite frequently and as a consequence * doesn't implement any check. * - * Return: An efficient performance state, high enough to meet @freq + * Return: An efficient performance state id, high enough to meet @freq * requirement. */ -static inline -struct em_perf_state *em_pd_get_efficient_state(struct em_perf_domain *pd, - unsigned long freq) +static inline int +em_pd_get_efficient_state(struct em_perf_state *table, int nr_perf_states, + unsigned long freq, unsigned long pd_flags) { struct em_perf_state *ps; int i; - for (i = 0; i < pd->nr_perf_states; i++) { - ps = &pd->table[i]; + for (i = 0; i < nr_perf_states; i++) { + ps = &table[i]; if (ps->frequency >= freq) { - if (pd->flags & EM_PERF_DOMAIN_SKIP_INEFFICIENCIES && + if (pd_flags & EM_PERF_DOMAIN_SKIP_INEFFICIENCIES && ps->flags & EM_PERF_STATE_INEFFICIENT) continue; - break; + return i; } } - return ps; + return nr_perf_states - 1; } /** @@ -226,7 +228,7 @@ static inline unsigned long em_cpu_energy(struct em_perf_domain *pd, { unsigned long freq, scale_cpu; struct em_perf_state *ps; - int cpu; + int cpu, i; if (!sum_util) return 0; @@ -251,7 +253,9 @@ static inline unsigned long em_cpu_energy(struct em_perf_domain *pd, * Find the lowest performance state of the Energy Model above the * requested frequency. */ - ps = em_pd_get_efficient_state(pd, freq); + i = em_pd_get_efficient_state(pd->table, pd->nr_perf_states, freq, + pd->flags); + ps = &pd->table[i]; /* * The capacity of a CPU in the domain at the performance state (ps)