Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp1046603lqp; Fri, 22 Mar 2024 04:11:18 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWCXZBucSeqF97JlXHWQyy/slLebE3TrtHRky4AOpuXAmgqyX6pQWNJvogeHfsCHGaGtFg6Q7gukFmv6JnQ54cVnz96kaADW9IKnB5MQQ== X-Google-Smtp-Source: AGHT+IEhdFaLy4d1US6nuoufdv5vrarTkbG3e6XBjMsKuYcFzTF05FOP3KEbFmbqoUePIEy/iZ62 X-Received: by 2002:a05:6a20:6ab0:b0:1a3:42ea:cbed with SMTP id bi48-20020a056a206ab000b001a342eacbedmr1899364pzb.44.1711105877777; Fri, 22 Mar 2024 04:11:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711105877; cv=pass; d=google.com; s=arc-20160816; b=yDgekRgmkwKPMvfFrW5RVfuPeATF0lBVCeG4bHmEhwh0MjrNrUL/kavIeEXSXwZ5m9 T22+yJKxJFoeIEkxvUzire8IJRskb5IuAr64Clu55Qq69fU50K4uvMo6OUAN2zzuXUY+ dwFeAL9wRiahdDEiRRNOeJiy4izbrUk75/hIxOwPgVRzPIWDjhsq6luZ7hppg/qM/Ibl FkJFRDrJ0g3bhtY/3BT9VSMCtkU4OfIxFw7kkgUS0E/nZNMJf7itznKpOQFNJIpWKpRa 0uo18pzYL2GVIYZ89k3RWuSJeKBBlyrlCJuIQx30cPH6fK7N6UgJDeFzm2K6b2G5sIFe UEOA== 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=5OLIK1fURCp4ogfYDkGiZicSY5Z48mDpISEt4bMZ5Yc=; fh=76fY95VCn/tTPDURHIWBg4FyCkia1KFHdPTfdxMrHno=; b=vOfWnrHfPHW5mCCR/9GJL8x0tsYRsyhoYNfkqfKIcuBr1h6H2DM3EnvVQOsABwIPkf dtbojXkvA0Tpo2ZwakdyBaSxzHtBJoQuDCiWk8zRBmdBKmS91m4SsUFdqB7jF/ObnyOQ hmMyKztuDoq25UwVTf4vcwWNV1UQi9pKSNjWChucsKh/17ZcqKmYzCzBfuEOGX+Ox/fi HCICYLWdLacfP+ndf3clR7+vijJ1wA3diIlJ1KMwzGwxi6x4tdPepGZyNPq1GfBf34JA 5NTqip6766qC8MnEnYX8+D9tWVC2UUjsk9nmGfqO5seyO9ynaQn/wpPEV/cYgDV24Z9e CDwQ==; 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-111351-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-111351-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. [139.178.88.99]) by mx.google.com with ESMTPS id r18-20020a63d912000000b005cf60fc5fc9si1715058pgg.274.2024.03.22.04.11.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 04:11:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-111351-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; 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-111351-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-111351-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 3F7B328679C for ; Fri, 22 Mar 2024 11:09:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B4F9F3FB94; Fri, 22 Mar 2024 11:09:07 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B6EFC3F9D8; Fri, 22 Mar 2024 11:09:05 +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=1711105747; cv=none; b=b04apBnXtC/ELm2bc31XwFC33d/mhTaEp+19Fb2J2zSQqmyHF6uAkvF1MKSJVcll1uHg9qa56N3cs54jsEYHQrK34+Voh+WLSB3Y4WUX34btOXf1tR6KDkBqNArN6iMlFIHUx6YFsOc/dcVysM3YjBqboFKSr+x6hCSFQEioyHc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711105747; c=relaxed/simple; bh=EBiyN7z+iVf9f6Cx/QHrstPzuWfXaar5i9deE73J/Us=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CBPN233GyYq63BPih8ZyWC5ia0z4T23lBKlLausv66vixYNYXvcJoJsf53cGxlQQjEqWufqsnSWi3duTeimZRqJlro6Snp1r6PlEAt6eISLSv9PDS2FZ+cHZww4sXUFh2jRFS0+C2BzpIS9SpsEejr+5p50zAquN9zPbwhlH8Nc= 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 85ABD1691; Fri, 22 Mar 2024 04:09:39 -0700 (PDT) Received: from e129166.arm.com (unknown [10.57.71.57]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0383F3F64C; Fri, 22 Mar 2024 04:09:02 -0700 (PDT) From: Lukasz Luba To: linux-kernel@vger.kernel.org, linux-pm@vger.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, rafael@kernel.org, viresh.kumar@linaro.org, krzysztof.kozlowski@linaro.org, alim.akhtar@samsung.com, m.szyprowski@samsung.com, mhiramat@kernel.org Subject: [RESEND][PATCH v2 2/4] PM: EM: Change the em_adjust_new_capacity() to re-use code Date: Fri, 22 Mar 2024 11:08:48 +0000 Message-Id: <20240322110850.77086-3-lukasz.luba@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240322110850.77086-1-lukasz.luba@arm.com> References: <20240322110850.77086-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 There is going to be a new update function addressing chip binning. Therefore, some common code which can be refactored and called from upcoming changes and em_adjust_new_capacity(). In this way the code duplication can be avoided. 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