From: Perry Yuan <perry.yuan@amd.com>
To: <rafael.j.wysocki@intel.com>, <Mario.Limonciello@amd.com>,
<ray.huang@amd.com>, <viresh.kumar@linaro.org>
Cc: <Deepak.Sharma@amd.com>, <Nathan.Fontenot@amd.com>,
<Alexander.Deucher@amd.com>, <Shimmer.Huang@amd.com>,
<Xiaojian.Du@amd.com>, <Li.Meng@amd.com>, <wyes.karny@amd.com>,
<linux-pm@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH v9 05/13] cpufreq: amd-pstate: optimize driver working mode selection in amd_pstate_param()
Date: Mon, 26 Dec 2022 00:34:34 +0800 [thread overview]
Message-ID: <20221225163442.2205660-6-perry.yuan@amd.com> (raw)
In-Reply-To: <20221225163442.2205660-1-perry.yuan@amd.com>
From: Wyes Karny <wyes.karny@amd.com>
The amd-pstate driver may support multiple working modes.
Introduce a variable to keep track of which mode is currently enabled.
Here we use cppc_state var to indicate which mode is enabled.
This change will help to simplify the the amd_pstate_param() to choose
which mode used for the following driver registration.
Signed-off-by: Perry Yuan <perry.yuan@amd.com>
Signed-off-by: Wyes Karny <wyes.karny@amd.com>
---
drivers/cpufreq/amd-pstate.c | 39 +++++++++++++++++++++++++++---------
include/linux/amd-pstate.h | 17 ++++++++++++++++
2 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index c17bd845f5fc..65c16edbbb20 100644
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -60,7 +60,18 @@
* module parameter to be able to enable it manually for debugging.
*/
static struct cpufreq_driver amd_pstate_driver;
-static int cppc_load __initdata;
+static int cppc_state = AMD_PSTATE_DISABLE;
+
+static inline int get_mode_idx_from_str(const char *str, size_t size)
+{
+ int i;
+
+ for (i=0; i < AMD_PSTATE_MAX; i++) {
+ if (!strncmp(str, amd_pstate_mode_string[i], size))
+ return i;
+ }
+ return -EINVAL;
+}
static inline int pstate_enable(bool enable)
{
@@ -626,10 +637,10 @@ static int __init amd_pstate_init(void)
/*
* by default the pstate driver is disabled to load
* enable the amd_pstate passive mode driver explicitly
- * with amd_pstate=passive in kernel command line
+ * with amd_pstate=passive or other modes in kernel command line
*/
- if (!cppc_load) {
- pr_debug("driver load is disabled, boot with amd_pstate=passive to enable this\n");
+ if (cppc_state == AMD_PSTATE_DISABLE) {
+ pr_debug("driver load is disabled, boot with specific mode to enable this\n");
return -ENODEV;
}
@@ -671,16 +682,24 @@ device_initcall(amd_pstate_init);
static int __init amd_pstate_param(char *str)
{
+ size_t size;
+ int mode_idx;
+
if (!str)
return -EINVAL;
- if (!strcmp(str, "disable")) {
- cppc_load = 0;
- pr_info("driver is explicitly disabled\n");
- } else if (!strcmp(str, "passive"))
- cppc_load = 1;
+ size = strlen(str);
+ mode_idx = get_mode_idx_from_str(str, size);
- return 0;
+ if (mode_idx >= AMD_PSTATE_DISABLE && mode_idx < AMD_PSTATE_MAX) {
+ cppc_state = mode_idx;
+ if (cppc_state == AMD_PSTATE_DISABLE)
+ pr_info("driver is explicitly disabled\n");
+
+ return 0;
+ }
+
+ return -EINVAL;
}
early_param("amd_pstate", amd_pstate_param);
diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h
index 1c4b8659f171..dae2ce0f6735 100644
--- a/include/linux/amd-pstate.h
+++ b/include/linux/amd-pstate.h
@@ -74,4 +74,21 @@ struct amd_cpudata {
bool boost_supported;
};
+/*
+ * enum amd_pstate_mode - driver working mode of amd pstate
+ */
+enum amd_pstate_mode {
+ AMD_PSTATE_DISABLE = 0,
+ AMD_PSTATE_PASSIVE,
+ AMD_PSTATE_ACTIVE,
+ AMD_PSTATE_MAX,
+};
+
+static const char * const amd_pstate_mode_string[] = {
+ [AMD_PSTATE_DISABLE] = "disable",
+ [AMD_PSTATE_PASSIVE] = "passive",
+ [AMD_PSTATE_ACTIVE] = "active",
+ NULL,
+};
+
#endif /* _LINUX_AMD_PSTATE_H */
--
2.34.1
next prev parent reply other threads:[~2022-12-25 16:35 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-25 16:34 [PATCH v9 00/13] Implement AMD Pstate EPP Driver Perry Yuan
2022-12-25 16:34 ` [PATCH v9 01/13] ACPI: CPPC: Add AMD pstate energy performance preference cppc control Perry Yuan
2023-01-05 5:31 ` Wyes Karny
2023-01-05 6:02 ` Yuan, Perry
2022-12-25 16:34 ` [PATCH v9 02/13] Documentation: amd-pstate: add EPP profiles introduction Perry Yuan
2023-01-04 0:29 ` Limonciello, Mario
2023-01-05 3:18 ` Yuan, Perry
2022-12-25 16:34 ` [PATCH v9 03/13] cpufreq: intel_pstate: use common macro definition for Energy Preference Performance(EPP) Perry Yuan
2023-01-04 0:31 ` Limonciello, Mario
2023-01-05 5:49 ` Yuan, Perry
2023-01-05 5:56 ` Mario Limonciello
2023-01-05 6:14 ` Yuan, Perry
2022-12-25 16:34 ` [PATCH v9 04/13] cpufreq: amd-pstate: fix kernel hang issue while amd-pstate unregistering Perry Yuan
2022-12-27 2:53 ` Viresh Kumar
2022-12-27 6:32 ` Yuan, Perry
2022-12-25 16:34 ` Perry Yuan [this message]
2023-01-04 0:32 ` [PATCH v9 05/13] cpufreq: amd-pstate: optimize driver working mode selection in amd_pstate_param() Limonciello, Mario
2022-12-25 16:34 ` [PATCH v9 06/13] cpufreq: amd-pstate: implement Pstate EPP support for the AMD processors Perry Yuan
2023-01-04 1:05 ` Limonciello, Mario
2023-01-05 6:20 ` Yuan, Perry
2023-01-06 5:22 ` Wyes Karny
2023-01-06 5:58 ` Yuan, Perry
2022-12-25 16:34 ` [PATCH v9 07/13] cpufreq: amd-pstate: implement amd pstate cpu online and offline callback Perry Yuan
2022-12-25 16:34 ` [PATCH v9 08/13] cpufreq: amd-pstate: implement suspend and resume callbacks Perry Yuan
2022-12-27 2:52 ` Viresh Kumar
2023-01-05 15:08 ` Yuan, Perry
2022-12-25 16:34 ` [PATCH v9 09/13] cpufreq: amd-pstate: add driver working mode switch support Perry Yuan
2023-01-04 1:06 ` Limonciello, Mario
2023-01-05 6:02 ` Wyes Karny
2023-01-05 6:57 ` Yuan, Perry
2023-01-05 7:29 ` Wyes Karny
2023-01-05 16:03 ` Wyes Karny
2023-01-06 2:52 ` Yuan, Perry
2023-01-06 3:46 ` Wyes Karny
2022-12-25 16:34 ` [PATCH v9 10/13] Documentation: amd-pstate: add amd pstate driver mode introduction Perry Yuan
2022-12-25 16:34 ` [PATCH v9 11/13] Documentation: introduce amd pstate active mode kernel command line options Perry Yuan
2022-12-25 16:34 ` [PATCH v9 12/13] cpufreq: amd-pstate: convert sprintf with sysfs_emit() Perry Yuan
2022-12-25 16:34 ` [PATCH v9 13/13] Documentation: amd-pstate: introduce new global sysfs attributes Perry Yuan
2023-01-04 0:35 ` Limonciello, Mario
2023-01-05 6:21 ` Yuan, Perry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221225163442.2205660-6-perry.yuan@amd.com \
--to=perry.yuan@amd.com \
--cc=Alexander.Deucher@amd.com \
--cc=Deepak.Sharma@amd.com \
--cc=Li.Meng@amd.com \
--cc=Mario.Limonciello@amd.com \
--cc=Nathan.Fontenot@amd.com \
--cc=Shimmer.Huang@amd.com \
--cc=Xiaojian.Du@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=ray.huang@amd.com \
--cc=viresh.kumar@linaro.org \
--cc=wyes.karny@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).