From nobody Fri Dec 19 10:14:39 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 04B913128AF; Mon, 8 Dec 2025 10:59:47 +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=1765191588; cv=none; b=LLZ/Rkfje9hjby3Gq2C19ZsUvnwH5FaNlqGeUj7Xxx4ABqtS7OCLr0QCFuAHYI0RNhQ7RB2JzcI8p38Wa/0s4omzIiIuAzPyb8hgzyzghR8OjbHpnCV5UXWNQkusRtwTSKItTrQL93mwKjrD5+KSXo6LcfawiunHAJfowHHELUs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765191588; c=relaxed/simple; bh=gFqpxofy6fTB33BJe3RCrR//sp4Ix4o1dOR4GYxnx+4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZCgNg0NhjgSvtR8eWuwmZLCA7XFvSIWlpECleAWC98uKsOTFMDp5M+Go7d/CgbABkQFRj1os24MnIbUftkGDWmW8M/T1oOZOoy1AILWdsmsU9ZGRUruBMhL3MZgeGMwJK0A+st5Vh6WqZSVVLYys0cr5kscGgXD2jqnVCc6ykAM= 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 36A31169C; Mon, 8 Dec 2025 02:59:39 -0800 (PST) Received: from e135073.arm.com (unknown [10.57.88.207]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9C26A3F762; Mon, 8 Dec 2025 02:59:43 -0800 (PST) From: Pierre Gondois To: linux-kernel@vger.kernel.org Cc: Christian Loehle , Ionela Voinescu , zhenglifeng1@huawei.com, Jie Zhan , Pierre Gondois , Huang Rui , "Gautham R. Shenoy" , Mario Limonciello , Perry Yuan , "Rafael J. Wysocki" , Viresh Kumar , linux-pm@vger.kernel.org Subject: [PATCH v2 1/3] cpufreq: Add boost_freq_req QoS request Date: Mon, 8 Dec 2025 11:59:26 +0100 Message-ID: <20251208105933.1369125-2-pierre.gondois@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251208105933.1369125-1-pierre.gondois@arm.com> References: <20251208105933.1369125-1-pierre.gondois@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: quoted-printable Content-Type: text/plain; charset="utf-8" The Power Management Quality of Service (PM QoS) allows to aggregate constraints from multiple entities. It is currently used to manage the min/max frequency of a given policy. Frequency constraints can come for instance from: - Thermal framework: acpi_thermal_cpufreq_init() - Firmware: _PPC objects: acpi_processor_ppc_init() - User: by setting policyX/scaling_[min|max]_freq The minimum of the max frequency constraints is used to compute the resulting maximum allowed frequency. When enabling boost frequencies, the same frequency request object (policy->max_freq_req) as to handle requests from users is used. As a result, when setting: - scaling_max_freq - boost The last sysfs file used overwrites the request from the other sysfs file. To avoid this, create a per-policy boost_freq_req to save the boost constraints instead of overwriting the last scaling_max_freq constraint. Signed-off-by: Pierre Gondois --- drivers/cpufreq/cpufreq.c | 28 ++++++++++++++++++++++++++++ include/linux/cpufreq.h | 1 + 2 files changed, 29 insertions(+) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 852e024facc3c..942416f2741b0 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1359,6 +1359,11 @@ static void cpufreq_policy_free(struct cpufreq_polic= y *policy) /* Cancel any pending policy->update work before freeing the policy. */ cancel_work_sync(&policy->update); =20 + if (policy->boost_freq_req) { + freq_qos_remove_request(policy->boost_freq_req); + kfree(policy->boost_freq_req); + } + if (policy->max_freq_req) { /* * Remove max_freq_req after sending CPUFREQ_REMOVE_POLICY @@ -1476,6 +1481,29 @@ static int cpufreq_policy_online(struct cpufreq_poli= cy *policy, goto out_destroy_policy; } =20 + if (policy->boost_supported) { + policy->boost_freq_req =3D kzalloc(sizeof(*policy->boost_freq_req), + GFP_KERNEL); + if (!policy->boost_freq_req) { + ret =3D -ENOMEM; + goto out_destroy_policy; + } + + ret =3D freq_qos_add_request(&policy->constraints, + policy->boost_freq_req, + FREQ_QOS_MAX, + FREQ_QOS_MAX_DEFAULT_VALUE); + if (ret < 0) { + /* + * So we don't call freq_qos_remove_request() for an + * uninitialized request. + */ + kfree(policy->boost_freq_req); + policy->boost_freq_req =3D NULL; + goto out_destroy_policy; + } + } + blocking_notifier_call_chain(&cpufreq_policy_notifier_list, CPUFREQ_CREATE_POLICY, policy); } else { diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 0465d1e6f72ac..c292a6a19e4f5 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -81,6 +81,7 @@ struct cpufreq_policy { struct freq_constraints constraints; struct freq_qos_request *min_freq_req; struct freq_qos_request *max_freq_req; + struct freq_qos_request *boost_freq_req; =20 struct cpufreq_frequency_table *freq_table; enum cpufreq_table_sorting freq_table_sorted; --=20 2.43.0 From nobody Fri Dec 19 10:14:39 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D3B8714A8E; Mon, 8 Dec 2025 10:59:51 +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=1765191593; cv=none; b=mGPjKvd+FLlcJ5na30e5qM4b/UAe4OnTsqGyE52OM7JgrBp6yBM9hU/p1Av9Po1R1qeA3I5hTeuOoDtMORPekEF5+SPY0xS1HHDTrcnjwxiFgWmFhfd5Aud7zG6SMJ2e0NLn2vliIsxEAImi303a5LEK/JKjV2oiCvHokUHJWvk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765191593; c=relaxed/simple; bh=FsB8Y8Hvs1X3OlpqQ37vcZpAElV+amsN8Ck2Zrldxto=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YVNsuP/O0CcUWcqain2MuKEbi9rIxg+mFJ0V4/wCDqz2inHavDWPNEg/gCALTSruTlC6QmoTvwmou6cgI4E7SPo8b5RHB7lqt9YbxZlOppa8o+Pizka0iMHvU4i6I8xn8Z/mmGfotpcYBkpcJU1hgdyyinAZjCBu7LCKbtSDUK0= 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 E14F21691; Mon, 8 Dec 2025 02:59:43 -0800 (PST) Received: from e135073.arm.com (unknown [10.57.88.207]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0A6C23F762; Mon, 8 Dec 2025 02:59:47 -0800 (PST) From: Pierre Gondois To: linux-kernel@vger.kernel.org Cc: Christian Loehle , Ionela Voinescu , zhenglifeng1@huawei.com, Jie Zhan , Pierre Gondois , Huang Rui , "Gautham R. Shenoy" , Mario Limonciello , Perry Yuan , "Rafael J. Wysocki" , Viresh Kumar , linux-pm@vger.kernel.org Subject: [PATCH v2 2/3] cpufreq: Centralize boost freq QoS requests Date: Mon, 8 Dec 2025 11:59:27 +0100 Message-ID: <20251208105933.1369125-3-pierre.gondois@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251208105933.1369125-1-pierre.gondois@arm.com> References: <20251208105933.1369125-1-pierre.gondois@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: quoted-printable Content-Type: text/plain; charset="utf-8" policy_set_boost() calls the cpufreq set_boost callback. Update the newly added boost_freq_req request from there: - whenever boost is toggled - to cover all possible paths Signed-off-by: Pierre Gondois --- drivers/cpufreq/cpufreq.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 942416f2741b0..65ef0fa70c388 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -603,10 +603,18 @@ static int policy_set_boost(struct cpufreq_policy *po= licy, bool enable) policy->boost_enabled =3D enable; =20 ret =3D cpufreq_driver->set_boost(policy, enable); - if (ret) + if (ret) { policy->boost_enabled =3D !policy->boost_enabled; + return ret; + } =20 - return ret; + ret =3D freq_qos_update_request(policy->boost_freq_req, policy->cpuinfo.m= ax_freq); + if (ret < 0) { + policy->boost_enabled =3D !policy->boost_enabled; + return ret; + } + + return 0; } =20 static ssize_t store_local_boost(struct cpufreq_policy *policy, --=20 2.43.0 From nobody Fri Dec 19 10:14:39 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AA0CB3128AD; Mon, 8 Dec 2025 10:59:56 +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=1765191599; cv=none; b=dR2E7fy1t1CmWb3sRj625OEfJaecQbwyMPmVND6QsIV2l4ggs5Q2pytaHxnGNr5LvuUsGamzI94Rhd2FXpBeWFZe+81QAZJgIUnIxZ1dGRFloXIHiCRQ9KKGC+GWZs1ga3cHAWSv0yPehNPcSlN9gOs+bha8LPeXr6WxShYCdK4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765191599; c=relaxed/simple; bh=F5sirQo0blKuDpg2nMZiUwVRih7MduSsPXXR+XLdvQE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JM22r1nKfJdS5FfrxL07Ldl+mFAbrT8EaX1rH46aE7dzpSWAnwqTJ7U5oyiWg0UzJp9oQBtoO55dZekd9oNBuSXcaRkM/zATEs9XH9LIlr4F5jl8DEDLjo6d5Pvetq0ayP7aKvWHD6f7/AjA8fq1690evkCp8INSBfFfsn+s7tU= 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 35E141691; Mon, 8 Dec 2025 02:59:48 -0800 (PST) Received: from e135073.arm.com (unknown [10.57.88.207]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 99D533F762; Mon, 8 Dec 2025 02:59:52 -0800 (PST) From: Pierre Gondois To: linux-kernel@vger.kernel.org Cc: Christian Loehle , Ionela Voinescu , zhenglifeng1@huawei.com, Jie Zhan , Pierre Gondois , Huang Rui , "Gautham R. Shenoy" , Mario Limonciello , Perry Yuan , "Rafael J. Wysocki" , Viresh Kumar , linux-pm@vger.kernel.org Subject: [PATCH v2 3/3] cpufreq: Update set_boost callbacks to rely on boost_freq_req Date: Mon, 8 Dec 2025 11:59:28 +0100 Message-ID: <20251208105933.1369125-4-pierre.gondois@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251208105933.1369125-1-pierre.gondois@arm.com> References: <20251208105933.1369125-1-pierre.gondois@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: quoted-printable Content-Type: text/plain; charset="utf-8" In the existing set_boost() callbacks: - Don't update policy->max as this is done through the qos notifier cpufreq_notifier_max() which calls cpufreq_set_policy(). - Remove freq_qos_update_request() calls as the qos request is now done in policy_set_boost() and updates the new boost_freq_req Signed-off-by: Pierre Gondois --- drivers/cpufreq/amd-pstate.c | 2 -- drivers/cpufreq/cppc_cpufreq.c | 21 ++++----------------- drivers/cpufreq/cpufreq.c | 14 ++------------ 3 files changed, 6 insertions(+), 31 deletions(-) diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c index b44f0f7a5ba1c..50416358a96ac 100644 --- a/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c @@ -754,8 +754,6 @@ static int amd_pstate_cpu_boost_update(struct cpufreq_p= olicy *policy, bool on) else if (policy->cpuinfo.max_freq > nominal_freq) policy->cpuinfo.max_freq =3D nominal_freq; =20 - policy->max =3D policy->cpuinfo.max_freq; - if (cppc_state =3D=3D AMD_PSTATE_PASSIVE) { ret =3D freq_qos_update_request(&cpudata->req[1], policy->cpuinfo.max_fr= eq); if (ret < 0) diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c index e23d9abea1359..3baf7baaec371 100644 --- a/drivers/cpufreq/cppc_cpufreq.c +++ b/drivers/cpufreq/cppc_cpufreq.c @@ -597,21 +597,14 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_polic= y *policy) caps =3D &cpu_data->perf_caps; policy->driver_data =3D cpu_data; =20 - /* - * Set min to lowest nonlinear perf to avoid any efficiency penalty (see - * Section 8.4.7.1.1.5 of ACPI 6.1 spec) - */ - policy->min =3D cppc_perf_to_khz(caps, caps->lowest_nonlinear_perf); - policy->max =3D cppc_perf_to_khz(caps, policy->boost_enabled ? - caps->highest_perf : caps->nominal_perf); - /* * Set cpuinfo.min_freq to Lowest to make the full range of performance * available if userspace wants to use any perf between lowest & lowest * nonlinear perf */ policy->cpuinfo.min_freq =3D cppc_perf_to_khz(caps, caps->lowest_perf); - policy->cpuinfo.max_freq =3D policy->max; + policy->cpuinfo.max_freq =3D cppc_perf_to_khz(caps, policy->boost_enabled= ? + caps->highest_perf : caps->nominal_perf); =20 policy->transition_delay_us =3D cppc_cpufreq_get_transition_delay_us(cpu); policy->shared_type =3D cpu_data->shared_type; @@ -776,17 +769,11 @@ static int cppc_cpufreq_set_boost(struct cpufreq_poli= cy *policy, int state) { struct cppc_cpudata *cpu_data =3D policy->driver_data; struct cppc_perf_caps *caps =3D &cpu_data->perf_caps; - int ret; =20 if (state) - policy->max =3D cppc_perf_to_khz(caps, caps->highest_perf); + policy->cpuinfo.max_freq =3D cppc_perf_to_khz(caps, caps->highest_perf); else - policy->max =3D cppc_perf_to_khz(caps, caps->nominal_perf); - policy->cpuinfo.max_freq =3D policy->max; - - ret =3D freq_qos_update_request(policy->max_freq_req, policy->max); - if (ret < 0) - return ret; + policy->cpuinfo.max_freq =3D cppc_perf_to_khz(caps, caps->nominal_perf); =20 return 0; } diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 65ef0fa70c388..ab2def9e4d188 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1514,10 +1514,6 @@ static int cpufreq_policy_online(struct cpufreq_poli= cy *policy, =20 blocking_notifier_call_chain(&cpufreq_policy_notifier_list, CPUFREQ_CREATE_POLICY, policy); - } else { - ret =3D freq_qos_update_request(policy->max_freq_req, policy->max); - if (ret < 0) - goto out_destroy_policy; } =20 if (cpufreq_driver->get && has_target()) { @@ -2819,16 +2815,10 @@ int cpufreq_boost_set_sw(struct cpufreq_policy *pol= icy, int state) return -ENXIO; =20 ret =3D cpufreq_frequency_table_cpuinfo(policy); - if (ret) { + if (ret) pr_err("%s: Policy frequency update failed\n", __func__); - return ret; - } =20 - ret =3D freq_qos_update_request(policy->max_freq_req, policy->max); - if (ret < 0) - return ret; - - return 0; + return ret; } EXPORT_SYMBOL_GPL(cpufreq_boost_set_sw); =20 --=20 2.43.0