Received: by 2002:ab2:1149:0:b0:1f3:1f8c:d0c6 with SMTP id z9csp2804589lqz; Wed, 3 Apr 2024 09:04:07 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCX/9R9XP516kWyXG2MvYx564bJgVYVhmfuaNLomzEg1aFAoLkaH7lq8NLcLKdRRTVCpvLLLJ0x8pPI/989pq2LlwtsA9gT42GHV/NqwFQ== X-Google-Smtp-Source: AGHT+IFzjwWtqitwIEX8lS7zNjfu8kPmmXubQHTrPFRXCZJjnVwOUSdkQuOQUcjsLJI7dKDSyEdO X-Received: by 2002:a05:6a20:5490:b0:1a7:2637:7587 with SMTP id i16-20020a056a20549000b001a726377587mr107691pzk.3.1712160247444; Wed, 03 Apr 2024 09:04:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712160247; cv=pass; d=google.com; s=arc-20160816; b=Mj9HHBWM5wEi8czkMbqIjNTKOt0CwnIwIzKThqZlVzUdH93LbzEM00YFLBXCvxoxo8 8AcYDa6Po8C3l4DcjHu/kBNjYhIb1qWVCegkLHkX4+jym/4UyG7N5co10ddLeDK4DQh2 JeezGBl9z4J3LIQFxpsw123XbSBNu57JxIlRJcZOMwD1a6RpjTd+vERyMafXLgI/Ea9U euTwtoe50o9hu8l2F7mQ08mjzHeogb+UbKRDdv+iRoNYHxcSzXdYm1B3QfRYUiy80RXX yakO6lMGRxXgqRWXe36ATCUBDmM1LIHdV+JYe4xE27z8uH78bZuI9mp7zdWBuV0S3ewH f88g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=3cF89q1e0VD7btckS2on1QvRroilcTgcMvsMc4gFJPo=; fh=FmC2hJpJhN2HT2Kov+KiTeKhNOezP0K1ntHb8ZYpOKY=; b=g0trVT8Jr+dawQW4VXJkNm1k4qdUAzi58+kEQk4xqQ5uhEmGbpWPTWIxd18eHItRzs D/rAbff18++FxgB4UpGWNqSBLcXA00m0A8qy0261Y5zwlOnuANlFrd/6Uk6qr+uqNGTd krInORKp8SbyvqGlNfDy2RR9QSqOc8C3/tr1eeDc65QGInG3LL5S8A6hoigr3MNlbJ9D bCPiXqjWGaface1xtxOO6Dx3xpg+wp06Uuxz99bTJTpwESrhnM6mZ7bOX5OlAHec+Isl zMU0XHZ4iMapWt9tGJRkOvDfJgug263xOWWY4XeG9uwM0+1xhraNA8URU8Zrd1Zz9isF 05PA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-130130-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-130130-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id c8-20020a056a000ac800b006ea93e60f84si13457940pfl.191.2024.04.03.09.04.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 09:04:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-130130-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-130130-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-130130-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 4C29B2919F8 for ; Wed, 3 Apr 2024 15:50:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3181414C5B3; Wed, 3 Apr 2024 15:49:33 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EE62A14BFBA; Wed, 3 Apr 2024 15:49:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712159372; cv=none; b=PAFrVjGxXODjkLfbrUOsk3WQoOZZDoEVklRU2gmKhKUAJXnO2uk9dKOqtWCAWe7bi0yT8rY8Hd1me3ZoKl/ZOPPxH9tV/M9+o6/LxGPPPu/eo/cZNIT+YqTigzi75mznVQwxJ/7qsCogdonMBWzFb+Psd2t5zUCCaQkT35npNUY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712159372; c=relaxed/simple; bh=dnhosNZpwd8KOLzRS0QKczQ/cn7DGcdf0wVrJ8VkX1s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ThCP2TrRS1OxwGBMWSj+9hP27WoktbBoycVl6QaG9/WVV9KdVJlwhuQzho4+CXHTDlUyqfzLbU8PbuAybrGGUh5GQG7rIeUxDlo6trMG9CC4lGQ2Q0SopI2RBaxi8NGMq125WwBoTljcRdFk4Bq8/r0d/s7Wj9qrZz0xiYzMEa8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 5B7BF1007; Wed, 3 Apr 2024 08:50:01 -0700 (PDT) Received: from e129166.arm.com (unknown [10.57.72.191]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D58773F7B4; Wed, 3 Apr 2024 08:49:27 -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, linux-arm-kernel@lists.infradead.org, sboyd@kernel.org, nm@ti.com, linux-samsung-soc@vger.kernel.org, daniel.lezcano@linaro.org, viresh.kumar@linaro.org, krzysztof.kozlowski@linaro.org, alim.akhtar@samsung.com, m.szyprowski@samsung.com, mhiramat@kernel.org Subject: [PATCH v5 2/4] PM: EM: Refactor em_adjust_new_capacity() Date: Wed, 3 Apr 2024 16:49:05 +0100 Message-Id: <20240403154907.1420245-3-lukasz.luba@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240403154907.1420245-1-lukasz.luba@arm.com> References: <20240403154907.1420245-1-lukasz.luba@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Extract em_table_dup() and em_recalc_and_update() from em_adjust_new_capacity(). Both functions will be later reused by the 'update EM due to chip binning' functionality. Reviewed-by: Dietmar Eggemann Signed-off-by: Lukasz Luba --- kernel/power/energy_model.c | 58 +++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c index 9e1c9aa399ea9..6960dd7393b2d 100644 --- a/kernel/power/energy_model.c +++ b/kernel/power/energy_model.c @@ -674,23 +674,15 @@ void em_dev_unregister_perf_domain(struct device *dev) } EXPORT_SYMBOL_GPL(em_dev_unregister_perf_domain); -/* - * Adjustment of CPU performance values after boot, when all CPUs capacites - * are correctly calculated. - */ -static void em_adjust_new_capacity(struct device *dev, - struct em_perf_domain *pd, - u64 max_cap) +static struct em_perf_table __rcu *em_table_dup(struct em_perf_domain *pd) { struct em_perf_table __rcu *em_table; struct em_perf_state *ps, *new_ps; - int ret, ps_size; + int ps_size; em_table = em_table_alloc(pd); - if (!em_table) { - dev_warn(dev, "EM: allocation failed\n"); - return; - } + if (!em_table) + return NULL; new_ps = em_table->state; @@ -702,24 +694,52 @@ static void em_adjust_new_capacity(struct device *dev, rcu_read_unlock(); - em_init_performance(dev, pd, new_ps, pd->nr_perf_states); - ret = em_compute_costs(dev, new_ps, NULL, pd->nr_perf_states, + return em_table; +} + +static int em_recalc_and_update(struct device *dev, struct em_perf_domain *pd, + struct em_perf_table __rcu *em_table) +{ + int ret; + + ret = em_compute_costs(dev, em_table->state, NULL, pd->nr_perf_states, pd->flags); - if (ret) { - dev_warn(dev, "EM: compute costs failed\n"); - return; - } + if (ret) + goto free_em_table; ret = em_dev_update_perf_domain(dev, em_table); if (ret) - dev_warn(dev, "EM: update failed %d\n", ret); + goto free_em_table; /* * This is one-time-update, so give up the ownership in this updater. * The EM framework has incremented the usage counter and from now * will keep the reference (then free the memory when needed). */ +free_em_table: em_table_free(em_table); + return ret; +} + +/* + * Adjustment of CPU performance values after boot, when all CPUs capacites + * are correctly calculated. + */ +static void em_adjust_new_capacity(struct device *dev, + struct em_perf_domain *pd, + u64 max_cap) +{ + struct em_perf_table __rcu *em_table; + + em_table = em_table_dup(pd); + if (!em_table) { + dev_warn(dev, "EM: allocation failed\n"); + return; + } + + em_init_performance(dev, pd, em_table->state, pd->nr_perf_states); + + em_recalc_and_update(dev, pd, em_table); } static void em_check_capacity_update(void) -- 2.25.1