The transition to auto-mode happens when the PMF driver receives AMT (Auto Mode transition) event. transition logic will reside in the PMF driver but the events would come from other supported drivers[1]. The thermal parameters would vary between when a performance "on-lap" mode is detected and versus when not. The CQL event would get triggered from other drivers, so that PMF driver would adjust the system thermal config based on the ACPI inputs. OEMs can control whether or not to enable AMT or CQL via other supported drivers[1] but the actual transition logic resides in the AMD PMF driver. When an AMT event is received the automatic mode transition RAPL algorithm will run. When a CQL event is received an performance "on-lap" mode will be enabled and thermal parameters will be adjusted accordingly. [1] Link: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/commit/?h=review-hans&id=755b249250df1b612d982f3b702c831b26ecdf73 Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@xxxxxxx> --- drivers/platform/x86/amd/pmf/acpi.c | 90 +++++++++++++++++++++++- drivers/platform/x86/amd/pmf/auto-mode.c | 22 ++++++ drivers/platform/x86/amd/pmf/cnqf.c | 4 +- drivers/platform/x86/amd/pmf/core.c | 18 ++++- drivers/platform/x86/amd/pmf/pmf.h | 29 +++++++- 5 files changed, 156 insertions(+), 7 deletions(-) diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c index e9f33e61659f..4bde86aeafa0 100644 --- a/drivers/platform/x86/amd/pmf/acpi.c +++ b/drivers/platform/x86/amd/pmf/acpi.c @@ -12,6 +12,8 @@ #include "pmf.h" #define APMF_METHOD "\\_SB_.PMF_.APMF" +#define APMF_CQL_NOTIFICATION 2 +#define APMF_AMT_NOTIFICATION 3 static unsigned long supported_func; @@ -55,6 +57,7 @@ static void apmf_if_parse_functions(struct apmf_if_functions *func, u32 mask) { func->system_params = mask & APMF_FUNC_GET_SYS_PARAMS; func->static_slider_granular = mask & APMF_FUNC_STATIC_SLIDER_GRANULAR; + func->sbios_requests = mask & APMF_FUNC_SBIOS_REQUESTS; func->auto_mode_def = mask & APMF_FUNC_AUTO_MODE; func->fan_table_idx = mask & APMF_FUNC_SET_FAN_IDX; func->dyn_slider_ac = mask & APMF_FUNC_DYN_SLIDER_GRANULAR_AC; @@ -292,6 +295,36 @@ int apmf_get_dyn_slider_def_dc(struct apmf_if *ampf_if, struct apmf_dyn_slider_o return err; } +int apmf_get_sbios_requests(struct apmf_if *ampf_if, struct apmf_sbios_req *req) +{ + union acpi_object *info; + size_t size; + int err = 0; + + info = apmf_if_call(ampf_if, APMF_FUNC_SBIOS_REQUESTS, NULL); + if (!info) + return -EIO; + + size = *(u16 *)info->buffer.pointer; + + if (size < sizeof(union acpi_object)) { + pr_err("PMF: buffer too small %zu\n", size); + err = -EINVAL; + goto out; + } + + size = min(sizeof(*req), size); + memset(req, 0, sizeof(*req)); + memcpy(req, info->buffer.pointer, size); + + pr_debug("PMF: %s: pending_req:%d cql:%d amt:%d\n", __func__, + req->pending_req, req->cql_event, req->amt_event); + +out: + kfree(info); + return err; +} + static acpi_handle apmf_if_probe_handle(void) { acpi_handle handle = NULL; @@ -312,18 +345,62 @@ static acpi_handle apmf_if_probe_handle(void) return handle; } +static void apmf_event_handler(acpi_handle handle, u32 event, void *data) +{ + struct amd_pmf_dev *pmf_dev = data; + struct apmf_if *apmf_if = pmf_dev->apmf_if; + int ret; + + if (apmf_if->func.sbios_requests) { + struct apmf_sbios_req req; + + ret = apmf_get_sbios_requests(apmf_if, &req); + if (ret) { + dev_err(pmf_dev->dev, "Failed to get SBIOS requests:%d\n", ret); + return; + } + if (req.pending_req & BIT(APMF_AMT_NOTIFICATION)) { + pr_debug("PMF: AMT is supported and notifications %s\n", + req.amt_event ? "Enabled" : "Disabled"); + if (req.amt_event) + pmf_dev->is_amt_event = true; + else + pmf_dev->is_amt_event = !!req.amt_event; + } + + if (req.pending_req & BIT(APMF_CQL_NOTIFICATION)) { + pr_debug("PMF: CQL is supported and notifications %s\n", + req.cql_event ? "Enabled" : "Disabled"); + if (req.cql_event) + pmf_dev->is_cql_event = true; + else + pmf_dev->is_cql_event = !!req.cql_event; + + /* update the target mode information */ + amd_pmf_update_2_cql(pmf_dev); + } + } +} + void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev) { + acpi_handle ahandle = ACPI_HANDLE(pmf_dev->dev); + if (pmf_dev->apmf_if->func.sbios_heartbeat) cancel_delayed_work_sync(&pmf_dev->heart_beat); + + if (is_apmf_func_supported(APMF_FUNC_AUTO_MODE)) + acpi_remove_notify_handler(ahandle, ACPI_ALL_NOTIFY, + apmf_event_handler); } int apmf_acpi_init(struct amd_pmf_dev *pmf_dev) { + acpi_handle ahandle = ACPI_HANDLE(pmf_dev->dev); struct apmf_notification_cfg *n; acpi_handle apmf_if_handle; struct apmf_if *apmf_if; - int ret; + int ret, status; apmf_if_handle = apmf_if_probe_handle(); if (!apmf_if_handle) @@ -360,6 +437,17 @@ int apmf_acpi_init(struct amd_pmf_dev *pmf_dev) schedule_delayed_work(&pmf_dev->heart_beat, 0); } + /* Install the APMF Notify handler */ + if (is_apmf_func_supported(APMF_FUNC_AUTO_MODE)) { + status = acpi_install_notify_handler(ahandle, + ACPI_ALL_NOTIFY, + apmf_event_handler, pmf_dev); + if (ACPI_FAILURE(status)) { + dev_err(pmf_dev->dev, "failed to install notify handler\n"); + return -ENODEV; + } + } + out: return ret; } diff --git a/drivers/platform/x86/amd/pmf/auto-mode.c b/drivers/platform/x86/amd/pmf/auto-mode.c index 954fde25e71e..a85ef4b95cdb 100644 --- a/drivers/platform/x86/amd/pmf/auto-mode.c +++ b/drivers/platform/x86/amd/pmf/auto-mode.c @@ -111,6 +111,13 @@ void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t t bool update = false; int i, j; + if (!dev->amt_running && dev->is_amt_event) { + dev_dbg(dev->dev, "setting AMT thermals\n"); + amd_pmf_handle_automode(dev, SLIDER_OP_SET, config_store.current_mode, NULL); + dev->amt_running = true; + return; + } + /* Get the average moving average computed by auto mode algorithm */ avg_power = amd_pmf_get_moving_avg(socket_power); @@ -161,6 +168,21 @@ void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t t } } +void amd_pmf_update_2_cql(struct amd_pmf_dev *dev) +{ + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode = + dev->is_cql_event ? AUTO_PERFORMANCE_ON_LAP : AUTO_PERFORMANCE; + if ((config_store.current_mode == AUTO_PERFORMANCE || + config_store.current_mode == AUTO_PERFORMANCE_ON_LAP) && + config_store.current_mode != + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode) { + config_store.current_mode = + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode; + amd_pmf_handle_automode(dev, SLIDER_OP_SET, config_store.current_mode, NULL); + } + dev_dbg(dev->dev, "updated CQL thermals\n"); +} + static void amd_pmf_get_power_threshold(void) { config_store.transition[AUTO_TRANSITION_TO_QUIET].power_threshold = diff --git a/drivers/platform/x86/amd/pmf/cnqf.c b/drivers/platform/x86/amd/pmf/cnqf.c index 2b03ae1ad37f..eba8f0d79a62 100644 --- a/drivers/platform/x86/amd/pmf/cnqf.c +++ b/drivers/platform/x86/amd/pmf/cnqf.c @@ -101,7 +101,7 @@ static const char *state_as_str(unsigned int state) } } -void amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_lapsed_ms) +void amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_elapsed_ms) { struct cnqf_tran_params *tp; int src, i, j, index = 0; @@ -117,7 +117,7 @@ void amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_ } for (i = 0; i < CNQF_TRANSITION_MAX; i++) { - config_store.trans_param[src][i].timer += time_lapsed_ms; + config_store.trans_param[src][i].timer += time_elapsed_ms; config_store.trans_param[src][i].total_power += socket_power; config_store.trans_param[src][i].count++; diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c index 674ddf599135..2a3dacfb2005 100644 --- a/drivers/platform/x86/amd/pmf/core.c +++ b/drivers/platform/x86/amd/pmf/core.c @@ -109,10 +109,15 @@ static void amd_pmf_get_metrics(struct work_struct *work) enum platform_profile_option current_profile; ktime_t time_elapsed_ms; int socket_power; + u8 mode; /* Get the current profile information */ platform_profile_get(¤t_profile); + if (!dev->is_amt_event) + dev_dbg(dev->dev, "%s amt event: %s\n", __func__, + dev->is_amt_event ? "Enabled" : "Disabled"); + /* Transfer table contents */ memset(&dev->m_table, 0, sizeof(dev->m_table)); amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, 0, 7, NULL); @@ -123,8 +128,17 @@ static void amd_pmf_get_metrics(struct work_struct *work) socket_power = dev->m_table.apu_power + dev->m_table.dgpu_power; if (current_profile == PLATFORM_PROFILE_BALANCED) { - /* Apply the Auto Mode transition */ - amd_pmf_trans_automode(dev, socket_power, time_elapsed_ms); + if (dev->is_amt_event) { + /* Apply the Auto Mode transition */ + amd_pmf_trans_automode(dev, socket_power, time_elapsed_ms); + } else if (!dev->is_amt_event && dev->amt_running) { + pr_debug("resetting AMT thermals\n"); + mode = amd_pmf_get_pprof_modes(dev); + amd_pmf_update_slider(dev, SLIDER_OP_SET, mode, NULL); + dev->amt_running = false; + } + } else { + dev->amt_running = false; } if (dev->cnqf_feat) { diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h index 0532f49e9613..9ae9812353cd 100644 --- a/drivers/platform/x86/amd/pmf/pmf.h +++ b/drivers/platform/x86/amd/pmf/pmf.h @@ -17,6 +17,7 @@ /* APMF Functions */ #define APMF_FUNC_VERIFY_INTERFACE 0 #define APMF_FUNC_GET_SYS_PARAMS 1 +#define APMF_FUNC_SBIOS_REQUESTS 2 #define APMF_FUNC_SBIOS_HEARTBEAT 4 #define APMF_FUNC_AUTO_MODE 5 #define APMF_FUNC_SET_FAN_IDX 7 @@ -51,6 +52,7 @@ /* AMD PMF BIOS interfaces */ struct apmf_if_functions { bool system_params; + bool sbios_requests; bool sbios_heartbeat; bool auto_mode_def; bool fan_table_idx; @@ -84,6 +86,24 @@ struct apmf_system_params { u32 heartbeat_int; } __packed; +struct apmf_sbios_req { + u16 size; + u32 pending_req; + u8 rsd; + u8 cql_event; + u8 amt_event; + u32 fppt; + u32 sppt; + u32 fppt_apu_only; + u32 spl; + u32 stt_min_limit; + u8 skin_temp_apu; + u8 skin_temp_hs2; + u8 dps_enable; + u32 custom_policy_1; + u32 custom_policy_2; +} __packed; + struct apmf_fan_idx { u16 size; u8 fan_ctl_mode; @@ -171,6 +191,9 @@ struct amd_pmf_dev { #endif /* CONFIG_DEBUG_FS */ bool cnqf_feat; bool cnqf_running; + bool is_amt_event; + bool is_cql_event; + bool amt_running; }; struct apmf_sps_prop_granular { @@ -417,9 +440,11 @@ int apmf_update_fan_idx(struct apmf_if *ampf_if, bool manual, u32 idx); /* Auto Mode Layer */ void amd_pmf_load_defaults_auto_mode(struct amd_pmf_dev *dev); int apmf_get_auto_mode_def(struct apmf_if *ampf_if, struct apmf_auto_mode *data); +int apmf_get_sbios_requests(struct apmf_if *ampf_if, struct apmf_sbios_req *req); void amd_pmf_init_auto_mode(struct amd_pmf_dev *dev); void amd_pmf_deinit_auto_mode(struct amd_pmf_dev *dev); -void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t time_lapsed_ms); +void amd_pmf_update_2_cql(struct amd_pmf_dev *dev); +void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t time_elapsed_ms); /* CnQF Layer */ int apmf_get_dyn_slider_def_ac(struct apmf_if *ampf_if, struct apmf_dyn_slider_output *data); @@ -427,6 +452,6 @@ int apmf_get_dyn_slider_def_dc(struct apmf_if *ampf_if, struct apmf_dyn_slider_o void amd_pmf_init_cnqf(struct amd_pmf_dev *dev); void amd_pmf_deinit_cnqf(struct amd_pmf_dev *dev); void amd_pmf_load_defaults_cnqf(struct amd_pmf_dev *dev); -void amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_lapsed_ms); +void amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_elapsed_ms); #endif /* PMF_H */ -- 2.25.1
