amd-pstate Dynamic EPP and raw EPP
Subsystems (3)
v6 cover amd-pstate Dynamic EPP and raw EPP
Dynamic EPP allows the kernel to register amd-pstate as part of a platform profile. It will change EPP modes matching the user's preference to the platform profile sysfs files as well as power adapter state.
Raw EPP allows userspace to write integers toenergy_performance_preference.
This is based off superm1/linux-next + [1]
Note: v5 had some feedback to always default dynamic EPP to disabled for server, but I think that's very confusing if the kconfig or kernel command line option don't work for server but do for client.
Server effectively be a no-op because the platform profile will start in performance anyway.
v5: [2]
Mario Limonciello (AMD) (5):
cpufreq/amd-pstate: Add dynamic energy performance preference cpufreq/amd-pstate: add kernel command line to override dynamic epp cpufreq/amd-pstate: Add support for platform profile class cpufreq/amd-pstate: Add support for raw EPP writes cpufreq/amd-pstate-ut: Add a unit test for raw EPP
.../admin-guide/kernel-parameters.txt | 7 + Documentation/admin-guide/pm/amd-pstate.rst | 41 ++- drivers/cpufreq/Kconfig.x86 | 13 + drivers/cpufreq/amd-pstate-ut.c | 109 +++++++ drivers/cpufreq/amd-pstate.c | 287 ++++++++++++++++-- drivers/cpufreq/amd-pstate.h | 21 +- 6 files changed, 449 insertions(+), 29 deletions(-)
Signature · 1 line
2.43.0
PATCH v6 1/5 cpufreq/amd-pstate: Add dynamic energy performance preference
Dynamic energy performance preference changes the EPP profile based on whether the machine is running on AC or DC power.
A notification chain from the power supply core is used to adjust EPP values on plug in or plug out events.
When enabled, the driver exposes a sysfs toggle for dynamic EPP, blocks manual writes to energy_performance_preference, and keeps the policy in performance mode while it "owns" the EPP updates.
For non-server systems:
* the default EPP for AC mode is performance.
* the default EPP for DC mode is balance_performance.
For server systems dynamic EPP is mostly a no-op.
---v5->v6:
* Set the power supply notifier callback before registration
* Expand the changelog to cover the sysfs toggle and manual EPP blocking
* Add missing kdoc
--- Documentation/admin-guide/pm/amd-pstate.rst | 18 ++- drivers/cpufreq/Kconfig.x86 | 12 ++ drivers/cpufreq/amd-pstate.c | 137 ++++++++++++++++++-- drivers/cpufreq/amd-pstate.h | 10 +- 4 files changed, 163 insertions(+), 14 deletions(-)
Documentation/admin-guide/pm/amd-pstate.rst +17 -1
@@ -325,7 +325,7 @@ and user can change current preference according to energy or performance needs Please get all support profiles list from ``energy_performance_available_preferences`` attribute, all the profiles are integer values defined between 0 to 255 when EPP feature is enabled by platform -firmware, if EPP feature is disabled, driver will ignore the written value +firmware, but if the dynamic EPP feature is enabled, driver will block writes. This attribute is read-write. ``boost``
@@ -347,6 +347,22 @@ boost or `1` to enable it, for the respective CPU using the sysfs path Other performance and frequency values can be read back from ``/sys/devices/system/cpu/cpuX/acpi_cppc/``, see :ref:`cppc_sysfs`. +Dynamic energy performance profile +================================== +The amd-pstate driver supports dynamically selecting the energy performance +profile based on whether the machine is running on AC or DC power. + +Whether this behavior is enabled by default with the kernel config option +`CONFIG_X86_AMD_PSTATE_DYNAMIC_EPP`. This behavior can also be overridden +at runtime by the sysfs file ``/sys/devices/system/cpu/cpufreq/policyX/dynamic_epp``. + +When set to enabled, the driver will select a different energy performance +profile when the machine is running on battery or AC power. +When set to disabled, the driver will not change the energy performance profile +based on the power source and will not react to user desired power state. + +Attempting to manually write to the ``energy_performance_preference`` sysfs +file will fail when ``dynamic_epp`` is enabled. ``amd-pstate`` vs ``acpi-cpufreq`` ======================================
drivers/cpufreq/Kconfig.x86 +12 -0
@@ -68,6 +68,18 @@ config X86_AMD_PSTATE_DEFAULT_MODE For details, take a look at: <file:Documentation/admin-guide/pm/amd-pstate.rst>. +config X86_AMD_PSTATE_DYNAMIC_EPP + bool "AMD Processor P-State dynamic EPP support" + depends on X86_AMD_PSTATE + default n + help + Allow the kernel to dynamically change the energy performance + value from events like ACPI platform profile and AC adapter plug + events. + + This feature can also be changed at runtime, this configuration + option only sets the kernel default value behavior. + config X86_AMD_PSTATE_UT tristate "selftest for AMD Processor P-State driver" depends on X86 && ACPI_PROCESSOR
drivers/cpufreq/amd-pstate.c +125 -12
209 lines not on this page · raw message
drivers/cpufreq/amd-pstate.h +9 -1
@@ -85,6 +85,11 @@ struct amd_aperf_mperf {* AMD P-State driver supports preferred core featue. * @epp_cached: Cached CPPC energy-performance preference value * @policy: Cpufreq policy value +* @suspended: If CPU core if offlined +* @epp_default_ac: Default EPP value for AC power source +* @epp_default_dc: Default EPP value for DC power source +* @dynamic_epp: Whether dynamic EPP is enabled +* @power_nb: Notifier block for power events * * The amd_cpudata is key private data for each CPU thread in AMD P-State, and * represents all the attributes and goals that AMD P-State requests at runtime.
@@ -118,7 +123,10 @@ struct amd_cpudata {/* EPP feature related attributes*/ u32 policy;bool suspended; -u8 epp_default; +u8 epp_default_ac; +u8 epp_default_dc; +bool dynamic_epp; +struct notifier_block power_nb; };/*
Signature · 1 line
2.43.0
Re: [PATCH v6 1/5] cpufreq/amd-pstate: Add dynamic energy performance preference
Quoted 43 lines · Mario Limonciello (AMD)
Dynamic energy performance preference changes the EPP profile based on whether the machine is running on AC or DC power.
A notification chain from the power supply core is used to adjust EPP values on plug in or plug out events.
When enabled, the driver exposes a sysfs toggle for dynamic EPP, blocks manual writes to
energy_performance_preference, and keeps the policy in performance mode while it "owns" the EPP updates.For non-server systems:
* the default EPP for AC mode isperformance.
* the default EPP for DC mode isbalance_performance.For server systems dynamic EPP is mostly a no-op.
Signed-off-by Mario Limonciello (AMD) <[email protected]>---
v5->v6:
* Set the power supply notifier callback before registration
* Expand the changelog to cover the sysfs toggle and manual EPP blocking
* Add missing kdoc--- Documentation/admin-guide/pm/amd-pstate.rst | 18 ++- drivers/cpufreq/Kconfig.x86 | 12 ++ drivers/cpufreq/amd-pstate.c | 137 ++++++++++++++++++-- drivers/cpufreq/amd-pstate.h | 10 +- 4 files changed, 163 insertions(+), 14 deletions(-)Documentation/admin-guide/pm/amd-pstate.rst +1
-1@@ -325,7 +325,7 @@ and user can change current preference according to energy or performance needs Please get all support profiles list from ``energy_performance_available_preferences`` attribute, all the profiles are integer values defined between 0 to 255 when EPP feature is enabled by platform -firmware, if EPP feature is disabled, driver will ignore the written value +firmware, but if the dynamic EPP feature is enabled, driver will block writes. This attribute is read-write. ``boost``
Documentation/admin-guide/pm/amd-pstate.rst boost or `1` to enable it, for the respective CPU using the sysfs path · line 356
Quoted 10 lines
Documentation/admin-guide/pm/amd-pstate.rst +7
-0@@ -347,6 +347,22 @@ boost or `1` to enable it, for the respective CPU using the sysfs path Other performance and frequency values can be read back from ``/sys/devices/system/cpu/cpuX/acpi_cppc/``, see :ref:`cppc_sysfs`. +Dynamic energy performance profile +================================== +The amd-pstate driver supports dynamically selecting the energy performance +profile based on whether the machine is running on AC or DC power. + +Whether this behavior is enabled by default with the kernel config option +`CONFIG_X86_AMD_PSTATE_DYNAMIC_EPP`.
This sentence doesn't read right. Should it be
"Whether this behavior is enabled by default depends on the kernel config option CONFIG_X86_AMD_PSTATE_DYNAMIC_EPP" ?
Quoted 11 lines
This behavior can also be overridden
Documentation/admin-guide/pm/amd-pstate.rst +9
-0+at runtime by the sysfs file ``/sys/devices/system/cpu/cpufreq/policyX/dynamic_epp``. + +When set to enabled, the driver will select a different energy performance +profile when the machine is running on battery or AC power. +When set to disabled, the driver will not change the energy performance profile +based on the power source and will not react to user desired power state. + +Attempting to manually write to the ``energy_performance_preference`` sysfs +file will fail when ``dynamic_epp`` is enabled.
[..snip..]
Quoted 16 lines
Documentation/admin-guide/pm/amd-pstate.rst +5
-3@@ -1715,22 +1824,20 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy) if (amd_pstate_acpi_pm_profile_server() || amd_pstate_acpi_pm_profile_undefined()) { policy->policy = CPUFREQ_POLICY_PERFORMANCE; - cpudata->epp_default = amd_pstate_get_epp(cpudata); + cpudata->epp_default_ac = cpudata->epp_default_dc = amd_pstate_get_epp(cpudata); } else { policy->policy = CPUFREQ_POLICY_POWERSAVE; - cpudata->epp_default = AMD_CPPC_EPP_BALANCE_PERFORMANCE; + cpudata->epp_default_ac = AMD_CPPC_EPP_PERFORMANCE; + cpudata->epp_default_dc = AMD_CPPC_EPP_BALANCE_PERFORMANCE; } - ret = amd_pstate_set_epp(policy, cpudata->epp_default); + if (dynamic_epp) + ret = amd_pstate_set_dynamic_epp(policy);
Documentation/admin-guide/pm/amd-pstate.rst static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy) · line 1732
Quoted 10 lines
Documentation/admin-guide/pm/amd-pstate.rst +2
-5+ else + ret = amd_pstate_set_epp(policy, amd_pstate_get_balanced_epp(policy)); if (ret) goto free_cpudata1; - ret = amd_pstate_init_floor_perf(policy); - if (ret) { - dev_err(dev, "Failed to initialize Floor Perf (%d)\n", ret); - goto free_cpudata1; - }
Was the removal of amd_pstate_init_floor_perf() intentional? It looks accidental since the call still exists in amd_pstate_cpu_init().
Before this patch, amd_pstate_epp_cpu_init() called amd_pstate_init_floor_perf() which reads MSR_AMD_CPPC_REQ2 and initializes bios_floor_perf, floor_freq, and cppc_req2_cached. With this call removed these fields stay zero (from kzalloc) on systems that support X86_FEATURE_CPPC_PERF_PRIO.
The bios_floor_perf is relied upon by amd_pstate_epp_cpu_exit(), amd_pstate_suspend(), amd_pstate_epp_resume() functions.
Barring these two issues, I am ok with this patch.
Signature · 2 lines
Thanks and Regards gautham.
PATCH v6 2/5 cpufreq/amd-pstate: add kernel command line to override dynamic epp
In reply to Mario Limonciello (AMD)Add amd_dynamic_epp=enable and amd_dynamic_epp=disable to override the kernel configuration option CONFIG_X86_AMD_PSTATE_DYNAMIC_EPP locally.
---v5->v6:
* Fix the amd_dynamic_epp kernel parameter name in amd-pstate.rst
--- Documentation/admin-guide/kernel-parameters.txt | 7 +++++++ Documentation/admin-guide/pm/amd-pstate.rst | 7 +++++++ drivers/cpufreq/amd-pstate.c | 11 +++++++++++ 3 files changed, 25 insertions(+)
Documentation/admin-guide/kernel-parameters.txt +7 -0
@@ -493,6 +493,13 @@ Kernel parameters disable Disable amd-pstate preferred core. + amd_dynamic_epp= + [X86] + disable + Disable amd-pstate dynamic EPP. + enable + Enable amd-pstate dynamic EPP. + amijoy.map= [HW,JOY] Amiga joystick support Map of devices attached to JOY0DAT and JOY1DAT Format: <a>,<b>
Documentation/admin-guide/pm/amd-pstate.rst +7 -0
@@ -474,6 +474,13 @@ For systems that support ``amd-pstate`` preferred core, the core rankings will always be advertised by the platform. But OS can choose to ignore that via the kernel parameter ``amd_prefcore=disable``. +``amd_dynamic_epp`` + +When AMD pstate is in auto mode, dynamic EPP will control whether the kernel +autonomously changes the EPP mode. The default is configured by +``CONFIG_X86_AMD_PSTATE_DYNAMIC_EPP`` but can be explicitly enabled with +``amd_dynamic_epp=enable`` or disabled with ``amd_dynamic_epp=disable``. + User Space Interface in ``sysfs`` - General ===========================================
drivers/cpufreq/amd-pstate.c +11 -0
@@ -2224,8 +2224,19 @@ static int __init amd_prefcore_param(char *str)return 0 ; } +static int __init amd_dynamic_epp_param (char *str) +{ +if (!strcmp (str,"disable" )) + dynamic_epp = false; +if (!strcmp (str,"enable" )) + dynamic_epp = true; + +return 0 ; +} +early_param ("amd_pstate" , amd_pstate_param);early_param ("amd_prefcore" , amd_prefcore_param); +early_param ("amd_dynamic_epp" , amd_dynamic_epp_param);MODULE_AUTHOR ("Huang Rui <[email protected]>" );MODULE_DESCRIPTION ("AMD Processor P-state Frequency Driver" );
Signature · 1 line
2.43.0
Re: [PATCH v6 2/5] cpufreq/amd-pstate: add kernel command line to override dynamic epp
Hello Mario,
Quoted 5 lines · Mario Limonciello (AMD)
Add
amd_dynamic_epp=enableandamd_dynamic_epp=disableto override the kernel configuration optionCONFIG_X86_AMD_PSTATE_DYNAMIC_EPPlocally.Signed-off-by Mario Limonciello (AMD) <[email protected]>
This looks good to me.
Signature · 2 lines
Thanks and Regards gautham.
Quoted 72 lines
---
v5->v6:
* Fix theamd_dynamic_eppkernel parameter name inamd-pstate.rst--- Documentation/admin-guide/kernel-parameters.txt | 7 +++++++ Documentation/admin-guide/pm/amd-pstate.rst | 7 +++++++ drivers/cpufreq/amd-pstate.c | 11 +++++++++++ 3 files changed, 25 insertions(+)Documentation/admin-guide/kernel-parameters.txt +7
-0@@ -493,6 +493,13 @@ Kernel parameters disable Disable amd-pstate preferred core. + amd_dynamic_epp= + [X86] + disable + Disable amd-pstate dynamic EPP. + enable + Enable amd-pstate dynamic EPP. + amijoy.map= [HW,JOY] Amiga joystick support Map of devices attached to JOY0DAT and JOY1DAT Format: <a>,<b>Documentation/admin-guide/pm/amd-pstate.rst +7
-0@@ -474,6 +474,13 @@ For systems that support ``amd-pstate`` preferred core, the core rankings will always be advertised by the platform. But OS can choose to ignore that via the kernel parameter ``amd_prefcore=disable``. +``amd_dynamic_epp`` + +When AMD pstate is in auto mode, dynamic EPP will control whether the kernel +autonomously changes the EPP mode. The default is configured by +``CONFIG_X86_AMD_PSTATE_DYNAMIC_EPP`` but can be explicitly enabled with +``amd_dynamic_epp=enable`` or disabled with ``amd_dynamic_epp=disable``. + User Space Interface in ``sysfs`` - General ===========================================drivers/cpufreq/amd-pstate.c +11
-0@@ -2224,8 +2224,19 @@ static int __init amd_prefcore_param(char *str)return 0 ; } +static int __init amd_dynamic_epp_param (char *str) +{ +if (!strcmp (str,"disable" )) + dynamic_epp = false; +if (!strcmp (str,"enable" )) + dynamic_epp = true; + +return 0 ; +} +early_param ("amd_pstate" , amd_pstate_param);early_param ("amd_prefcore" , amd_prefcore_param); +early_param ("amd_dynamic_epp" , amd_dynamic_epp_param);MODULE_AUTHOR ("Huang Rui <[email protected]>" );MODULE_DESCRIPTION ("AMD Processor P-state Frequency Driver" );Signature · 1 line
2.43.0
PATCH v6 3/5 cpufreq/amd-pstate: Add support for platform profile class
In reply to Mario Limonciello (AMD)The platform profile core allows multiple drivers and devices to register platform profile support.
When the legacy platform profile interface is used all drivers will adjust the platform profile as well.
Add support for registering every CPU with the platform profile handler when dynamic EPP is enabled.
The end result will be that changing the platform profile will modify EPP accordingly.
---v5->v6:
* Keep the platform profile patch focused on platform profile support
* Move the raw EPP plumbing into the follow-up raw EPP patch
* Move the test helper exports into the unit-test patch
--- Documentation/admin-guide/pm/amd-pstate.rst | 4 +- drivers/cpufreq/Kconfig.x86 | 1 + drivers/cpufreq/amd-pstate.c | 110 ++++++++++++++++++-- drivers/cpufreq/amd-pstate.h | 6 ++ 4 files changed, 114 insertions(+), 7 deletions(-)
Documentation/admin-guide/pm/amd-pstate.rst +3 -1
@@ -357,7 +357,9 @@ Whether this behavior is enabled by default with the kernel config option at runtime by the sysfs file ``/sys/devices/system/cpu/cpufreq/policyX/dynamic_epp``. When set to enabled, the driver will select a different energy performance -profile when the machine is running on battery or AC power. +profile when the machine is running on battery or AC power. The driver will +also register with the platform profile handler to receive notifications of +user desired power state and react to those. When set to disabled, the driver will not change the energy performance profile based on the power source and will not react to user desired power state.
drivers/cpufreq/Kconfig.x86 +1 -0
@@ -40,6 +40,7 @@ config X86_AMD_PSTATE select ACPI_PROCESSOR select ACPI_CPPC_LIB if X86_64 select CPU_FREQ_GOV_SCHEDUTIL if SMP + select ACPI_PLATFORM_PROFILE help This driver adds a CPUFreq driver which utilizes a fine grain processor performance frequency control range instead of legacy
drivers/cpufreq/amd-pstate.c +104 -6
166 lines not on this page · raw message
drivers/cpufreq/amd-pstate.h +6 -0
@@ -9,6 +9,7 @@#define _LINUX_AMD_PSTATE_H#include <linux/pm_qos.h> +#include <linux/platform_profile.h> /********************************************************************* * AMD P-state INTERFACE *
@@ -127,6 +128,11 @@ struct amd_cpudata {u8 epp_default_dc;bool dynamic_epp;struct notifier_block power_nb; + +/* platform profile */ +enum platform_profile_option current_profile; +struct device *ppdev; +char *profile_name; };/*
Signature · 1 line
2.43.0
Re: [PATCH v6 3/5] cpufreq/amd-pstate: Add support for platform profile class
Quoted 11 lines · Mario Limonciello (AMD)
The platform profile core allows multiple drivers and devices to register platform profile support.
When the legacy platform profile interface is used all drivers will adjust the platform profile as well.
Add support for registering every CPU with the platform profile handler when dynamic EPP is enabled.
The end result will be that changing the platform profile will modify EPP accordingly.
This looks good to me.
Signature · 2 lines
Thanks and Regards gautham.
Quoted 245 lines
Signed-off-by Mario Limonciello (AMD) <[email protected]>---
v5->v6:
* Keep the platform profile patch focused on platform profile support
* Move the raw EPP plumbing into the follow-up raw EPP patch
* Move the test helper exports into the unit-test patch--- Documentation/admin-guide/pm/amd-pstate.rst | 4 +- drivers/cpufreq/Kconfig.x86 | 1 + drivers/cpufreq/amd-pstate.c | 110 ++++++++++++++++++-- drivers/cpufreq/amd-pstate.h | 6 ++ 4 files changed, 114 insertions(+), 7 deletions(-)Documentation/admin-guide/pm/amd-pstate.rst +3
-1@@ -357,7 +357,9 @@ Whether this behavior is enabled by default with the kernel config option at runtime by the sysfs file ``/sys/devices/system/cpu/cpufreq/policyX/dynamic_epp``. When set to enabled, the driver will select a different energy performance -profile when the machine is running on battery or AC power. +profile when the machine is running on battery or AC power. The driver will +also register with the platform profile handler to receive notifications of +user desired power state and react to those. When set to disabled, the driver will not change the energy performance profile based on the power source and will not react to user desired power state.drivers/cpufreq/Kconfig.x86 +1
-0@@ -40,6 +40,7 @@ config X86_AMD_PSTATE select ACPI_PROCESSOR select ACPI_CPPC_LIB if X86_64 select CPU_FREQ_GOV_SCHEDUTIL if SMP + select ACPI_PLATFORM_PROFILE help This driver adds a CPUFreq driver which utilizes a fine grain processor performance frequency control range instead of legacydrivers/cpufreq/amd-pstate.c +104
-6@@ -1182,6 +1182,10 @@ static int amd_pstate_power_supply_notifier(struct notifier_block *nb,if (event !=PSY_EVENT_PROP_CHANGED )return NOTIFY_OK ; +/* dynamic actions are only applied while platform profile is in balanced */ +if (cpudata->current_profile !=PLATFORM_PROFILE_BALANCED ) +return 0 ; + epp =amd_pstate_get_balanced_epp (policy); ret =amd_pstate_set_epp (policy, epp);@@ -1190,12 +1194,81 @@ static int amd_pstate_power_supply_notifier(struct notifier_block *nb,return NOTIFY_OK ; } + +static int amd_pstate_profile_probe (void *drvdata,unsigned long *choices) +{ +set_bit (PLATFORM_PROFILE_LOW_POWER , choices); +set_bit (PLATFORM_PROFILE_BALANCED , choices); +set_bit (PLATFORM_PROFILE_PERFORMANCE , choices); + +return 0 ; +} + +static int amd_pstate_profile_get (struct device *dev, +enum platform_profile_option *profile) +{ +struct amd_cpudata *cpudata =dev_get_drvdata (dev); + + *profile = cpudata->current_profile; + +return 0 ; +} + +static int amd_pstate_profile_set (struct device *dev, +enum platform_profile_option profile) +{ +struct amd_cpudata *cpudata =dev_get_drvdata (dev); + struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpudata->cpu); +int ret; + +switch (profile) { +case PLATFORM_PROFILE_LOW_POWER : +if (cpudata->policy !=CPUFREQ_POLICY_POWERSAVE ) + cpudata->policy =CPUFREQ_POLICY_POWERSAVE ; + ret =amd_pstate_set_epp (policy,AMD_CPPC_EPP_POWERSAVE ); +if (ret) +return ret; +break ; +case PLATFORM_PROFILE_BALANCED : +if (cpudata->policy !=CPUFREQ_POLICY_POWERSAVE ) + cpudata->policy =CPUFREQ_POLICY_POWERSAVE ; + ret =amd_pstate_set_epp (policy, +amd_pstate_get_balanced_epp (policy)); +if (ret) +return ret; +break ; +case PLATFORM_PROFILE_PERFORMANCE : + ret =amd_pstate_set_epp (policy,AMD_CPPC_EPP_PERFORMANCE ); +if (ret) +return ret; +break ; +default : +pr_err ("Unknown Platform Profile %d\n" , profile); +return -EOPNOTSUPP ; + } + + cpudata->current_profile = profile; + +return 0 ; +} + +static const struct platform_profile_ops amd_pstate_profile_ops = { + .probe = amd_pstate_profile_probe, + .profile_set = amd_pstate_profile_set, + .profile_get = amd_pstate_profile_get, +}; +static void amd_pstate_clear_dynamic_epp (struct cpufreq_policy *policy) {struct amd_cpudata *cpudata = policy->driver_data;if (cpudata->power_nb.notifier_call)power_supply_unreg_notifier (&cpudata->power_nb); +if (cpudata->ppdev) { +platform_profile_remove (cpudata->ppdev); + cpudata->ppdev =NULL ; + } +kfree (cpudata->profile_name); cpudata->dynamic_epp = false; }@@ -1206,11 +1279,35 @@ static int amd_pstate_set_dynamic_epp(struct cpufreq_policy *policy)u8 epp; policy->policy =CPUFREQ_POLICY_PERFORMANCE ; - epp =amd_pstate_get_balanced_epp (policy); +switch (cpudata->current_profile) { +case PLATFORM_PROFILE_PERFORMANCE : + epp =AMD_CPPC_EPP_PERFORMANCE ; +break ; +case PLATFORM_PROFILE_LOW_POWER : + epp =AMD_CPPC_EPP_POWERSAVE ; +break ; +case PLATFORM_PROFILE_BALANCED : + epp =amd_pstate_get_balanced_epp (policy); +break ; +default : +pr_err ("Unknown Platform Profile %d\n" , cpudata->current_profile); +return -EOPNOTSUPP ; + } ret =amd_pstate_set_epp (policy, epp);if (ret)return ret; + cpudata->profile_name =kasprintf (GFP_KERNEL ,"amd-pstate-epp-cpu%d" , cpudata->cpu); + + cpudata->ppdev =platform_profile_register (get_cpu_device (policy->cpu), + cpudata->profile_name, + policy->driver_data, + &amd_pstate_profile_ops); +if (IS_ERR (cpudata->ppdev)) { + ret =PTR_ERR (cpudata->ppdev); + goto cleanup; + } +/* only enable notifier if things will actually change */ if (cpudata->epp_default_ac != cpudata->epp_default_dc) { cpudata->power_nb.notifier_call = amd_pstate_power_supply_notifier;@@ -1311,8 +1408,8 @@ static ssize_t show_energy_performance_available_preferences(return offset; } -static ssize_t store_energy_performance_preference ( -struct cpufreq_policy *policy,const char *buf,size_t count) +static ssize_t store_energy_performance_preference (struct cpufreq_policy *policy, +const char *buf,size_t count) {struct amd_cpudata *cpudata = policy->driver_data;ssize_t ret;@@ -1332,7 +1429,7 @@ static ssize_t store_energy_performance_preference(else epp =amd_pstate_get_balanced_epp (policy); -if (epp >0 && policy->policy ==CPUFREQ_POLICY_PERFORMANCE ) { +if (epp >0 && cpudata->policy ==CPUFREQ_POLICY_PERFORMANCE ) {pr_debug ("EPP cannot be set under performance policy\n" );return -EBUSY ; }@@ -1344,8 +1441,7 @@ static ssize_t store_energy_performance_preference(return ret ? ret : count; } -static ssize_t show_energy_performance_preference ( -struct cpufreq_policy *policy,char *buf) +static ssize_t show_energy_performance_preference (struct cpufreq_policy *policy,char *buf) {struct amd_cpudata *cpudata = policy->driver_data;u8 preference, epp;@@ -1825,10 +1921,12 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy) amd_pstate_acpi_pm_profile_undefined()) { policy->policy = CPUFREQ_POLICY_PERFORMANCE; cpudata->epp_default_ac = cpudata->epp_default_dc = amd_pstate_get_epp(cpudata); + cpudata->current_profile = PLATFORM_PROFILE_PERFORMANCE; } else { policy->policy =CPUFREQ_POLICY_POWERSAVE ; cpudata->epp_default_ac =AMD_CPPC_EPP_PERFORMANCE ; cpudata->epp_default_dc =AMD_CPPC_EPP_BALANCE_PERFORMANCE ; + cpudata->current_profile =PLATFORM_PROFILE_BALANCED ; }if (dynamic_epp)drivers/cpufreq/amd-pstate.h +6
-0@@ -9,6 +9,7 @@#define _LINUX_AMD_PSTATE_H#include <linux/pm_qos.h> +#include <linux/platform_profile.h> /********************************************************************* * AMD P-state INTERFACE * @@ -127,6 +128,11 @@ struct amd_cpudata {u8 epp_default_dc;bool dynamic_epp;struct notifier_block power_nb; + +/* platform profile */ +enum platform_profile_option current_profile; +struct device *ppdev; +char *profile_name; };/* Signature · 1 line
2.43.0
PATCH v6 4/5 cpufreq/amd-pstate: Add support for raw EPP writes
In reply to Mario Limonciello (AMD)The energy performance preference field of the CPPC request MSR supports values from 0 to 255, but the strings only offer 4 values.
The other values are useful for tuning the performance of some workloads.
Add support for writing the raw energy performance preference value to the sysfs file. If the last value written was an integer then an integer will be returned. If the last value written was a string then a string will be returned.
---v5->v6:
* Move the raw EPP parsing and readback changes into this patch
* Use the kernel bool literal false for the raw EPP tracking flag
--- Documentation/admin-guide/pm/amd-pstate.rst | 16 ++++++--- drivers/cpufreq/amd-pstate.c | 36 +++++++++++++++------ drivers/cpufreq/amd-pstate.h | 1 + 3 files changed, 38 insertions(+), 15 deletions(-)
Documentation/admin-guide/pm/amd-pstate.rst +11 -5
@@ -316,16 +316,22 @@ A list of all the supported EPP preferences that could be used for These profiles represent different hints that are provided to the low-level firmware about the user's desired energy vs efficiency tradeoff. ``default`` represents the epp value is set by platform -firmware. This attribute is read-only. +firmware. ``custom`` designates that integer values 0-255 may be written +as well. This attribute is read-only. ``energy_performance_preference`` The current energy performance preference can be read from this attribute. and user can change current preference according to energy or performance needs -Please get all support profiles list from -``energy_performance_available_preferences`` attribute, all the profiles are -integer values defined between 0 to 255 when EPP feature is enabled by platform -firmware, but if the dynamic EPP feature is enabled, driver will block writes. +Coarse named profiles are available in the attribute +``energy_performance_available_preferences``. +Users can also write individual integer values between 0 to 255. +When EPP feature is enabled by platform firmware but if the dynamic EPP feature is +enabled, driver will ignore the written value. Lower epp values shift the bias +towards improved performance while a higher epp value shifts the bias towards +power-savings. The exact impact can change from one platform to the other. +If a valid integer was last written, then a number will be returned on future reads. +If a valid string was last written then a string will be returned on future reads. This attribute is read-write. ``boost``
drivers/cpufreq/amd-pstate.c +26 -10
@@ -109,6 +109,7 @@ static struct quirk_entry *quirks;* 2 balance_performance * 3 balance_power * 4 power +* 5 custom (for raw EPP values) */ enum energy_perf_value_index {EPP_INDEX_DEFAULT =0 ,
@@ -116,6 +117,7 @@ enum energy_perf_value_index {EPP_INDEX_BALANCE_PERFORMANCE ,EPP_INDEX_BALANCE_POWERSAVE ,EPP_INDEX_POWERSAVE , +EPP_INDEX_CUSTOM , EPP_INDEX_MAX, };
@@ -125,6 +127,7 @@ static const char * const energy_perf_strings[] = { [EPP_INDEX_BALANCE_PERFORMANCE] = "balance_performance", [EPP_INDEX_BALANCE_POWERSAVE] = "balance_power", [EPP_INDEX_POWERSAVE] = "power", + [EPP_INDEX_CUSTOM ] ="custom" , };static_assert (ARRAY_SIZE (energy_perf_strings) ==EPP_INDEX_MAX );
@@ -135,7 +138,7 @@ static unsigned int epp_values[] = { [EPP_INDEX_BALANCE_POWERSAVE] = AMD_CPPC_EPP_BALANCE_POWERSAVE, [EPP_INDEX_POWERSAVE ] =AMD_CPPC_EPP_POWERSAVE , }; -static_assert (ARRAY_SIZE (epp_values) ==EPP_INDEX_MAX ); +static_assert (ARRAY_SIZE (epp_values) ==EPP_INDEX_MAX -1 );typedef int (*cppc_mode_transition_fn )(int );
@@ -1413,6 +1416,7 @@ static ssize_t store_energy_performance_preference(struct cpufreq_policy *policy {struct amd_cpudata *cpudata = policy->driver_data;ssize_t ret; +bool raw_epp = false;u8 epp;if (cpudata->dynamic_epp) {
@@ -1420,14 +1424,21 @@ static ssize_t store_energy_performance_preference(struct cpufreq_policy *policyreturn -EBUSY ; } - ret =sysfs_match_string (energy_perf_strings, buf); -if (ret <0 ) -return -EINVAL ; - -if (ret) - epp = epp_values[ret]; -else - epp =amd_pstate_get_balanced_epp (policy); +/* +* if the value matches a number, use that, otherwise see if +* matches an index in the energy_perf_strings array +*/ + ret =kstrtou8 (buf,0 , &epp); + raw_epp = !ret; +if (ret) { + ret =sysfs_match_string (energy_perf_strings, buf); +if (ret <0 || ret ==EPP_INDEX_CUSTOM ) +return -EINVAL ; +if (ret) + epp = epp_values[ret]; +else + epp =amd_pstate_get_balanced_epp (policy); + }if (epp >0 && cpudata->policy ==CPUFREQ_POLICY_PERFORMANCE ) {pr_debug ("EPP cannot be set under performance policy\n" );
@@ -1438,7 +1449,9 @@ static ssize_t store_energy_performance_preference(struct cpufreq_policy *policyif (ret)return ret; -return ret ? ret : count; + cpudata->raw_epp = raw_epp; + +return count; }static ssize_t show_energy_performance_preference (struct cpufreq_policy *policy,char *buf)
@@ -1448,6 +1461,9 @@ static ssize_t show_energy_performance_preference(struct cpufreq_policy *policy, epp =FIELD_GET (AMD_CPPC_EPP_PERF_MASK , cpudata->cppc_req_cached); +if (cpudata->raw_epp) +return sysfs_emit (buf,"%u\n" , epp); +switch (epp) {case AMD_CPPC_EPP_PERFORMANCE : preference =EPP_INDEX_PERFORMANCE ;
drivers/cpufreq/amd-pstate.h +1 -0
@@ -127,6 +127,7 @@ struct amd_cpudata {u8 epp_default_ac;u8 epp_default_dc;bool dynamic_epp; +bool raw_epp;struct notifier_block power_nb;/* platform profile */
Signature · 1 line
2.43.0
Re: [PATCH v6 4/5] cpufreq/amd-pstate: Add support for raw EPP writes
Quoted 37 lines · Mario Limonciello (AMD)
The energy performance preference field of the CPPC request MSR supports values from 0 to 255, but the strings only offer 4 values.
The other values are useful for tuning the performance of some workloads.
Add support for writing the raw energy performance preference value to the sysfs file. If the last value written was an integer then an integer will be returned. If the last value written was a string then a string will be returned.
Signed-off-by Mario Limonciello (AMD) <[email protected]>---
v5->v6:
* Move the raw EPP parsing and readback changes into this patch
* Use the kernel bool literalfalsefor the raw EPP tracking flag--- Documentation/admin-guide/pm/amd-pstate.rst | 16 ++++++--- drivers/cpufreq/amd-pstate.c | 36 +++++++++++++++------ drivers/cpufreq/amd-pstate.h | 1 + 3 files changed, 38 insertions(+), 15 deletions(-)Documentation/admin-guide/pm/amd-pstate.rst +2
-1@@ -316,16 +316,22 @@ A list of all the supported EPP preferences that could be used for These profiles represent different hints that are provided to the low-level firmware about the user's desired energy vs efficiency tradeoff. ``default`` represents the epp value is set by platform -firmware. This attribute is read-only. +firmware. ``custom`` designates that integer values 0-255 may be written +as well. This attribute is read-only. ``energy_performance_preference`` The current energy performance preference can be read from this attribute.
Documentation/admin-guide/pm/amd-pstate.rst A list of all the supported EPP preferences that could be used for · line 330
Quoted 10 lines
Documentation/admin-guide/pm/amd-pstate.rst +5
-4and user can change current preference according to energy or performance needs -Please get all support profiles list from -``energy_performance_available_preferences`` attribute, all the profiles are -integer values defined between 0 to 255 when EPP feature is enabled by platform -firmware, but if the dynamic EPP feature is enabled, driver will block writes. +Coarse named profiles are available in the attribute +``energy_performance_available_preferences``. +Users can also write individual integer values between 0 to 255. +When EPP feature is enabled by platform firmware but if the dynamic EPP feature is +enabled, driver will ignore the written value.
Driver isn't ignoring the written value. In this patchset, store_energy_performance_preference() returns an -EBUSY when the userspace writes a value to the energy_performance_preference sysfs file with dynamic EPP enabled.
if (cpudata->dynamic_epp) {
pr_debug("EPP cannot be set when dynamic EPP is enabled\n");
return -EBUSY;
}So, can the last line needs to be reworded as
"When dynamic EPP is enabled, writes to energy_performance_preference are blocked even when EPP feature is enabled by platform firmware." ?
Otherwise the patch looks good to me.
Signature · 2 lines
Thanks and Regards gautham.
Re: [PATCH v6 4/5] cpufreq/amd-pstate: Add support for raw EPP writes
Thanks! I forgot to update this documentation when I changed the behavior in an earlier version. Great find, thanks.
PATCH v6 5/5 cpufreq/amd-pstate-ut: Add a unit test for raw EPP
In reply to Mario Limonciello (AMD)Ensure that all supported raw EPP values work properly.
Export the driver helpers used by the test module so the test can drive raw EPP writes and temporarily disable dynamic EPP while it runs.
---v5->v6:
* Also verify that string EPP writes read back as strings
* Save and restore the original driver mode and dynamic EPP state
* Export the helper interfaces used by the unit test module
--- drivers/cpufreq/amd-pstate-ut.c | 109 ++++++++++++++++++++++++++++++++ drivers/cpufreq/amd-pstate.c | 11 ++-- drivers/cpufreq/amd-pstate.h | 4 ++ 3 files changed, 120 insertions(+), 4 deletions(-)
drivers/cpufreq/amd-pstate-ut.c +109 -0
@@ -28,6 +28,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/mm.h> #include <linux/fs.h> #include <linux/cleanup.h>
@@ -41,6 +42,7 @@ static char *test_list;module_param (test_list, charp,0444 );MODULE_PARM_DESC (test_list,"Comma-delimited list of tests to run (empty means run all tests)" ); +DEFINE_FREE(cleanup_page, void *, if (_T) free_page((unsigned long)_T))struct amd_pstate_ut_struct {const char *name;
@@ -54,6 +56,7 @@ static int amd_pstate_ut_acpi_cpc_valid(u32 index);static int amd_pstate_ut_check_enabled (u32 index);static int amd_pstate_ut_check_perf (u32 index);static int amd_pstate_ut_check_freq (u32 index); +static int amd_pstate_ut_epp (u32 index);static int amd_pstate_ut_check_driver (u32 index);static int amd_pstate_ut_check_freq_attrs (u32 index);
@@ -62,6 +65,7 @@ static struct amd_pstate_ut_struct amd_pstate_ut_cases[] = { {"amd_pstate_ut_check_enabled", amd_pstate_ut_check_enabled }, {"amd_pstate_ut_check_perf", amd_pstate_ut_check_perf }, {"amd_pstate_ut_check_freq", amd_pstate_ut_check_freq }, + {"amd_pstate_ut_epp", amd_pstate_ut_epp }, {"amd_pstate_ut_check_driver", amd_pstate_ut_check_driver }, {"amd_pstate_ut_check_freq_attrs", amd_pstate_ut_check_freq_attrs }, };
@@ -268,6 +272,111 @@ static int amd_pstate_set_mode(enum amd_pstate_mode mode)return amd_pstate_update_status (mode_str,strlen (mode_str)); } +static int amd_pstate_ut_epp (u32 index) +{ + struct cpufreq_policy *policy __free(put_cpufreq_policy) = NULL; + char *buf __free(cleanup_page) = NULL; +static const char *const epp_strings[] = { +"performance" , +"balance_performance" , +"balance_power" , +"power" , + }; +struct amd_cpudata *cpudata; +enum amd_pstate_mode orig_mode; +bool orig_dynamic_epp; +int ret, cpu =0 ; +int i; +u16 epp; + + policy =cpufreq_cpu_get (cpu); +if (!policy) +return -ENODEV ; + + cpudata = policy->driver_data; + orig_mode =amd_pstate_get_status (); + orig_dynamic_epp = cpudata->dynamic_epp; + +/* disable dynamic EPP before running test */ +if (cpudata->dynamic_epp) { +pr_debug ("Dynamic EPP is enabled, disabling it\n" ); +amd_pstate_clear_dynamic_epp (policy); + } + + buf = (char *)__get_free_page (GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + + ret =amd_pstate_set_mode (AMD_PSTATE_ACTIVE ); +if (ret) + goto out; + +for (epp =0 ; epp <=U8_MAX ; epp++) { +u8 val; + +/* write all EPP values */ +memset (buf,0 ,PAGE_SIZE ); +snprintf (buf,PAGE_SIZE ,"%d" , epp); + ret =store_energy_performance_preference (policy, buf,strlen (buf)); +if (ret <0 ) + goto out; + +/* check if the EPP value reads back correctly for raw numbers */ +memset (buf,0 ,PAGE_SIZE ); + ret =show_energy_performance_preference (policy, buf); +if (ret <0 ) + goto out; +strreplace (buf,'\n' ,'\0' ); + ret =kstrtou8 (buf,0 , &val); +if (!ret && epp != val) { +pr_err ("Raw EPP value mismatch: %d != %d\n" , epp, val); + ret = -EINVAL ; + goto out; + } + } + +for (i =0 ; i <ARRAY_SIZE (epp_strings); i++) { +memset (buf,0 ,PAGE_SIZE ); +snprintf (buf,PAGE_SIZE ,"%s" , epp_strings[i]); + ret =store_energy_performance_preference (policy, buf,strlen (buf)); +if (ret <0 ) + goto out; + +memset (buf,0 ,PAGE_SIZE ); + ret =show_energy_performance_preference (policy, buf); +if (ret <0 ) + goto out; +strreplace (buf,'\n' ,'\0' ); + +if (strcmp (buf, epp_strings[i])) { +pr_err ("String EPP value mismatch: %s != %s\n" , buf, epp_strings[i]); + ret = -EINVAL ; + goto out; + } + } + + ret =0 ; + +out: +if (orig_dynamic_epp) { +int ret2; + + ret2 =amd_pstate_set_mode (AMD_PSTATE_DISABLE ); +if (!ret && ret2) + ret = ret2; + } + +if (orig_mode !=amd_pstate_get_status ()) { +int ret2; + + ret2 =amd_pstate_set_mode (orig_mode); +if (!ret && ret2) + ret = ret2; + } + +return ret; +} +static int amd_pstate_ut_check_driver (u32 index) {enum amd_pstate_mode mode1, mode2 =AMD_PSTATE_DISABLE ;
drivers/cpufreq/amd-pstate.c +7 -4
@@ -1261,7 +1261,7 @@ static const struct platform_profile_ops amd_pstate_profile_ops = { .profile_get = amd_pstate_profile_get, }; -static void amd_pstate_clear_dynamic_epp (struct cpufreq_policy *policy) +void amd_pstate_clear_dynamic_epp (struct cpufreq_policy *policy) {struct amd_cpudata *cpudata = policy->driver_data;
@@ -1274,6 +1274,7 @@ static void amd_pstate_clear_dynamic_epp(struct cpufreq_policy *policy)kfree (cpudata->profile_name); cpudata->dynamic_epp = false; } +EXPORT_SYMBOL_GPL (amd_pstate_clear_dynamic_epp);static int amd_pstate_set_dynamic_epp (struct cpufreq_policy *policy) {
@@ -1411,8 +1412,8 @@ static ssize_t show_energy_performance_available_preferences(return offset; } -static ssize_t store_energy_performance_preference (struct cpufreq_policy *policy, -const char *buf,size_t count) +ssize_t store_energy_performance_preference (struct cpufreq_policy *policy, +const char *buf,size_t count) {struct amd_cpudata *cpudata = policy->driver_data;ssize_t ret;
@@ -1453,8 +1454,9 @@ static ssize_t store_energy_performance_preference(struct cpufreq_policy *policyreturn count; } +EXPORT_SYMBOL_GPL (store_energy_performance_preference); -static ssize_t show_energy_performance_preference (struct cpufreq_policy *policy,char *buf) +ssize_t show_energy_performance_preference (struct cpufreq_policy *policy,char *buf) {struct amd_cpudata *cpudata = policy->driver_data;u8 preference, epp;
@@ -1483,6 +1485,7 @@ static ssize_t show_energy_performance_preference(struct cpufreq_policy *policy,return sysfs_emit (buf,"%s\n" , energy_perf_strings[preference]); } +EXPORT_SYMBOL_GPL (show_energy_performance_preference);static ssize_t store_amd_pstate_floor_freq (struct cpufreq_policy *policy,const char *buf,size_t count)
drivers/cpufreq/amd-pstate.h +4 -0
@@ -150,6 +150,10 @@ enum amd_pstate_mode {const char *amd_pstate_get_mode_string (enum amd_pstate_mode mode);int amd_pstate_get_status (void );int amd_pstate_update_status (const char *buf,size_t size); +ssize_t store_energy_performance_preference (struct cpufreq_policy *policy, +const char *buf,size_t count); +ssize_t show_energy_performance_preference (struct cpufreq_policy *policy,char *buf); +void amd_pstate_clear_dynamic_epp (struct cpufreq_policy *policy);struct freq_attr ;
Signature · 1 line
2.43.0
Re: [PATCH v6 5/5] cpufreq/amd-pstate-ut: Add a unit test for raw EPP
Quoted 6 lines · Mario Limonciello (AMD)
Ensure that all supported raw EPP values work properly.
Export the driver helpers used by the test module so the test can drive raw EPP writes and temporarily disable dynamic EPP while it runs.
Signed-off-by Mario Limonciello (AMD) <[email protected]>
Looks good to me.
Signature · 2 lines
Thanks and Regards gautham.
Quoted 228 lines
---
v5->v6:
* Also verify that string EPP writes read back as strings
* Save and restore the original driver mode and dynamic EPP state
* Export the helper interfaces used by the unit test module--- drivers/cpufreq/amd-pstate-ut.c | 109 ++++++++++++++++++++++++++++++++ drivers/cpufreq/amd-pstate.c | 11 ++-- drivers/cpufreq/amd-pstate.h | 4 ++ 3 files changed, 120 insertions(+), 4 deletions(-)drivers/cpufreq/amd-pstate-ut.c +109
-0@@ -28,6 +28,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/mm.h> #include <linux/fs.h> #include <linux/cleanup.h> @@ -41,6 +42,7 @@ static char *test_list;module_param (test_list, charp,0444 );MODULE_PARM_DESC (test_list,"Comma-delimited list of tests to run (empty means run all tests)" ); +DEFINE_FREE(cleanup_page, void *, if (_T) free_page((unsigned long)_T))struct amd_pstate_ut_struct {const char *name;@@ -54,6 +56,7 @@ static int amd_pstate_ut_acpi_cpc_valid(u32 index);static int amd_pstate_ut_check_enabled (u32 index);static int amd_pstate_ut_check_perf (u32 index);static int amd_pstate_ut_check_freq (u32 index); +static int amd_pstate_ut_epp (u32 index);static int amd_pstate_ut_check_driver (u32 index);static int amd_pstate_ut_check_freq_attrs (u32 index);@@ -62,6 +65,7 @@ static struct amd_pstate_ut_struct amd_pstate_ut_cases[] = { {"amd_pstate_ut_check_enabled", amd_pstate_ut_check_enabled }, {"amd_pstate_ut_check_perf", amd_pstate_ut_check_perf }, {"amd_pstate_ut_check_freq", amd_pstate_ut_check_freq }, + {"amd_pstate_ut_epp", amd_pstate_ut_epp }, {"amd_pstate_ut_check_driver", amd_pstate_ut_check_driver }, {"amd_pstate_ut_check_freq_attrs", amd_pstate_ut_check_freq_attrs }, };@@ -268,6 +272,111 @@ static int amd_pstate_set_mode(enum amd_pstate_mode mode)return amd_pstate_update_status (mode_str,strlen (mode_str)); } +static int amd_pstate_ut_epp (u32 index) +{ + struct cpufreq_policy *policy __free(put_cpufreq_policy) = NULL; + char *buf __free(cleanup_page) = NULL; +static const char *const epp_strings[] = { +"performance" , +"balance_performance" , +"balance_power" , +"power" , + }; +struct amd_cpudata *cpudata; +enum amd_pstate_mode orig_mode; +bool orig_dynamic_epp; +int ret, cpu =0 ; +int i; +u16 epp; + + policy =cpufreq_cpu_get (cpu); +if (!policy) +return -ENODEV ; + + cpudata = policy->driver_data; + orig_mode =amd_pstate_get_status (); + orig_dynamic_epp = cpudata->dynamic_epp; + +/* disable dynamic EPP before running test */ +if (cpudata->dynamic_epp) { +pr_debug ("Dynamic EPP is enabled, disabling it\n" ); +amd_pstate_clear_dynamic_epp (policy); + } + + buf = (char *)__get_free_page (GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + + ret =amd_pstate_set_mode (AMD_PSTATE_ACTIVE ); +if (ret) + goto out; + +for (epp =0 ; epp <=U8_MAX ; epp++) { +u8 val; + +/* write all EPP values */ +memset (buf,0 ,PAGE_SIZE ); +snprintf (buf,PAGE_SIZE ,"%d" , epp); + ret =store_energy_performance_preference (policy, buf,strlen (buf)); +if (ret <0 ) + goto out; + +/* check if the EPP value reads back correctly for raw numbers */ +memset (buf,0 ,PAGE_SIZE ); + ret =show_energy_performance_preference (policy, buf); +if (ret <0 ) + goto out; +strreplace (buf,'\n' ,'\0' ); + ret =kstrtou8 (buf,0 , &val); +if (!ret && epp != val) { +pr_err ("Raw EPP value mismatch: %d != %d\n" , epp, val); + ret = -EINVAL ; + goto out; + } + } + +for (i =0 ; i <ARRAY_SIZE (epp_strings); i++) { +memset (buf,0 ,PAGE_SIZE ); +snprintf (buf,PAGE_SIZE ,"%s" , epp_strings[i]); + ret =store_energy_performance_preference (policy, buf,strlen (buf)); +if (ret <0 ) + goto out; + +memset (buf,0 ,PAGE_SIZE ); + ret =show_energy_performance_preference (policy, buf); +if (ret <0 ) + goto out; +strreplace (buf,'\n' ,'\0' ); + +if (strcmp (buf, epp_strings[i])) { +pr_err ("String EPP value mismatch: %s != %s\n" , buf, epp_strings[i]); + ret = -EINVAL ; + goto out; + } + } + + ret =0 ; + +out: +if (orig_dynamic_epp) { +int ret2; + + ret2 =amd_pstate_set_mode (AMD_PSTATE_DISABLE ); +if (!ret && ret2) + ret = ret2; + } + +if (orig_mode !=amd_pstate_get_status ()) { +int ret2; + + ret2 =amd_pstate_set_mode (orig_mode); +if (!ret && ret2) + ret = ret2; + } + +return ret; +} +static int amd_pstate_ut_check_driver (u32 index) {enum amd_pstate_mode mode1, mode2 =AMD_PSTATE_DISABLE ;drivers/cpufreq/amd-pstate.c +7
-4@@ -1261,7 +1261,7 @@ static const struct platform_profile_ops amd_pstate_profile_ops = { .profile_get = amd_pstate_profile_get, }; -static void amd_pstate_clear_dynamic_epp (struct cpufreq_policy *policy) +void amd_pstate_clear_dynamic_epp (struct cpufreq_policy *policy) {struct amd_cpudata *cpudata = policy->driver_data;@@ -1274,6 +1274,7 @@ static void amd_pstate_clear_dynamic_epp(struct cpufreq_policy *policy)kfree (cpudata->profile_name); cpudata->dynamic_epp = false; } +EXPORT_SYMBOL_GPL (amd_pstate_clear_dynamic_epp);static int amd_pstate_set_dynamic_epp (struct cpufreq_policy *policy) {@@ -1411,8 +1412,8 @@ static ssize_t show_energy_performance_available_preferences(return offset; } -static ssize_t store_energy_performance_preference (struct cpufreq_policy *policy, -const char *buf,size_t count) +ssize_t store_energy_performance_preference (struct cpufreq_policy *policy, +const char *buf,size_t count) {struct amd_cpudata *cpudata = policy->driver_data;ssize_t ret;@@ -1453,8 +1454,9 @@ static ssize_t store_energy_performance_preference(struct cpufreq_policy *policyreturn count; } +EXPORT_SYMBOL_GPL (store_energy_performance_preference); -static ssize_t show_energy_performance_preference (struct cpufreq_policy *policy,char *buf) +ssize_t show_energy_performance_preference (struct cpufreq_policy *policy,char *buf) {struct amd_cpudata *cpudata = policy->driver_data;u8 preference, epp;@@ -1483,6 +1485,7 @@ static ssize_t show_energy_performance_preference(struct cpufreq_policy *policy,return sysfs_emit (buf,"%s\n" , energy_perf_strings[preference]); } +EXPORT_SYMBOL_GPL (show_energy_performance_preference);static ssize_t store_amd_pstate_floor_freq (struct cpufreq_policy *policy,const char *buf,size_t count)drivers/cpufreq/amd-pstate.h +4
-0@@ -150,6 +150,10 @@ enum amd_pstate_mode {const char *amd_pstate_get_mode_string (enum amd_pstate_mode mode);int amd_pstate_get_status (void );int amd_pstate_update_status (const char *buf,size_t size); +ssize_t store_energy_performance_preference (struct cpufreq_policy *policy, +const char *buf,size_t count); +ssize_t show_energy_performance_preference (struct cpufreq_policy *policy,char *buf); +void amd_pstate_clear_dynamic_epp (struct cpufreq_policy *policy);struct freq_attr ;Signature · 1 line
2.43.0