* [PATCH v3 0/3] platform/x86/amd/pmf: Introduce CnQF feature for AMD PMF
@ 2022-09-21 10:24 Shyam Sundar S K
2022-09-21 10:24 ` [PATCH v3 1/3] platform/x86/amd/pmf: Add support for CnQF Shyam Sundar S K
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Shyam Sundar S K @ 2022-09-21 10:24 UTC (permalink / raw)
To: hdegoede, markgross, mario.limonciello
Cc: platform-driver-x86, Patil.Reddy, bnocera, Shyam Sundar S K
In this series, support for following features has been added.
- "Cool n Quiet Framework (CnQF)" is an extension to the static slider,
where the system power can be boosted or throttled independent
of the selected slider position.
- On the fly, the CnQF can be turned on/off via a sysfs knob.
v3:
-----------
- use "is_visible" and ".dev_groups" for sysfs registration and
handling.
- Squash patch 3/4 and 4/4 into one.
- update ABI doc with changes as suggested by Mario.
- Fix amd_pmf_load_defaults_cnqf() error handling.
v2:
-----------
- Enable CnQF only when static slider is set to "balanced" and other
cases keep it turned off.
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Shyam Sundar S K (3):
platform/x86/amd/pmf: Add support for CnQF
platform/x86/amd/pmf: Add sysfs to toggle CnQF
Documentation/ABI/testing/sysfs-amd-pmf: Add ABI doc for AMD PMF
Documentation/ABI/testing/sysfs-amd-pmf | 12 +
MAINTAINERS | 1 +
drivers/platform/x86/amd/pmf/Makefile | 2 +-
drivers/platform/x86/amd/pmf/acpi.c | 10 +
drivers/platform/x86/amd/pmf/cnqf.c | 393 ++++++++++++++++++++++++
drivers/platform/x86/amd/pmf/core.c | 25 +-
drivers/platform/x86/amd/pmf/pmf.h | 100 ++++++
7 files changed, 541 insertions(+), 2 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-amd-pmf
create mode 100644 drivers/platform/x86/amd/pmf/cnqf.c
--
2.25.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v3 1/3] platform/x86/amd/pmf: Add support for CnQF 2022-09-21 10:24 [PATCH v3 0/3] platform/x86/amd/pmf: Introduce CnQF feature for AMD PMF Shyam Sundar S K @ 2022-09-21 10:24 ` Shyam Sundar S K 2022-09-21 14:37 ` Hans de Goede 2022-09-21 10:24 ` [PATCH v3 2/3] platform/x86/amd/pmf: Add sysfs to toggle CnQF Shyam Sundar S K 2022-09-21 10:24 ` [PATCH v3 3/3] Documentation/ABI/testing/sysfs-amd-pmf: Add ABI doc for AMD PMF Shyam Sundar S K 2 siblings, 1 reply; 9+ messages in thread From: Shyam Sundar S K @ 2022-09-21 10:24 UTC (permalink / raw) To: hdegoede, markgross, mario.limonciello Cc: platform-driver-x86, Patil.Reddy, bnocera, Shyam Sundar S K CnQF (a.k.a Cool and Quiet Framework) extends the static slider concept. PMF dynamically manages system power limits and fan policy based on system power trends which is representative of workload trend. Static slider and CnQF controls are mutually exclusive for system power budget adjustments. CnQF supports configurable number of modes which can be unique for AC and DC. Every mode is representative of a system state characterized by unique steady state and boost behavior. OEMs can configure the different modes/system states and how the transition to a mode happens. Whether to have CnQF manage system power budget dynamically in AC or DC or both is also configurable. Mode changes due to CnQF don't result in slider position change. The default OEM values are obtained after evaluating the PMF ACPI function idx 11 & 12 for AC and DC respectively. Whether to turn ON/OFF by default is guided by a "flag" passed by the OEM BIOS. Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> --- drivers/platform/x86/amd/pmf/Makefile | 2 +- drivers/platform/x86/amd/pmf/acpi.c | 10 + drivers/platform/x86/amd/pmf/cnqf.c | 331 ++++++++++++++++++++++++++ drivers/platform/x86/amd/pmf/core.c | 19 +- drivers/platform/x86/amd/pmf/pmf.h | 99 ++++++++ 5 files changed, 459 insertions(+), 2 deletions(-) create mode 100644 drivers/platform/x86/amd/pmf/cnqf.c diff --git a/drivers/platform/x86/amd/pmf/Makefile b/drivers/platform/x86/amd/pmf/Makefile index ef2b08c9174d..fdededf54392 100644 --- a/drivers/platform/x86/amd/pmf/Makefile +++ b/drivers/platform/x86/amd/pmf/Makefile @@ -6,4 +6,4 @@ obj-$(CONFIG_AMD_PMF) += amd-pmf.o amd-pmf-objs := core.o acpi.o sps.o \ - auto-mode.o + auto-mode.o cnqf.o diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c index cb46a7252414..05a2b8a056fc 100644 --- a/drivers/platform/x86/amd/pmf/acpi.c +++ b/drivers/platform/x86/amd/pmf/acpi.c @@ -233,6 +233,16 @@ static int apmf_get_system_params(struct amd_pmf_dev *dev) return 0; } +int apmf_get_dyn_slider_def_ac(struct amd_pmf_dev *pdev, struct apmf_dyn_slider_output *data) +{ + return apmf_if_call_store_buffer(pdev, APMF_FUNC_DYN_SLIDER_AC, data, sizeof(*data)); +} + +int apmf_get_dyn_slider_def_dc(struct amd_pmf_dev *pdev, struct apmf_dyn_slider_output *data) +{ + return apmf_if_call_store_buffer(pdev, APMF_FUNC_DYN_SLIDER_DC, data, sizeof(*data)); +} + void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev) { acpi_handle ahandle = ACPI_HANDLE(pmf_dev->dev); diff --git a/drivers/platform/x86/amd/pmf/cnqf.c b/drivers/platform/x86/amd/pmf/cnqf.c new file mode 100644 index 000000000000..fa994800692a --- /dev/null +++ b/drivers/platform/x86/amd/pmf/cnqf.c @@ -0,0 +1,331 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * AMD Platform Management Framework Driver + * + * Copyright (c) 2022, Advanced Micro Devices, Inc. + * All Rights Reserved. + * + * Author: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> + */ + +#include <linux/workqueue.h> +#include "pmf.h" + +static struct cnqf_config config_store; + +static int amd_pmf_set_cnqf(struct amd_pmf_dev *dev, int src, int idx, + struct cnqf_config *table) +{ + struct power_table_control *pc; + + pc = &config_store.mode_set[src][idx].power_control; + + amd_pmf_send_cmd(dev, SET_SPL, false, pc->spl, NULL); + amd_pmf_send_cmd(dev, SET_FPPT, false, pc->fppt, NULL); + amd_pmf_send_cmd(dev, SET_SPPT, false, pc->sppt, NULL); + amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false, pc->sppt_apu_only, NULL); + amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false, pc->stt_min, NULL); + amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false, pc->stt_skin_temp[STT_TEMP_APU], + NULL); + amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false, pc->stt_skin_temp[STT_TEMP_HS2], + NULL); + + if (is_apmf_func_supported(dev, APMF_FUNC_SET_FAN_IDX)) + apmf_update_fan_idx(dev, + config_store.mode_set[src][idx].fan_control.manual, + config_store.mode_set[src][idx].fan_control.fan_id); + + return 0; +} + +static void amd_pmf_update_power_threshold(void) +{ + struct cnqf_mode_settings *ts; + struct cnqf_tran_params *tp; + int i; + + for (i = 0; i < POWER_SOURCE_MAX; i++) { + tp = &config_store.trans_param[i][CNQF_TRANSITION_TO_QUIET]; + ts = &config_store.mode_set[i][CNQF_MODE_BALANCE]; + tp->power_threshold = ts->power_floor - tp->power_delta; + + tp = &config_store.trans_param[i][CNQF_TRANSITION_TO_TURBO]; + ts = &config_store.mode_set[i][CNQF_MODE_PERFORMANCE]; + tp->power_threshold = ts->power_floor - tp->power_delta; + + tp = &config_store.trans_param[i][CNQF_TRANSITION_FROM_BALANCE_TO_PERFORMANCE]; + ts = &config_store.mode_set[i][CNQF_MODE_BALANCE]; + tp->power_threshold = ts->power_floor - tp->power_delta; + + tp = &config_store.trans_param[i][CNQF_TRANSITION_FROM_PERFORMANCE_TO_BALANCE]; + ts = &config_store.mode_set[i][CNQF_MODE_PERFORMANCE]; + tp->power_threshold = ts->power_floor - tp->power_delta; + + tp = &config_store.trans_param[i][CNQF_TRANSITION_FROM_QUIET_TO_BALANCE]; + ts = &config_store.mode_set[i][CNQF_MODE_QUIET]; + tp->power_threshold = ts->power_floor - tp->power_delta; + + tp = &config_store.trans_param[i][CNQF_TRANSITION_FROM_TURBO_TO_PERFORMANCE]; + ts = &config_store.mode_set[i][CNQF_MODE_TURBO]; + tp->power_threshold = ts->power_floor - tp->power_delta; + } +} + +static const char *state_as_str(unsigned int state) +{ + switch (state) { + case CNQF_MODE_QUIET: + return "QUIET"; + case CNQF_MODE_BALANCE: + return "BALANCED"; + case CNQF_MODE_TURBO: + return "TURBO"; + case CNQF_MODE_PERFORMANCE: + return "PERFORMANCE"; + default: + return "Unknown CnQF mode"; + } +} + +int amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_lapsed_ms) +{ + struct cnqf_tran_params *tp; + int src, i, j; + u32 avg_power = 0; + + src = amd_pmf_get_power_source(); + + if (dev->current_profile == PLATFORM_PROFILE_BALANCED) { + amd_pmf_set_cnqf(dev, src, config_store.current_mode, NULL); + } else { + /* + * Return from here if the platform_profile is not balanced + * so that preference is given to user mode selection, rather + * than enforcing CnQF to run all the time (if enabled) + */ + return -EINVAL; + } + + for (i = 0; i < CNQF_TRANSITION_MAX; i++) { + config_store.trans_param[src][i].timer += time_lapsed_ms; + config_store.trans_param[src][i].total_power += socket_power; + config_store.trans_param[src][i].count++; + + tp = &config_store.trans_param[src][i]; + if (tp->timer >= tp->time_constant && tp->count) { + avg_power = tp->total_power / tp->count; + + /* Reset the indices */ + tp->timer = 0; + tp->total_power = 0; + tp->count = 0; + + if ((tp->shifting_up && avg_power >= tp->power_threshold) || + (!tp->shifting_up && avg_power <= tp->power_threshold)) { + tp->priority = true; + } else { + tp->priority = false; + } + } + } + + dev_dbg(dev->dev, "[CNQF] Avg power: %u mW socket power: %u mW mode:%s\n", + avg_power, socket_power, state_as_str(config_store.current_mode)); + + for (j = 0; j < CNQF_TRANSITION_MAX; j++) { + /* apply the highest priority */ + if (config_store.trans_param[src][j].priority) { + if (config_store.current_mode != + config_store.trans_param[src][j].target_mode) { + config_store.current_mode = + config_store.trans_param[src][j].target_mode; + dev_dbg(dev->dev, "Moving to Mode :%s\n", + state_as_str(config_store.current_mode)); + amd_pmf_set_cnqf(dev, src, + config_store.current_mode, NULL); + } + break; + } + } + return 0; +} + +static void amd_pmf_update_trans_data(int idx, struct apmf_dyn_slider_output out) +{ + struct cnqf_tran_params *tp; + + tp = &config_store.trans_param[idx][CNQF_TRANSITION_TO_QUIET]; + tp->time_constant = out.t_balanced_to_quiet; + tp->target_mode = CNQF_MODE_QUIET; + tp->shifting_up = false; + + tp = &config_store.trans_param[idx][CNQF_TRANSITION_FROM_BALANCE_TO_PERFORMANCE]; + tp->time_constant = out.t_balanced_to_perf; + tp->target_mode = CNQF_MODE_PERFORMANCE; + tp->shifting_up = true; + + tp = &config_store.trans_param[idx][CNQF_TRANSITION_FROM_QUIET_TO_BALANCE]; + tp->time_constant = out.t_quiet_to_balanced; + tp->target_mode = CNQF_MODE_BALANCE; + tp->shifting_up = true; + + tp = &config_store.trans_param[idx][CNQF_TRANSITION_FROM_PERFORMANCE_TO_BALANCE]; + tp->time_constant = out.t_perf_to_balanced; + tp->target_mode = CNQF_MODE_BALANCE; + tp->shifting_up = false; + + tp = &config_store.trans_param[idx][CNQF_TRANSITION_FROM_TURBO_TO_PERFORMANCE]; + tp->time_constant = out.t_turbo_to_perf; + tp->target_mode = CNQF_MODE_PERFORMANCE; + tp->shifting_up = false; + + tp = &config_store.trans_param[idx][CNQF_TRANSITION_TO_TURBO]; + tp->time_constant = out.t_perf_to_turbo; + tp->target_mode = CNQF_MODE_TURBO; + tp->shifting_up = true; +} + +static void amd_pmf_update_mode_set(int idx, struct apmf_dyn_slider_output out) +{ + struct cnqf_mode_settings *ms; + + /* Quiet Mode */ + ms = &config_store.mode_set[idx][CNQF_MODE_QUIET]; + ms->power_floor = out.ps[APMF_CNQF_QUIET].pfloor; + ms->power_control.fppt = out.ps[APMF_CNQF_QUIET].fppt; + ms->power_control.sppt = out.ps[APMF_CNQF_QUIET].sppt; + ms->power_control.sppt_apu_only = out.ps[APMF_CNQF_QUIET].sppt_apu_only; + ms->power_control.spl = out.ps[APMF_CNQF_QUIET].spl; + ms->power_control.stt_min = out.ps[APMF_CNQF_QUIET].stt_min_limit; + ms->power_control.stt_skin_temp[STT_TEMP_APU] = + out.ps[APMF_CNQF_QUIET].stt_skintemp[STT_TEMP_APU]; + ms->power_control.stt_skin_temp[STT_TEMP_HS2] = + out.ps[APMF_CNQF_QUIET].stt_skintemp[STT_TEMP_HS2]; + ms->fan_control.fan_id = out.ps[APMF_CNQF_QUIET].fan_id; + + /* Balance Mode */ + ms = &config_store.mode_set[idx][CNQF_MODE_BALANCE]; + ms->power_floor = out.ps[APMF_CNQF_BALANCE].pfloor; + ms->power_control.fppt = out.ps[APMF_CNQF_BALANCE].fppt; + ms->power_control.sppt = out.ps[APMF_CNQF_BALANCE].sppt; + ms->power_control.sppt_apu_only = out.ps[APMF_CNQF_BALANCE].sppt_apu_only; + ms->power_control.spl = out.ps[APMF_CNQF_BALANCE].spl; + ms->power_control.stt_min = out.ps[APMF_CNQF_BALANCE].stt_min_limit; + ms->power_control.stt_skin_temp[STT_TEMP_APU] = + out.ps[APMF_CNQF_BALANCE].stt_skintemp[STT_TEMP_APU]; + ms->power_control.stt_skin_temp[STT_TEMP_HS2] = + out.ps[APMF_CNQF_BALANCE].stt_skintemp[STT_TEMP_HS2]; + ms->fan_control.fan_id = out.ps[APMF_CNQF_BALANCE].fan_id; + + /* Performance Mode */ + ms = &config_store.mode_set[idx][CNQF_MODE_PERFORMANCE]; + ms->power_floor = out.ps[APMF_CNQF_PERFORMANCE].pfloor; + ms->power_control.fppt = out.ps[APMF_CNQF_PERFORMANCE].fppt; + ms->power_control.sppt = out.ps[APMF_CNQF_PERFORMANCE].sppt; + ms->power_control.sppt_apu_only = out.ps[APMF_CNQF_PERFORMANCE].sppt_apu_only; + ms->power_control.spl = out.ps[APMF_CNQF_PERFORMANCE].spl; + ms->power_control.stt_min = out.ps[APMF_CNQF_PERFORMANCE].stt_min_limit; + ms->power_control.stt_skin_temp[STT_TEMP_APU] = + out.ps[APMF_CNQF_PERFORMANCE].stt_skintemp[STT_TEMP_APU]; + ms->power_control.stt_skin_temp[STT_TEMP_HS2] = + out.ps[APMF_CNQF_PERFORMANCE].stt_skintemp[STT_TEMP_HS2]; + ms->fan_control.fan_id = out.ps[APMF_CNQF_PERFORMANCE].fan_id; + + /* Turbo Mode */ + ms = &config_store.mode_set[idx][CNQF_MODE_TURBO]; + ms->power_floor = out.ps[APMF_CNQF_TURBO].pfloor; + ms->power_control.fppt = out.ps[APMF_CNQF_TURBO].fppt; + ms->power_control.sppt = out.ps[APMF_CNQF_TURBO].sppt; + ms->power_control.sppt_apu_only = out.ps[APMF_CNQF_TURBO].sppt_apu_only; + ms->power_control.spl = out.ps[APMF_CNQF_TURBO].spl; + ms->power_control.stt_min = out.ps[APMF_CNQF_TURBO].stt_min_limit; + ms->power_control.stt_skin_temp[STT_TEMP_APU] = + out.ps[APMF_CNQF_TURBO].stt_skintemp[STT_TEMP_APU]; + ms->power_control.stt_skin_temp[STT_TEMP_HS2] = + out.ps[APMF_CNQF_TURBO].stt_skintemp[STT_TEMP_HS2]; + ms->fan_control.fan_id = out.ps[APMF_CNQF_TURBO].fan_id; +} + +static int amd_pmf_check_flags(struct amd_pmf_dev *dev) +{ + struct apmf_dyn_slider_output out = {}; + + if (is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_AC)) + apmf_get_dyn_slider_def_ac(dev, &out); + else if (is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_DC)) + apmf_get_dyn_slider_def_dc(dev, &out); + + return out.flags; +} + +static int amd_pmf_load_defaults_cnqf(struct amd_pmf_dev *dev) +{ + struct apmf_dyn_slider_output out; + int i, j, ret; + + for (i = 0; i < POWER_SOURCE_MAX; i++) { + if (i == POWER_SOURCE_AC && is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_AC)) { + ret = apmf_get_dyn_slider_def_ac(dev, &out); + if (ret) { + dev_err(dev->dev, + "APMF apmf_get_dyn_slider_def_ac failed :%d\n", ret); + return -EIO; + } + } else if (i == POWER_SOURCE_DC && + is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_DC)) { + ret = apmf_get_dyn_slider_def_dc(dev, &out); + if (ret) { + dev_err(dev->dev, + "APMF apmf_get_dyn_slider_def_dc failed :%d\n", ret); + return -EIO; + } + } + + amd_pmf_update_mode_set(i, out); + amd_pmf_update_trans_data(i, out); + + for (j = 0; j < CNQF_MODE_MAX; j++) { + if (config_store.mode_set[i][j].fan_control.fan_id == FAN_INDEX_AUTO) + config_store.mode_set[i][j].fan_control.manual = false; + else + config_store.mode_set[i][j].fan_control.manual = true; + } + } + amd_pmf_update_power_threshold(); + /* set to initial default values */ + config_store.current_mode = CNQF_MODE_BALANCE; + + return 0; +} + +void amd_pmf_deinit_cnqf(struct amd_pmf_dev *dev) +{ + cancel_delayed_work_sync(&dev->work_buffer); +} + +int amd_pmf_init_cnqf(struct amd_pmf_dev *dev) +{ + int ret, src; + + ret = amd_pmf_check_flags(dev); + if (!ret) { + dev_dbg(dev->dev, "CnQF bios default_enable flag not set\n"); + return ret; + } + + ret = amd_pmf_load_defaults_cnqf(dev); + if (ret < 0) + return ret; + + amd_pmf_init_metrics_table(dev); + dev->cnqf_supported = true; + + /* update the thermal for CnQF */ + if (dev->cnqf_supported && dev->current_profile == PLATFORM_PROFILE_BALANCED) { + src = amd_pmf_get_power_source(); + amd_pmf_set_cnqf(dev, src, config_store.current_mode, NULL); + dev->cnqf_enabled = true; + } + + return 0; +} diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c index a675ca969331..99be1e6d57d3 100644 --- a/drivers/platform/x86/amd/pmf/core.c +++ b/drivers/platform/x86/amd/pmf/core.c @@ -123,6 +123,11 @@ static void amd_pmf_get_metrics(struct work_struct *work) amd_pmf_trans_automode(dev, socket_power, time_elapsed_ms); } + if (dev->cnqf_enabled) { + /* Apply the CnQF transition */ + amd_pmf_trans_cnqf(dev, socket_power, time_elapsed_ms); + } + dev->start_time = ktime_to_ms(ktime_get()); schedule_delayed_work(&dev->work_buffer, msecs_to_jiffies(metrics_table_loop_ms)); mutex_unlock(&dev->update_mutex); @@ -252,6 +257,8 @@ int amd_pmf_init_metrics_table(struct amd_pmf_dev *dev) static void amd_pmf_init_features(struct amd_pmf_dev *dev) { + int ret; + /* Enable Static Slider */ if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) { amd_pmf_init_sps(dev); @@ -262,6 +269,12 @@ static void amd_pmf_init_features(struct amd_pmf_dev *dev) if (is_apmf_func_supported(dev, APMF_FUNC_AUTO_MODE)) { amd_pmf_init_auto_mode(dev); dev_dbg(dev->dev, "Auto Mode Init done\n"); + } else if (is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_AC) || + is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_DC)) { + /* Enable Cool n Quiet Framework (CnQF) */ + ret = amd_pmf_init_cnqf(dev); + if (ret) + dev_warn(dev->dev, "CnQF Init failed\n"); } } @@ -270,8 +283,12 @@ static void amd_pmf_deinit_features(struct amd_pmf_dev *dev) if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) amd_pmf_deinit_sps(dev); - if (is_apmf_func_supported(dev, APMF_FUNC_AUTO_MODE)) + if (is_apmf_func_supported(dev, APMF_FUNC_AUTO_MODE)) { amd_pmf_deinit_auto_mode(dev); + } else if (is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_AC) || + is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_DC)) { + amd_pmf_deinit_cnqf(dev); + } } static const struct acpi_device_id amd_pmf_acpi_ids[] = { diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h index 0a72a395c2ef..24dd6fbff24c 100644 --- a/drivers/platform/x86/amd/pmf/pmf.h +++ b/drivers/platform/x86/amd/pmf/pmf.h @@ -22,6 +22,8 @@ #define APMF_FUNC_AUTO_MODE 5 #define APMF_FUNC_SET_FAN_IDX 7 #define APMF_FUNC_STATIC_SLIDER_GRANULAR 9 +#define APMF_FUNC_DYN_SLIDER_AC 11 +#define APMF_FUNC_DYN_SLIDER_DC 12 /* Message Definitions */ #define SET_SPL 0x03 /* SPL: Sustained Power Limit */ @@ -165,6 +167,8 @@ struct amd_pmf_dev { int socket_power_history_idx; bool amt_enabled; struct mutex update_mutex; /* protects race between ACPI handler and metrics thread */ + bool cnqf_enabled; + bool cnqf_supported; }; struct apmf_sps_prop_granular { @@ -294,6 +298,93 @@ struct apmf_auto_mode { u32 fan_id_quiet; } __packed; +/* CnQF Layer */ +enum cnqf_trans_priority { + CNQF_TRANSITION_TO_TURBO, /* Any other mode to Turbo Mode */ + CNQF_TRANSITION_FROM_BALANCE_TO_PERFORMANCE, /* quiet/balance to Performance Mode */ + CNQF_TRANSITION_FROM_QUIET_TO_BALANCE, /* Quiet Mode to Balance Mode */ + CNQF_TRANSITION_TO_QUIET, /* Any other mode to Quiet Mode */ + CNQF_TRANSITION_FROM_PERFORMANCE_TO_BALANCE, /* Performance/Turbo to Balance Mode */ + CNQF_TRANSITION_FROM_TURBO_TO_PERFORMANCE, /* Turbo mode to Performance Mode */ + CNQF_TRANSITION_MAX, +}; + +enum cnqf_mode { + CNQF_MODE_QUIET, + CNQF_MODE_BALANCE, + CNQF_MODE_PERFORMANCE, + CNQF_MODE_TURBO, + CNQF_MODE_MAX, +}; + +enum apmf_cnqf_pos { + APMF_CNQF_TURBO, + APMF_CNQF_PERFORMANCE, + APMF_CNQF_BALANCE, + APMF_CNQF_QUIET, + APMF_CNQF_MAX, +}; + +struct cnqf_mode_settings { + struct power_table_control power_control; + struct fan_table_control fan_control; + u32 power_floor; +}; + +struct cnqf_tran_params { + u32 time_constant; /* minimum time required to switch to next mode */ + u32 power_delta; /* minimum power required to switch to next mode */ + u32 power_threshold; + u32 timer; /* elapsed time. if timer > timethreshold, it will move to next mode */ + u32 total_power; + u32 count; + bool priority; + bool shifting_up; + enum cnqf_mode target_mode; +}; + +struct cnqf_power_delta { + u32 to_turbo; + u32 balance_to_perf; + u32 quiet_to_balance; + u32 to_quiet; + u32 perf_to_balance; + u32 turbo_to_perf; +}; + +struct cnqf_config { + struct cnqf_tran_params trans_param[POWER_SOURCE_MAX][CNQF_TRANSITION_MAX]; + struct cnqf_mode_settings mode_set[POWER_SOURCE_MAX][CNQF_MODE_MAX]; + struct power_table_control defaults; + enum cnqf_mode current_mode; + struct cnqf_power_delta power_delta[POWER_SOURCE_MAX]; + u32 power_src; + u32 avg_power; +}; + +struct apmf_cnqf_power_set { + u32 pfloor; + u32 fppt; + u32 sppt; + u32 sppt_apu_only; + u32 spl; + u32 stt_min_limit; + u8 stt_skintemp[STT_TEMP_COUNT]; + u32 fan_id; +} __packed; + +struct apmf_dyn_slider_output { + u16 size; + u16 flags; + u32 t_perf_to_turbo; + u32 t_balanced_to_perf; + u32 t_quiet_to_balanced; + u32 t_balanced_to_quiet; + u32 t_perf_to_balanced; + u32 t_turbo_to_perf; + struct apmf_cnqf_power_set ps[APMF_CNQF_MAX]; +} __packed; + /* Core Layer */ int apmf_acpi_init(struct amd_pmf_dev *pmf_dev); void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev); @@ -324,4 +415,12 @@ int apmf_get_sbios_requests(struct amd_pmf_dev *pdev, struct apmf_sbios_req *req void amd_pmf_update_2_cql(struct amd_pmf_dev *dev, bool is_cql_event); int amd_pmf_reset_amt(struct amd_pmf_dev *dev); void amd_pmf_handle_amt(struct amd_pmf_dev *dev); + +/* CnQF Layer */ +int apmf_get_dyn_slider_def_ac(struct amd_pmf_dev *pdev, struct apmf_dyn_slider_output *data); +int apmf_get_dyn_slider_def_dc(struct amd_pmf_dev *pdev, struct apmf_dyn_slider_output *data); +int amd_pmf_init_cnqf(struct amd_pmf_dev *dev); +void amd_pmf_deinit_cnqf(struct amd_pmf_dev *dev); +int amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_lapsed_ms); + #endif /* PMF_H */ -- 2.25.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/3] platform/x86/amd/pmf: Add support for CnQF 2022-09-21 10:24 ` [PATCH v3 1/3] platform/x86/amd/pmf: Add support for CnQF Shyam Sundar S K @ 2022-09-21 14:37 ` Hans de Goede 0 siblings, 0 replies; 9+ messages in thread From: Hans de Goede @ 2022-09-21 14:37 UTC (permalink / raw) To: Shyam Sundar S K, markgross, mario.limonciello Cc: platform-driver-x86, Patil.Reddy, bnocera Hi, On 9/21/22 12:24, Shyam Sundar S K wrote: > CnQF (a.k.a Cool and Quiet Framework) extends the static slider concept. > PMF dynamically manages system power limits and fan policy based on system > power trends which is representative of workload trend. > > Static slider and CnQF controls are mutually exclusive for system power > budget adjustments. CnQF supports configurable number of modes which can > be unique for AC and DC. Every mode is representative of a system state > characterized by unique steady state and boost behavior. > > OEMs can configure the different modes/system states and how the > transition to a mode happens. Whether to have CnQF manage system power > budget dynamically in AC or DC or both is also configurable. Mode changes > due to CnQF don't result in slider position change. > > The default OEM values are obtained after evaluating the PMF ACPI function > idx 11 & 12 for AC and DC respectively. Whether to turn ON/OFF by default > is guided by a "flag" passed by the OEM BIOS. > > Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> > --- > drivers/platform/x86/amd/pmf/Makefile | 2 +- > drivers/platform/x86/amd/pmf/acpi.c | 10 + > drivers/platform/x86/amd/pmf/cnqf.c | 331 ++++++++++++++++++++++++++ > drivers/platform/x86/amd/pmf/core.c | 19 +- > drivers/platform/x86/amd/pmf/pmf.h | 99 ++++++++ > 5 files changed, 459 insertions(+), 2 deletions(-) > create mode 100644 drivers/platform/x86/amd/pmf/cnqf.c > > diff --git a/drivers/platform/x86/amd/pmf/Makefile b/drivers/platform/x86/amd/pmf/Makefile > index ef2b08c9174d..fdededf54392 100644 > --- a/drivers/platform/x86/amd/pmf/Makefile > +++ b/drivers/platform/x86/amd/pmf/Makefile > @@ -6,4 +6,4 @@ > > obj-$(CONFIG_AMD_PMF) += amd-pmf.o > amd-pmf-objs := core.o acpi.o sps.o \ > - auto-mode.o > + auto-mode.o cnqf.o > diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c > index cb46a7252414..05a2b8a056fc 100644 > --- a/drivers/platform/x86/amd/pmf/acpi.c > +++ b/drivers/platform/x86/amd/pmf/acpi.c > @@ -233,6 +233,16 @@ static int apmf_get_system_params(struct amd_pmf_dev *dev) > return 0; > } > > +int apmf_get_dyn_slider_def_ac(struct amd_pmf_dev *pdev, struct apmf_dyn_slider_output *data) > +{ > + return apmf_if_call_store_buffer(pdev, APMF_FUNC_DYN_SLIDER_AC, data, sizeof(*data)); > +} > + > +int apmf_get_dyn_slider_def_dc(struct amd_pmf_dev *pdev, struct apmf_dyn_slider_output *data) > +{ > + return apmf_if_call_store_buffer(pdev, APMF_FUNC_DYN_SLIDER_DC, data, sizeof(*data)); > +} > + > void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev) > { > acpi_handle ahandle = ACPI_HANDLE(pmf_dev->dev); > diff --git a/drivers/platform/x86/amd/pmf/cnqf.c b/drivers/platform/x86/amd/pmf/cnqf.c > new file mode 100644 > index 000000000000..fa994800692a > --- /dev/null > +++ b/drivers/platform/x86/amd/pmf/cnqf.c > @@ -0,0 +1,331 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * AMD Platform Management Framework Driver > + * > + * Copyright (c) 2022, Advanced Micro Devices, Inc. > + * All Rights Reserved. > + * > + * Author: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> > + */ > + > +#include <linux/workqueue.h> > +#include "pmf.h" > + > +static struct cnqf_config config_store; > + > +static int amd_pmf_set_cnqf(struct amd_pmf_dev *dev, int src, int idx, > + struct cnqf_config *table) > +{ > + struct power_table_control *pc; > + > + pc = &config_store.mode_set[src][idx].power_control; > + > + amd_pmf_send_cmd(dev, SET_SPL, false, pc->spl, NULL); > + amd_pmf_send_cmd(dev, SET_FPPT, false, pc->fppt, NULL); > + amd_pmf_send_cmd(dev, SET_SPPT, false, pc->sppt, NULL); > + amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false, pc->sppt_apu_only, NULL); > + amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false, pc->stt_min, NULL); > + amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false, pc->stt_skin_temp[STT_TEMP_APU], > + NULL); > + amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false, pc->stt_skin_temp[STT_TEMP_HS2], > + NULL); > + > + if (is_apmf_func_supported(dev, APMF_FUNC_SET_FAN_IDX)) > + apmf_update_fan_idx(dev, > + config_store.mode_set[src][idx].fan_control.manual, > + config_store.mode_set[src][idx].fan_control.fan_id); > + > + return 0; > +} > + > +static void amd_pmf_update_power_threshold(void) > +{ > + struct cnqf_mode_settings *ts; > + struct cnqf_tran_params *tp; > + int i; > + > + for (i = 0; i < POWER_SOURCE_MAX; i++) { > + tp = &config_store.trans_param[i][CNQF_TRANSITION_TO_QUIET]; > + ts = &config_store.mode_set[i][CNQF_MODE_BALANCE]; > + tp->power_threshold = ts->power_floor - tp->power_delta; > + > + tp = &config_store.trans_param[i][CNQF_TRANSITION_TO_TURBO]; > + ts = &config_store.mode_set[i][CNQF_MODE_PERFORMANCE]; > + tp->power_threshold = ts->power_floor - tp->power_delta; > + > + tp = &config_store.trans_param[i][CNQF_TRANSITION_FROM_BALANCE_TO_PERFORMANCE]; > + ts = &config_store.mode_set[i][CNQF_MODE_BALANCE]; > + tp->power_threshold = ts->power_floor - tp->power_delta; > + > + tp = &config_store.trans_param[i][CNQF_TRANSITION_FROM_PERFORMANCE_TO_BALANCE]; > + ts = &config_store.mode_set[i][CNQF_MODE_PERFORMANCE]; > + tp->power_threshold = ts->power_floor - tp->power_delta; > + > + tp = &config_store.trans_param[i][CNQF_TRANSITION_FROM_QUIET_TO_BALANCE]; > + ts = &config_store.mode_set[i][CNQF_MODE_QUIET]; > + tp->power_threshold = ts->power_floor - tp->power_delta; > + > + tp = &config_store.trans_param[i][CNQF_TRANSITION_FROM_TURBO_TO_PERFORMANCE]; > + ts = &config_store.mode_set[i][CNQF_MODE_TURBO]; > + tp->power_threshold = ts->power_floor - tp->power_delta; > + } > +} > + > +static const char *state_as_str(unsigned int state) > +{ > + switch (state) { > + case CNQF_MODE_QUIET: > + return "QUIET"; > + case CNQF_MODE_BALANCE: > + return "BALANCED"; > + case CNQF_MODE_TURBO: > + return "TURBO"; > + case CNQF_MODE_PERFORMANCE: > + return "PERFORMANCE"; > + default: > + return "Unknown CnQF mode"; > + } > +} > + > +int amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_lapsed_ms) > +{ > + struct cnqf_tran_params *tp; > + int src, i, j; > + u32 avg_power = 0; > + > + src = amd_pmf_get_power_source(); > + > + if (dev->current_profile == PLATFORM_PROFILE_BALANCED) { > + amd_pmf_set_cnqf(dev, src, config_store.current_mode, NULL); > + } else { > + /* > + * Return from here if the platform_profile is not balanced > + * so that preference is given to user mode selection, rather > + * than enforcing CnQF to run all the time (if enabled) > + */ > + return -EINVAL; > + } > + > + for (i = 0; i < CNQF_TRANSITION_MAX; i++) { > + config_store.trans_param[src][i].timer += time_lapsed_ms; > + config_store.trans_param[src][i].total_power += socket_power; > + config_store.trans_param[src][i].count++; > + > + tp = &config_store.trans_param[src][i]; > + if (tp->timer >= tp->time_constant && tp->count) { > + avg_power = tp->total_power / tp->count; > + > + /* Reset the indices */ > + tp->timer = 0; > + tp->total_power = 0; > + tp->count = 0; > + > + if ((tp->shifting_up && avg_power >= tp->power_threshold) || > + (!tp->shifting_up && avg_power <= tp->power_threshold)) { > + tp->priority = true; > + } else { > + tp->priority = false; > + } > + } > + } > + > + dev_dbg(dev->dev, "[CNQF] Avg power: %u mW socket power: %u mW mode:%s\n", > + avg_power, socket_power, state_as_str(config_store.current_mode)); > + > + for (j = 0; j < CNQF_TRANSITION_MAX; j++) { > + /* apply the highest priority */ > + if (config_store.trans_param[src][j].priority) { > + if (config_store.current_mode != > + config_store.trans_param[src][j].target_mode) { > + config_store.current_mode = > + config_store.trans_param[src][j].target_mode; > + dev_dbg(dev->dev, "Moving to Mode :%s\n", > + state_as_str(config_store.current_mode)); > + amd_pmf_set_cnqf(dev, src, > + config_store.current_mode, NULL); > + } > + break; > + } > + } > + return 0; > +} > + > +static void amd_pmf_update_trans_data(int idx, struct apmf_dyn_slider_output out) > +{ > + struct cnqf_tran_params *tp; > + > + tp = &config_store.trans_param[idx][CNQF_TRANSITION_TO_QUIET]; > + tp->time_constant = out.t_balanced_to_quiet; > + tp->target_mode = CNQF_MODE_QUIET; > + tp->shifting_up = false; > + > + tp = &config_store.trans_param[idx][CNQF_TRANSITION_FROM_BALANCE_TO_PERFORMANCE]; > + tp->time_constant = out.t_balanced_to_perf; > + tp->target_mode = CNQF_MODE_PERFORMANCE; > + tp->shifting_up = true; > + > + tp = &config_store.trans_param[idx][CNQF_TRANSITION_FROM_QUIET_TO_BALANCE]; > + tp->time_constant = out.t_quiet_to_balanced; > + tp->target_mode = CNQF_MODE_BALANCE; > + tp->shifting_up = true; > + > + tp = &config_store.trans_param[idx][CNQF_TRANSITION_FROM_PERFORMANCE_TO_BALANCE]; > + tp->time_constant = out.t_perf_to_balanced; > + tp->target_mode = CNQF_MODE_BALANCE; > + tp->shifting_up = false; > + > + tp = &config_store.trans_param[idx][CNQF_TRANSITION_FROM_TURBO_TO_PERFORMANCE]; > + tp->time_constant = out.t_turbo_to_perf; > + tp->target_mode = CNQF_MODE_PERFORMANCE; > + tp->shifting_up = false; > + > + tp = &config_store.trans_param[idx][CNQF_TRANSITION_TO_TURBO]; > + tp->time_constant = out.t_perf_to_turbo; > + tp->target_mode = CNQF_MODE_TURBO; > + tp->shifting_up = true; > +} > + > +static void amd_pmf_update_mode_set(int idx, struct apmf_dyn_slider_output out) > +{ > + struct cnqf_mode_settings *ms; > + > + /* Quiet Mode */ > + ms = &config_store.mode_set[idx][CNQF_MODE_QUIET]; > + ms->power_floor = out.ps[APMF_CNQF_QUIET].pfloor; > + ms->power_control.fppt = out.ps[APMF_CNQF_QUIET].fppt; > + ms->power_control.sppt = out.ps[APMF_CNQF_QUIET].sppt; > + ms->power_control.sppt_apu_only = out.ps[APMF_CNQF_QUIET].sppt_apu_only; > + ms->power_control.spl = out.ps[APMF_CNQF_QUIET].spl; > + ms->power_control.stt_min = out.ps[APMF_CNQF_QUIET].stt_min_limit; > + ms->power_control.stt_skin_temp[STT_TEMP_APU] = > + out.ps[APMF_CNQF_QUIET].stt_skintemp[STT_TEMP_APU]; > + ms->power_control.stt_skin_temp[STT_TEMP_HS2] = > + out.ps[APMF_CNQF_QUIET].stt_skintemp[STT_TEMP_HS2]; > + ms->fan_control.fan_id = out.ps[APMF_CNQF_QUIET].fan_id; > + > + /* Balance Mode */ > + ms = &config_store.mode_set[idx][CNQF_MODE_BALANCE]; > + ms->power_floor = out.ps[APMF_CNQF_BALANCE].pfloor; > + ms->power_control.fppt = out.ps[APMF_CNQF_BALANCE].fppt; > + ms->power_control.sppt = out.ps[APMF_CNQF_BALANCE].sppt; > + ms->power_control.sppt_apu_only = out.ps[APMF_CNQF_BALANCE].sppt_apu_only; > + ms->power_control.spl = out.ps[APMF_CNQF_BALANCE].spl; > + ms->power_control.stt_min = out.ps[APMF_CNQF_BALANCE].stt_min_limit; > + ms->power_control.stt_skin_temp[STT_TEMP_APU] = > + out.ps[APMF_CNQF_BALANCE].stt_skintemp[STT_TEMP_APU]; > + ms->power_control.stt_skin_temp[STT_TEMP_HS2] = > + out.ps[APMF_CNQF_BALANCE].stt_skintemp[STT_TEMP_HS2]; > + ms->fan_control.fan_id = out.ps[APMF_CNQF_BALANCE].fan_id; > + > + /* Performance Mode */ > + ms = &config_store.mode_set[idx][CNQF_MODE_PERFORMANCE]; > + ms->power_floor = out.ps[APMF_CNQF_PERFORMANCE].pfloor; > + ms->power_control.fppt = out.ps[APMF_CNQF_PERFORMANCE].fppt; > + ms->power_control.sppt = out.ps[APMF_CNQF_PERFORMANCE].sppt; > + ms->power_control.sppt_apu_only = out.ps[APMF_CNQF_PERFORMANCE].sppt_apu_only; > + ms->power_control.spl = out.ps[APMF_CNQF_PERFORMANCE].spl; > + ms->power_control.stt_min = out.ps[APMF_CNQF_PERFORMANCE].stt_min_limit; > + ms->power_control.stt_skin_temp[STT_TEMP_APU] = > + out.ps[APMF_CNQF_PERFORMANCE].stt_skintemp[STT_TEMP_APU]; > + ms->power_control.stt_skin_temp[STT_TEMP_HS2] = > + out.ps[APMF_CNQF_PERFORMANCE].stt_skintemp[STT_TEMP_HS2]; > + ms->fan_control.fan_id = out.ps[APMF_CNQF_PERFORMANCE].fan_id; > + > + /* Turbo Mode */ > + ms = &config_store.mode_set[idx][CNQF_MODE_TURBO]; > + ms->power_floor = out.ps[APMF_CNQF_TURBO].pfloor; > + ms->power_control.fppt = out.ps[APMF_CNQF_TURBO].fppt; > + ms->power_control.sppt = out.ps[APMF_CNQF_TURBO].sppt; > + ms->power_control.sppt_apu_only = out.ps[APMF_CNQF_TURBO].sppt_apu_only; > + ms->power_control.spl = out.ps[APMF_CNQF_TURBO].spl; > + ms->power_control.stt_min = out.ps[APMF_CNQF_TURBO].stt_min_limit; > + ms->power_control.stt_skin_temp[STT_TEMP_APU] = > + out.ps[APMF_CNQF_TURBO].stt_skintemp[STT_TEMP_APU]; > + ms->power_control.stt_skin_temp[STT_TEMP_HS2] = > + out.ps[APMF_CNQF_TURBO].stt_skintemp[STT_TEMP_HS2]; > + ms->fan_control.fan_id = out.ps[APMF_CNQF_TURBO].fan_id; > +} > + > +static int amd_pmf_check_flags(struct amd_pmf_dev *dev) > +{ > + struct apmf_dyn_slider_output out = {}; > + > + if (is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_AC)) > + apmf_get_dyn_slider_def_ac(dev, &out); > + else if (is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_DC)) > + apmf_get_dyn_slider_def_dc(dev, &out); > + > + return out.flags; > +} > + > +static int amd_pmf_load_defaults_cnqf(struct amd_pmf_dev *dev) > +{ > + struct apmf_dyn_slider_output out; > + int i, j, ret; > + > + for (i = 0; i < POWER_SOURCE_MAX; i++) { > + if (i == POWER_SOURCE_AC && is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_AC)) { > + ret = apmf_get_dyn_slider_def_ac(dev, &out); > + if (ret) { > + dev_err(dev->dev, > + "APMF apmf_get_dyn_slider_def_ac failed :%d\n", ret); > + return -EIO; > + } > + } else if (i == POWER_SOURCE_DC && > + is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_DC)) { > + ret = apmf_get_dyn_slider_def_dc(dev, &out); > + if (ret) { > + dev_err(dev->dev, > + "APMF apmf_get_dyn_slider_def_dc failed :%d\n", ret); > + return -EIO; > + } > + } > + > + amd_pmf_update_mode_set(i, out); > + amd_pmf_update_trans_data(i, out); So above you are checking is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_AC or _DC) but here you unconditionally use the local "out" variable which may not have been filled at all. As I also mention below in more detail all of cnqf.c seems to be full of the assumption that both APMF_FUNC_DYN_SLIDER_AC and APMF_FUNC_DYN_SLIDER_DC are supported. So lets just enforce that by checking that both are enabled at init/probe() time and then drop the is_apmf_func_supported() checks here. Also on errors you should propagate the error, rather then hardcoding -EIO. After dropping these checks this can be simplified to: for (i = 0; i < POWER_SOURCE_MAX; i++) { if (i == POWER_SOURCE_AC) ret = apmf_get_dyn_slider_def_ac(dev, &out); else ret = apmf_get_dyn_slider_def_dc(dev, &out); if (ret) { dev_err(dev->dev, "APMF apmf_get_dyn_slider_def_dc failed :%d\n", ret); return ret; } amd_pmf_update_mode_set(i, out); amd_pmf_update_trans_data(i, out); Note I have also fixed the error propagation here. > + for (j = 0; j < CNQF_MODE_MAX; j++) { > + if (config_store.mode_set[i][j].fan_control.fan_id == FAN_INDEX_AUTO) > + config_store.mode_set[i][j].fan_control.manual = false; > + else > + config_store.mode_set[i][j].fan_control.manual = true; > + } > + } > + amd_pmf_update_power_threshold(); > + /* set to initial default values */ > + config_store.current_mode = CNQF_MODE_BALANCE; > + > + return 0; > +} > + > +void amd_pmf_deinit_cnqf(struct amd_pmf_dev *dev) > +{ > + cancel_delayed_work_sync(&dev->work_buffer); > +} > + > +int amd_pmf_init_cnqf(struct amd_pmf_dev *dev) > +{ > + int ret, src; > + > + ret = amd_pmf_check_flags(dev); > + if (!ret) { > + dev_dbg(dev->dev, "CnQF bios default_enable flag not set\n"); > + return ret; > + } > + > + ret = amd_pmf_load_defaults_cnqf(dev); > + if (ret < 0) > + return ret; > + > + amd_pmf_init_metrics_table(dev); > + dev->cnqf_supported = true; > + > + /* update the thermal for CnQF */ > + if (dev->cnqf_supported && dev->current_profile == PLATFORM_PROFILE_BALANCED) { > + src = amd_pmf_get_power_source(); > + amd_pmf_set_cnqf(dev, src, config_store.current_mode, NULL); > + dev->cnqf_enabled = true; > + } > + > + return 0; > +} Unless I am missing something here the logic here is all wrong: 1. dev->cnqf_supported does not get set if the "CnQF bios default_enable flag not set" while it should be set if both APMF_FUNC_DYN_SLIDER_AC and APMF_FUNC_DYN_SLIDER_DC are supported independent of the CnQF bios default_enable flag. 2. amd_pmf_load_defaults_cnqf() and amd_pmf_init_metrics_table() do not get called when the CnQF bios default_enable flag is false, causing later changes to cnqf_enabled to dereference an uninitialized config_store. 3. dev->cnqf_enabled does not get set if dev->current_profile != PLATFORM_PROFILE_BALANCED causing amd_pmf_trans_cnqf() to never get called even if the CnQF bios default_enable flag is true and dev->current_profile later changes to PLATFORM_PROFILE_BALANCED. I believe that this function should look like this: int amd_pmf_init_cnqf(struct amd_pmf_dev *dev) { int ret, src; /* * Note the caller of this function has already checked that both * APMF_FUNC_DYN_SLIDER_AC and APMF_FUNC_DYN_SLIDER_DC are supported. */ ret = amd_pmf_load_defaults_cnqf(dev); if (ret < 0) return ret; amd_pmf_init_metrics_table(dev); dev->cnqf_supported = true; dev->cnqf_enabled = amd_pmf_check_flags(dev); /* update the thermal for CnQF */ if (dev->cnqf_enabled && dev->current_profile == PLATFORM_PROFILE_BALANCED) { src = amd_pmf_get_power_source(); amd_pmf_set_cnqf(dev, src, config_store.current_mode, NULL); dev->cnqf_enabled = true; } return 0; } Now on systems where APMF_FUNC_DYN_SLIDER_AC and APMF_FUNC_DYN_SLIDER_DC are both supported, we will always call amd_pmf_load_defaults_cnqf() and amd_pmf_init_metrics_table() and if those succeed we will properly set cnqf_supported independed of the CnQF bios default_enable flag. And we will always initialize cnqf_enabled to the CnQF bios default_enable flag, independent of dev->current_profile. > diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c > index a675ca969331..99be1e6d57d3 100644 > --- a/drivers/platform/x86/amd/pmf/core.c > +++ b/drivers/platform/x86/amd/pmf/core.c > @@ -123,6 +123,11 @@ static void amd_pmf_get_metrics(struct work_struct *work) > amd_pmf_trans_automode(dev, socket_power, time_elapsed_ms); > } > > + if (dev->cnqf_enabled) { > + /* Apply the CnQF transition */ > + amd_pmf_trans_cnqf(dev, socket_power, time_elapsed_ms); > + } > + > dev->start_time = ktime_to_ms(ktime_get()); > schedule_delayed_work(&dev->work_buffer, msecs_to_jiffies(metrics_table_loop_ms)); > mutex_unlock(&dev->update_mutex); > @@ -252,6 +257,8 @@ int amd_pmf_init_metrics_table(struct amd_pmf_dev *dev) > > static void amd_pmf_init_features(struct amd_pmf_dev *dev) > { > + int ret; > + > /* Enable Static Slider */ > if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) { > amd_pmf_init_sps(dev); > @@ -262,6 +269,12 @@ static void amd_pmf_init_features(struct amd_pmf_dev *dev) > if (is_apmf_func_supported(dev, APMF_FUNC_AUTO_MODE)) { > amd_pmf_init_auto_mode(dev); > dev_dbg(dev->dev, "Auto Mode Init done\n"); > + } else if (is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_AC) || > + is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_DC)) { You are doing an || here, but in e.g. amd_pmf_trans_cnqf() you are unconditionally (i) dereferencing: config_store.trans_param[src] where src can be either 0 or 1. Basically almost all of the code in the new cnqf.c file assumes that e.g. both config_store.trans_param[0] and config_store.trans_param[1] are valid and likewise also that both config_store.mode_set[0] and config_store.mode_set[1] are valid. I assume that for the firmware you are testing with both is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_AC) and is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_DC) return true. If that is the case and if that is in general expected to be the case on firmwares which support CnQF then I suggest changing the || here to && : } else if (is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_AC) && is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_DC)) { Note if I have this wrong and it is possible for e.g. only APMF_FUNC_DYN_SLIDER_AC to be supported, then you should: 1. Create an amd_pmf_cnqf_get_power_source() wrapper around amd_pmf_get_power_source() which checks the APMF_FUNC_DYN_SLIDER_AC / APMF_FUNC_DYN_SLIDER_DC flags and which then only returns POWER_SOURCE_AC / _DC if the FUNC flags indicated these are supported. 2. Replace all amd_pmf_get_power_source() calls in cnqf.c with the new amd_pmf_cnqf_get_power_source() wrapper so that unset / uninitialized parts of the config_store can never get used. i) Without checking is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_AC) / is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_DC) > + /* Enable Cool n Quiet Framework (CnQF) */ > + ret = amd_pmf_init_cnqf(dev); > + if (ret) > + dev_warn(dev->dev, "CnQF Init failed\n"); > } > } > > @@ -270,8 +283,12 @@ static void amd_pmf_deinit_features(struct amd_pmf_dev *dev) > if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) > amd_pmf_deinit_sps(dev); > > - if (is_apmf_func_supported(dev, APMF_FUNC_AUTO_MODE)) > + if (is_apmf_func_supported(dev, APMF_FUNC_AUTO_MODE)) { > amd_pmf_deinit_auto_mode(dev); > + } else if (is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_AC) || > + is_apmf_func_supported(dev, APMF_FUNC_DYN_SLIDER_DC)) { > + amd_pmf_deinit_cnqf(dev); > + } > } > > static const struct acpi_device_id amd_pmf_acpi_ids[] = { > diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h > index 0a72a395c2ef..24dd6fbff24c 100644 > --- a/drivers/platform/x86/amd/pmf/pmf.h > +++ b/drivers/platform/x86/amd/pmf/pmf.h > @@ -22,6 +22,8 @@ > #define APMF_FUNC_AUTO_MODE 5 > #define APMF_FUNC_SET_FAN_IDX 7 > #define APMF_FUNC_STATIC_SLIDER_GRANULAR 9 > +#define APMF_FUNC_DYN_SLIDER_AC 11 > +#define APMF_FUNC_DYN_SLIDER_DC 12 > > /* Message Definitions */ > #define SET_SPL 0x03 /* SPL: Sustained Power Limit */ > @@ -165,6 +167,8 @@ struct amd_pmf_dev { > int socket_power_history_idx; > bool amt_enabled; > struct mutex update_mutex; /* protects race between ACPI handler and metrics thread */ > + bool cnqf_enabled; > + bool cnqf_supported; > }; > > struct apmf_sps_prop_granular { > @@ -294,6 +298,93 @@ struct apmf_auto_mode { > u32 fan_id_quiet; > } __packed; > > +/* CnQF Layer */ > +enum cnqf_trans_priority { > + CNQF_TRANSITION_TO_TURBO, /* Any other mode to Turbo Mode */ > + CNQF_TRANSITION_FROM_BALANCE_TO_PERFORMANCE, /* quiet/balance to Performance Mode */ > + CNQF_TRANSITION_FROM_QUIET_TO_BALANCE, /* Quiet Mode to Balance Mode */ > + CNQF_TRANSITION_TO_QUIET, /* Any other mode to Quiet Mode */ > + CNQF_TRANSITION_FROM_PERFORMANCE_TO_BALANCE, /* Performance/Turbo to Balance Mode */ > + CNQF_TRANSITION_FROM_TURBO_TO_PERFORMANCE, /* Turbo mode to Performance Mode */ > + CNQF_TRANSITION_MAX, > +}; > + > +enum cnqf_mode { > + CNQF_MODE_QUIET, > + CNQF_MODE_BALANCE, > + CNQF_MODE_PERFORMANCE, > + CNQF_MODE_TURBO, > + CNQF_MODE_MAX, > +}; > + > +enum apmf_cnqf_pos { > + APMF_CNQF_TURBO, > + APMF_CNQF_PERFORMANCE, > + APMF_CNQF_BALANCE, > + APMF_CNQF_QUIET, > + APMF_CNQF_MAX, > +}; > + > +struct cnqf_mode_settings { > + struct power_table_control power_control; > + struct fan_table_control fan_control; > + u32 power_floor; > +}; > + > +struct cnqf_tran_params { > + u32 time_constant; /* minimum time required to switch to next mode */ > + u32 power_delta; /* minimum power required to switch to next mode */ > + u32 power_threshold; > + u32 timer; /* elapsed time. if timer > timethreshold, it will move to next mode */ > + u32 total_power; > + u32 count; > + bool priority; > + bool shifting_up; > + enum cnqf_mode target_mode; > +}; > + > +struct cnqf_power_delta { > + u32 to_turbo; > + u32 balance_to_perf; > + u32 quiet_to_balance; > + u32 to_quiet; > + u32 perf_to_balance; > + u32 turbo_to_perf; > +}; > + > +struct cnqf_config { > + struct cnqf_tran_params trans_param[POWER_SOURCE_MAX][CNQF_TRANSITION_MAX]; > + struct cnqf_mode_settings mode_set[POWER_SOURCE_MAX][CNQF_MODE_MAX]; > + struct power_table_control defaults; > + enum cnqf_mode current_mode; > + struct cnqf_power_delta power_delta[POWER_SOURCE_MAX]; > + u32 power_src; > + u32 avg_power; > +}; > + > +struct apmf_cnqf_power_set { > + u32 pfloor; > + u32 fppt; > + u32 sppt; > + u32 sppt_apu_only; > + u32 spl; > + u32 stt_min_limit; > + u8 stt_skintemp[STT_TEMP_COUNT]; > + u32 fan_id; > +} __packed; > + > +struct apmf_dyn_slider_output { > + u16 size; > + u16 flags; > + u32 t_perf_to_turbo; > + u32 t_balanced_to_perf; > + u32 t_quiet_to_balanced; > + u32 t_balanced_to_quiet; > + u32 t_perf_to_balanced; > + u32 t_turbo_to_perf; > + struct apmf_cnqf_power_set ps[APMF_CNQF_MAX]; > +} __packed; > + > /* Core Layer */ > int apmf_acpi_init(struct amd_pmf_dev *pmf_dev); > void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev); > @@ -324,4 +415,12 @@ int apmf_get_sbios_requests(struct amd_pmf_dev *pdev, struct apmf_sbios_req *req > void amd_pmf_update_2_cql(struct amd_pmf_dev *dev, bool is_cql_event); > int amd_pmf_reset_amt(struct amd_pmf_dev *dev); > void amd_pmf_handle_amt(struct amd_pmf_dev *dev); > + > +/* CnQF Layer */ > +int apmf_get_dyn_slider_def_ac(struct amd_pmf_dev *pdev, struct apmf_dyn_slider_output *data); > +int apmf_get_dyn_slider_def_dc(struct amd_pmf_dev *pdev, struct apmf_dyn_slider_output *data); > +int amd_pmf_init_cnqf(struct amd_pmf_dev *dev); > +void amd_pmf_deinit_cnqf(struct amd_pmf_dev *dev); > +int amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_lapsed_ms); > + > #endif /* PMF_H */ Regards, Hans ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 2/3] platform/x86/amd/pmf: Add sysfs to toggle CnQF 2022-09-21 10:24 [PATCH v3 0/3] platform/x86/amd/pmf: Introduce CnQF feature for AMD PMF Shyam Sundar S K 2022-09-21 10:24 ` [PATCH v3 1/3] platform/x86/amd/pmf: Add support for CnQF Shyam Sundar S K @ 2022-09-21 10:24 ` Shyam Sundar S K 2022-09-21 14:41 ` Hans de Goede 2022-09-21 10:24 ` [PATCH v3 3/3] Documentation/ABI/testing/sysfs-amd-pmf: Add ABI doc for AMD PMF Shyam Sundar S K 2 siblings, 1 reply; 9+ messages in thread From: Shyam Sundar S K @ 2022-09-21 10:24 UTC (permalink / raw) To: hdegoede, markgross, mario.limonciello Cc: platform-driver-x86, Patil.Reddy, bnocera, Shyam Sundar S K Whether to turn CnQF on/off by default upon driver load would be decided by a BIOS flag. Add a sysfs node to provide a way to the user whether to use static slider or CnQF . Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> --- drivers/platform/x86/amd/pmf/cnqf.c | 62 +++++++++++++++++++++++++++++ drivers/platform/x86/amd/pmf/core.c | 6 +++ drivers/platform/x86/amd/pmf/pmf.h | 1 + 3 files changed, 69 insertions(+) diff --git a/drivers/platform/x86/amd/pmf/cnqf.c b/drivers/platform/x86/amd/pmf/cnqf.c index fa994800692a..34021bb22064 100644 --- a/drivers/platform/x86/amd/pmf/cnqf.c +++ b/drivers/platform/x86/amd/pmf/cnqf.c @@ -298,6 +298,68 @@ static int amd_pmf_load_defaults_cnqf(struct amd_pmf_dev *dev) return 0; } +static ssize_t cnqf_enable_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct amd_pmf_dev *pdev = dev_get_drvdata(dev); + int mode, result, src; + bool input; + + mode = amd_pmf_get_pprof_modes(pdev); + if (mode < 0) + return mode; + + result = kstrtobool(buf, &input); + if (result) + return result; + + src = amd_pmf_get_power_source(); + pdev->cnqf_enabled = input; + + if (pdev->cnqf_enabled && pdev->current_profile == PLATFORM_PROFILE_BALANCED) { + amd_pmf_set_cnqf(pdev, src, config_store.current_mode, NULL); + } else { + if (is_apmf_func_supported(pdev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) { + amd_pmf_init_sps(pdev); + amd_pmf_update_slider(pdev, SLIDER_OP_SET, mode, NULL); + } + } + + dev_dbg(pdev->dev, "Received CnQF %s\n", input ? "on" : "off"); + return count; +} + +static ssize_t cnqf_enable_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct amd_pmf_dev *pdev = dev_get_drvdata(dev); + + return sysfs_emit(buf, "%s\n", pdev->cnqf_enabled ? "on" : "off"); +} + +static DEVICE_ATTR_RW(cnqf_enable); + +static umode_t cnqf_feature_is_visible(struct kobject *kobj, + struct attribute *attr, int n) +{ + struct device *dev = kobj_to_dev(kobj); + struct amd_pmf_dev *pdev = dev_get_drvdata(dev); + + return pdev->cnqf_supported ? attr->mode : 0; +} + +static struct attribute *cnqf_feature_attrs[] = { + &dev_attr_cnqf_enable.attr, + NULL +}; + +const struct attribute_group cnqf_feature_attribute_group = { + .is_visible = cnqf_feature_is_visible, + .attrs = cnqf_feature_attrs, +}; + void amd_pmf_deinit_cnqf(struct amd_pmf_dev *dev) { cancel_delayed_work_sync(&dev->work_buffer); diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c index 99be1e6d57d3..44fe30726b62 100644 --- a/drivers/platform/x86/amd/pmf/core.c +++ b/drivers/platform/x86/amd/pmf/core.c @@ -391,10 +391,16 @@ static int amd_pmf_remove(struct platform_device *pdev) return 0; } +static const struct attribute_group *amd_pmf_driver_groups[] = { + &cnqf_feature_attribute_group, + NULL, +}; + static struct platform_driver amd_pmf_driver = { .driver = { .name = "amd-pmf", .acpi_match_table = amd_pmf_acpi_ids, + .dev_groups = amd_pmf_driver_groups, }, .probe = amd_pmf_probe, .remove = amd_pmf_remove, diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h index 24dd6fbff24c..097f3f5d33a3 100644 --- a/drivers/platform/x86/amd/pmf/pmf.h +++ b/drivers/platform/x86/amd/pmf/pmf.h @@ -422,5 +422,6 @@ int apmf_get_dyn_slider_def_dc(struct amd_pmf_dev *pdev, struct apmf_dyn_slider_ int amd_pmf_init_cnqf(struct amd_pmf_dev *dev); void amd_pmf_deinit_cnqf(struct amd_pmf_dev *dev); int amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_lapsed_ms); +extern const struct attribute_group cnqf_feature_attribute_group; #endif /* PMF_H */ -- 2.25.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/3] platform/x86/amd/pmf: Add sysfs to toggle CnQF 2022-09-21 10:24 ` [PATCH v3 2/3] platform/x86/amd/pmf: Add sysfs to toggle CnQF Shyam Sundar S K @ 2022-09-21 14:41 ` Hans de Goede 2022-09-21 17:28 ` Shyam Sundar S K 0 siblings, 1 reply; 9+ messages in thread From: Hans de Goede @ 2022-09-21 14:41 UTC (permalink / raw) To: Shyam Sundar S K, markgross, mario.limonciello Cc: platform-driver-x86, Patil.Reddy, bnocera Hi, On 9/21/22 12:24, Shyam Sundar S K wrote: > Whether to turn CnQF on/off by default upon driver load would be decided > by a BIOS flag. Add a sysfs node to provide a way to the user whether to > use static slider or CnQF . > > Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> > --- > drivers/platform/x86/amd/pmf/cnqf.c | 62 +++++++++++++++++++++++++++++ > drivers/platform/x86/amd/pmf/core.c | 6 +++ > drivers/platform/x86/amd/pmf/pmf.h | 1 + > 3 files changed, 69 insertions(+) > > diff --git a/drivers/platform/x86/amd/pmf/cnqf.c b/drivers/platform/x86/amd/pmf/cnqf.c > index fa994800692a..34021bb22064 100644 > --- a/drivers/platform/x86/amd/pmf/cnqf.c > +++ b/drivers/platform/x86/amd/pmf/cnqf.c > @@ -298,6 +298,68 @@ static int amd_pmf_load_defaults_cnqf(struct amd_pmf_dev *dev) > return 0; > } > > +static ssize_t cnqf_enable_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t count) > +{ > + struct amd_pmf_dev *pdev = dev_get_drvdata(dev); > + int mode, result, src; > + bool input; > + > + mode = amd_pmf_get_pprof_modes(pdev); > + if (mode < 0) > + return mode; > + > + result = kstrtobool(buf, &input); > + if (result) > + return result; > + > + src = amd_pmf_get_power_source(); > + pdev->cnqf_enabled = input; > + > + if (pdev->cnqf_enabled && pdev->current_profile == PLATFORM_PROFILE_BALANCED) { > + amd_pmf_set_cnqf(pdev, src, config_store.current_mode, NULL); > + } else { > + if (is_apmf_func_supported(pdev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) { > + amd_pmf_init_sps(pdev); This amd_pmf_init_sps() calls is not necessary, this is already done at probe time when is_apmf_func_supported(pdev, APMF_FUNC_STATIC_SLIDER_GRANULAR) returns true. Please drop this. > + amd_pmf_update_slider(pdev, SLIDER_OP_SET, mode, NULL); > + } > + } > + > + dev_dbg(pdev->dev, "Received CnQF %s\n", input ? "on" : "off"); > + return count; > +} > + > +static ssize_t cnqf_enable_show(struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct amd_pmf_dev *pdev = dev_get_drvdata(dev); > + > + return sysfs_emit(buf, "%s\n", pdev->cnqf_enabled ? "on" : "off"); > +} > + > +static DEVICE_ATTR_RW(cnqf_enable); > + > +static umode_t cnqf_feature_is_visible(struct kobject *kobj, > + struct attribute *attr, int n) > +{ > + struct device *dev = kobj_to_dev(kobj); > + struct amd_pmf_dev *pdev = dev_get_drvdata(dev); > + > + return pdev->cnqf_supported ? attr->mode : 0; > +} > + > +static struct attribute *cnqf_feature_attrs[] = { > + &dev_attr_cnqf_enable.attr, > + NULL > +}; > + > +const struct attribute_group cnqf_feature_attribute_group = { > + .is_visible = cnqf_feature_is_visible, > + .attrs = cnqf_feature_attrs, > +}; > + > void amd_pmf_deinit_cnqf(struct amd_pmf_dev *dev) > { > cancel_delayed_work_sync(&dev->work_buffer); > diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c > index 99be1e6d57d3..44fe30726b62 100644 > --- a/drivers/platform/x86/amd/pmf/core.c > +++ b/drivers/platform/x86/amd/pmf/core.c > @@ -391,10 +391,16 @@ static int amd_pmf_remove(struct platform_device *pdev) > return 0; > } > > +static const struct attribute_group *amd_pmf_driver_groups[] = { > + &cnqf_feature_attribute_group, > + NULL, > +}; > + > static struct platform_driver amd_pmf_driver = { > .driver = { > .name = "amd-pmf", > .acpi_match_table = amd_pmf_acpi_ids, > + .dev_groups = amd_pmf_driver_groups, > }, > .probe = amd_pmf_probe, > .remove = amd_pmf_remove, > diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h > index 24dd6fbff24c..097f3f5d33a3 100644 > --- a/drivers/platform/x86/amd/pmf/pmf.h > +++ b/drivers/platform/x86/amd/pmf/pmf.h > @@ -422,5 +422,6 @@ int apmf_get_dyn_slider_def_dc(struct amd_pmf_dev *pdev, struct apmf_dyn_slider_ > int amd_pmf_init_cnqf(struct amd_pmf_dev *dev); > void amd_pmf_deinit_cnqf(struct amd_pmf_dev *dev); > int amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_lapsed_ms); > +extern const struct attribute_group cnqf_feature_attribute_group; > > #endif /* PMF_H */ Other then the remark about dropping the amd_pmf_init_sps() call this looks good to me, with that fixed this is: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/3] platform/x86/amd/pmf: Add sysfs to toggle CnQF 2022-09-21 14:41 ` Hans de Goede @ 2022-09-21 17:28 ` Shyam Sundar S K 0 siblings, 0 replies; 9+ messages in thread From: Shyam Sundar S K @ 2022-09-21 17:28 UTC (permalink / raw) To: Hans de Goede, markgross, mario.limonciello Cc: platform-driver-x86, Patil.Reddy, bnocera On 9/21/2022 8:11 PM, Hans de Goede wrote: > Hi, > > On 9/21/22 12:24, Shyam Sundar S K wrote: >> Whether to turn CnQF on/off by default upon driver load would be decided >> by a BIOS flag. Add a sysfs node to provide a way to the user whether to >> use static slider or CnQF . >> >> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> >> --- >> drivers/platform/x86/amd/pmf/cnqf.c | 62 +++++++++++++++++++++++++++++ >> drivers/platform/x86/amd/pmf/core.c | 6 +++ >> drivers/platform/x86/amd/pmf/pmf.h | 1 + >> 3 files changed, 69 insertions(+) >> >> diff --git a/drivers/platform/x86/amd/pmf/cnqf.c b/drivers/platform/x86/amd/pmf/cnqf.c >> index fa994800692a..34021bb22064 100644 >> --- a/drivers/platform/x86/amd/pmf/cnqf.c >> +++ b/drivers/platform/x86/amd/pmf/cnqf.c >> @@ -298,6 +298,68 @@ static int amd_pmf_load_defaults_cnqf(struct amd_pmf_dev *dev) >> return 0; >> } >> >> +static ssize_t cnqf_enable_store(struct device *dev, >> + struct device_attribute *attr, >> + const char *buf, size_t count) >> +{ >> + struct amd_pmf_dev *pdev = dev_get_drvdata(dev); >> + int mode, result, src; >> + bool input; >> + >> + mode = amd_pmf_get_pprof_modes(pdev); >> + if (mode < 0) >> + return mode; >> + >> + result = kstrtobool(buf, &input); >> + if (result) >> + return result; >> + >> + src = amd_pmf_get_power_source(); >> + pdev->cnqf_enabled = input; >> + >> + if (pdev->cnqf_enabled && pdev->current_profile == PLATFORM_PROFILE_BALANCED) { >> + amd_pmf_set_cnqf(pdev, src, config_store.current_mode, NULL); >> + } else { >> + if (is_apmf_func_supported(pdev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) { >> + amd_pmf_init_sps(pdev); > > This amd_pmf_init_sps() calls is not necessary, this is already done at probe time > when is_apmf_func_supported(pdev, APMF_FUNC_STATIC_SLIDER_GRANULAR) returns true. > > Please drop this. > >> + amd_pmf_update_slider(pdev, SLIDER_OP_SET, mode, NULL); >> + } >> + } >> + >> + dev_dbg(pdev->dev, "Received CnQF %s\n", input ? "on" : "off"); >> + return count; >> +} >> + >> +static ssize_t cnqf_enable_show(struct device *dev, >> + struct device_attribute *attr, >> + char *buf) >> +{ >> + struct amd_pmf_dev *pdev = dev_get_drvdata(dev); >> + >> + return sysfs_emit(buf, "%s\n", pdev->cnqf_enabled ? "on" : "off"); >> +} >> + >> +static DEVICE_ATTR_RW(cnqf_enable); >> + >> +static umode_t cnqf_feature_is_visible(struct kobject *kobj, >> + struct attribute *attr, int n) >> +{ >> + struct device *dev = kobj_to_dev(kobj); >> + struct amd_pmf_dev *pdev = dev_get_drvdata(dev); >> + >> + return pdev->cnqf_supported ? attr->mode : 0; >> +} >> + >> +static struct attribute *cnqf_feature_attrs[] = { >> + &dev_attr_cnqf_enable.attr, >> + NULL >> +}; >> + >> +const struct attribute_group cnqf_feature_attribute_group = { >> + .is_visible = cnqf_feature_is_visible, >> + .attrs = cnqf_feature_attrs, >> +}; >> + >> void amd_pmf_deinit_cnqf(struct amd_pmf_dev *dev) >> { >> cancel_delayed_work_sync(&dev->work_buffer); >> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c >> index 99be1e6d57d3..44fe30726b62 100644 >> --- a/drivers/platform/x86/amd/pmf/core.c >> +++ b/drivers/platform/x86/amd/pmf/core.c >> @@ -391,10 +391,16 @@ static int amd_pmf_remove(struct platform_device *pdev) >> return 0; >> } >> >> +static const struct attribute_group *amd_pmf_driver_groups[] = { >> + &cnqf_feature_attribute_group, >> + NULL, >> +}; >> + >> static struct platform_driver amd_pmf_driver = { >> .driver = { >> .name = "amd-pmf", >> .acpi_match_table = amd_pmf_acpi_ids, >> + .dev_groups = amd_pmf_driver_groups, >> }, >> .probe = amd_pmf_probe, >> .remove = amd_pmf_remove, >> diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h >> index 24dd6fbff24c..097f3f5d33a3 100644 >> --- a/drivers/platform/x86/amd/pmf/pmf.h >> +++ b/drivers/platform/x86/amd/pmf/pmf.h >> @@ -422,5 +422,6 @@ int apmf_get_dyn_slider_def_dc(struct amd_pmf_dev *pdev, struct apmf_dyn_slider_ >> int amd_pmf_init_cnqf(struct amd_pmf_dev *dev); >> void amd_pmf_deinit_cnqf(struct amd_pmf_dev *dev); >> int amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_lapsed_ms); >> +extern const struct attribute_group cnqf_feature_attribute_group; >> >> #endif /* PMF_H */ > > Other then the remark about dropping the amd_pmf_init_sps() call this > looks good to me, with that fixed this is: Agreed. Will drop the call and fix that in v4. Thanks, Shyam > > Reviewed-by: Hans de Goede <hdegoede@redhat.com> > > Regards, > > Hans > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 3/3] Documentation/ABI/testing/sysfs-amd-pmf: Add ABI doc for AMD PMF 2022-09-21 10:24 [PATCH v3 0/3] platform/x86/amd/pmf: Introduce CnQF feature for AMD PMF Shyam Sundar S K 2022-09-21 10:24 ` [PATCH v3 1/3] platform/x86/amd/pmf: Add support for CnQF Shyam Sundar S K 2022-09-21 10:24 ` [PATCH v3 2/3] platform/x86/amd/pmf: Add sysfs to toggle CnQF Shyam Sundar S K @ 2022-09-21 10:24 ` Shyam Sundar S K 2022-09-21 14:42 ` Hans de Goede 2 siblings, 1 reply; 9+ messages in thread From: Shyam Sundar S K @ 2022-09-21 10:24 UTC (permalink / raw) To: hdegoede, markgross, mario.limonciello Cc: platform-driver-x86, Patil.Reddy, bnocera, Shyam Sundar S K AMD PMF driver provides the flexibility to turn "on" or "off" CnQF feature (introduced in the earlier patch). Add corresponding ABI documentation for the new sysfs node and also update MAINTAINERS file with this new information Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> --- Documentation/ABI/testing/sysfs-amd-pmf | 12 ++++++++++++ MAINTAINERS | 1 + 2 files changed, 13 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-amd-pmf diff --git a/Documentation/ABI/testing/sysfs-amd-pmf b/Documentation/ABI/testing/sysfs-amd-pmf new file mode 100644 index 000000000000..fec2be7178e2 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-amd-pmf @@ -0,0 +1,12 @@ +What: /sys/devices/platform/*/cnqf_enable +Date: September 2022 +Contact: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> +Description: Reading this file tells if the AMD Platform Management(PMF) + Cool n Quiet Framework(CnQF) feature is enabled or not. + + This feature is not enabled by default and gets only turned on + if OEM BIOS passes a "flag" to PMF ACPI function (index 11 or 12) + or in case the user writes "on". + + To turn off CnQF user can write "off" to the sysfs node. + Note: Systems that support auto mode will not have this sysfs file available diff --git a/MAINTAINERS b/MAINTAINERS index d74bf90f5056..255527be7e24 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1026,6 +1026,7 @@ AMD PMF DRIVER M: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> L: platform-driver-x86@vger.kernel.org S: Maintained +F: Documentation/ABI/testing/sysfs-amd-pmf F: drivers/platform/x86/amd/pmf/ AMD HSMP DRIVER -- 2.25.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 3/3] Documentation/ABI/testing/sysfs-amd-pmf: Add ABI doc for AMD PMF 2022-09-21 10:24 ` [PATCH v3 3/3] Documentation/ABI/testing/sysfs-amd-pmf: Add ABI doc for AMD PMF Shyam Sundar S K @ 2022-09-21 14:42 ` Hans de Goede 2022-09-21 17:27 ` Shyam Sundar S K 0 siblings, 1 reply; 9+ messages in thread From: Hans de Goede @ 2022-09-21 14:42 UTC (permalink / raw) To: Shyam Sundar S K, markgross, mario.limonciello Cc: platform-driver-x86, Patil.Reddy, bnocera Hi, On 9/21/22 12:24, Shyam Sundar S K wrote: > AMD PMF driver provides the flexibility to turn "on" or "off" > CnQF feature (introduced in the earlier patch). > > Add corresponding ABI documentation for the new sysfs node and > also update MAINTAINERS file with this new information > > Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> > --- > Documentation/ABI/testing/sysfs-amd-pmf | 12 ++++++++++++ > MAINTAINERS | 1 + > 2 files changed, 13 insertions(+) > create mode 100644 Documentation/ABI/testing/sysfs-amd-pmf > > diff --git a/Documentation/ABI/testing/sysfs-amd-pmf b/Documentation/ABI/testing/sysfs-amd-pmf > new file mode 100644 > index 000000000000..fec2be7178e2 > --- /dev/null > +++ b/Documentation/ABI/testing/sysfs-amd-pmf > @@ -0,0 +1,12 @@ > +What: /sys/devices/platform/*/cnqf_enable > +Date: September 2022 > +Contact: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> > +Description: Reading this file tells if the AMD Platform Management(PMF) > + Cool n Quiet Framework(CnQF) feature is enabled or not. > + > + This feature is not enabled by default and gets only turned on > + if OEM BIOS passes a "flag" to PMF ACPI function (index 11 or 12) > + or in case the user writes "on". > + > + To turn off CnQF user can write "off" to the sysfs node. > + Note: Systems that support auto mode will not have this sysfs file available I guess this "available" with a bunch of whitespace in front of it was intended to be on the next line? With this fixed: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > diff --git a/MAINTAINERS b/MAINTAINERS > index d74bf90f5056..255527be7e24 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1026,6 +1026,7 @@ AMD PMF DRIVER > M: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> > L: platform-driver-x86@vger.kernel.org > S: Maintained > +F: Documentation/ABI/testing/sysfs-amd-pmf > F: drivers/platform/x86/amd/pmf/ > > AMD HSMP DRIVER ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 3/3] Documentation/ABI/testing/sysfs-amd-pmf: Add ABI doc for AMD PMF 2022-09-21 14:42 ` Hans de Goede @ 2022-09-21 17:27 ` Shyam Sundar S K 0 siblings, 0 replies; 9+ messages in thread From: Shyam Sundar S K @ 2022-09-21 17:27 UTC (permalink / raw) To: Hans de Goede, markgross, mario.limonciello Cc: platform-driver-x86, Patil.Reddy, bnocera Hi Hans, On 9/21/2022 8:12 PM, Hans de Goede wrote: > Hi, > > On 9/21/22 12:24, Shyam Sundar S K wrote: >> AMD PMF driver provides the flexibility to turn "on" or "off" >> CnQF feature (introduced in the earlier patch). >> >> Add corresponding ABI documentation for the new sysfs node and >> also update MAINTAINERS file with this new information >> >> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> >> --- >> Documentation/ABI/testing/sysfs-amd-pmf | 12 ++++++++++++ >> MAINTAINERS | 1 + >> 2 files changed, 13 insertions(+) >> create mode 100644 Documentation/ABI/testing/sysfs-amd-pmf >> >> diff --git a/Documentation/ABI/testing/sysfs-amd-pmf b/Documentation/ABI/testing/sysfs-amd-pmf >> new file mode 100644 >> index 000000000000..fec2be7178e2 >> --- /dev/null >> +++ b/Documentation/ABI/testing/sysfs-amd-pmf >> @@ -0,0 +1,12 @@ >> +What: /sys/devices/platform/*/cnqf_enable >> +Date: September 2022 >> +Contact: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> >> +Description: Reading this file tells if the AMD Platform Management(PMF) >> + Cool n Quiet Framework(CnQF) feature is enabled or not. >> + >> + This feature is not enabled by default and gets only turned on >> + if OEM BIOS passes a "flag" to PMF ACPI function (index 11 or 12) >> + or in case the user writes "on". >> + >> + To turn off CnQF user can write "off" to the sysfs node. >> + Note: Systems that support auto mode will not have this sysfs file available > > I guess this "available" with a bunch of whitespace in front of it was > intended to be on the next line? > Ah, I missed to notice this. Will fix this in v4. Thanks, Shyam > With this fixed: > > Reviewed-by: Hans de Goede <hdegoede@redhat.com> > > Regards, > > Hans > >> diff --git a/MAINTAINERS b/MAINTAINERS >> index d74bf90f5056..255527be7e24 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -1026,6 +1026,7 @@ AMD PMF DRIVER >> M: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> >> L: platform-driver-x86@vger.kernel.org >> S: Maintained >> +F: Documentation/ABI/testing/sysfs-amd-pmf >> F: drivers/platform/x86/amd/pmf/ >> >> AMD HSMP DRIVER > ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-09-21 17:28 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-09-21 10:24 [PATCH v3 0/3] platform/x86/amd/pmf: Introduce CnQF feature for AMD PMF Shyam Sundar S K 2022-09-21 10:24 ` [PATCH v3 1/3] platform/x86/amd/pmf: Add support for CnQF Shyam Sundar S K 2022-09-21 14:37 ` Hans de Goede 2022-09-21 10:24 ` [PATCH v3 2/3] platform/x86/amd/pmf: Add sysfs to toggle CnQF Shyam Sundar S K 2022-09-21 14:41 ` Hans de Goede 2022-09-21 17:28 ` Shyam Sundar S K 2022-09-21 10:24 ` [PATCH v3 3/3] Documentation/ABI/testing/sysfs-amd-pmf: Add ABI doc for AMD PMF Shyam Sundar S K 2022-09-21 14:42 ` Hans de Goede 2022-09-21 17:27 ` Shyam Sundar S K
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).