mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 16:44:58 +02:00
platform/x86/amd/pmf: Use explicit SET_CMD/GET_CMD flags in amd_pmf_send_cmd()
Add SET_CMD and GET_CMD constants and replace boolean values passed as the get/set argument to amd_pmf_send_cmd() with the new explicit flags. This improves readability, avoids ambiguity around true/false and 0/1 usage. There is no functional change. Reviewed-by: Mario Limonciello <mario.limonciello@amd.com> Co-developed-by: Patil Rajesh Reddy <Patil.Reddy@amd.com> Signed-off-by: Patil Rajesh Reddy <Patil.Reddy@amd.com> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> Link: https://patch.msgid.link/20251120105210.3945710-3-Shyam-sundar.S-k@amd.com Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
This commit is contained in:
parent
bc3c0a3231
commit
83f0442a40
|
|
@ -114,14 +114,14 @@ static void amd_pmf_set_automode(struct amd_pmf_dev *dev, int idx,
|
|||
{
|
||||
struct power_table_control *pwr_ctrl = &config_store.mode_set[idx].power_control;
|
||||
|
||||
amd_pmf_send_cmd(dev, SET_SPL, false, pwr_ctrl->spl, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_FPPT, false, pwr_ctrl->fppt, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPPT, false, pwr_ctrl->sppt, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false, pwr_ctrl->sppt_apu_only, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false, pwr_ctrl->stt_min, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
|
||||
amd_pmf_send_cmd(dev, SET_SPL, SET_CMD, pwr_ctrl->spl, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_FPPT, SET_CMD, pwr_ctrl->fppt, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPPT, SET_CMD, pwr_ctrl->sppt, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, SET_CMD, pwr_ctrl->sppt_apu_only, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, SET_CMD, pwr_ctrl->stt_min, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, SET_CMD,
|
||||
fixp_q88_fromint(pwr_ctrl->stt_skin_temp[STT_TEMP_APU]), NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, SET_CMD,
|
||||
fixp_q88_fromint(pwr_ctrl->stt_skin_temp[STT_TEMP_HS2]), NULL);
|
||||
|
||||
if (is_apmf_func_supported(dev, APMF_FUNC_SET_FAN_IDX))
|
||||
|
|
|
|||
|
|
@ -76,14 +76,14 @@ static int amd_pmf_set_cnqf(struct amd_pmf_dev *dev, int src, int idx,
|
|||
|
||||
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,
|
||||
amd_pmf_send_cmd(dev, SET_SPL, SET_CMD, pc->spl, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_FPPT, SET_CMD, pc->fppt, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPPT, SET_CMD, pc->sppt, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, SET_CMD, pc->sppt_apu_only, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, SET_CMD, pc->stt_min, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, SET_CMD,
|
||||
fixp_q88_fromint(pc->stt_skin_temp[STT_TEMP_APU]), NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, SET_CMD,
|
||||
fixp_q88_fromint(pc->stt_skin_temp[STT_TEMP_HS2]), NULL);
|
||||
|
||||
if (is_apmf_func_supported(dev, APMF_FUNC_SET_FAN_IDX))
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ static void amd_pmf_get_metrics(struct work_struct *work)
|
|||
|
||||
/* Transfer table contents */
|
||||
memset(dev->buf, 0, sizeof(dev->m_table));
|
||||
amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, 0, 7, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, SET_CMD, 7, NULL);
|
||||
memcpy(&dev->m_table, dev->buf, sizeof(dev->m_table));
|
||||
|
||||
time_elapsed_ms = ktime_to_ms(ktime_get()) - dev->start_time;
|
||||
|
|
@ -289,8 +289,8 @@ int amd_pmf_set_dram_addr(struct amd_pmf_dev *dev, bool alloc_buffer)
|
|||
hi = phys_addr >> 32;
|
||||
low = phys_addr & GENMASK(31, 0);
|
||||
|
||||
amd_pmf_send_cmd(dev, SET_DRAM_ADDR_HIGH, 0, hi, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_DRAM_ADDR_LOW, 0, low, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_DRAM_ADDR_HIGH, SET_CMD, hi, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_DRAM_ADDR_LOW, SET_CMD, low, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,6 +120,10 @@ struct cookie_header {
|
|||
#define APTS_MAX_STATES 16
|
||||
#define CUSTOM_BIOS_INPUT_BITS GENMASK(16, 7)
|
||||
|
||||
/* amd_pmf_send_cmd() set/get */
|
||||
#define SET_CMD false
|
||||
#define GET_CMD true
|
||||
|
||||
typedef void (*apmf_event_handler_t)(acpi_handle handle, u32 event, void *data);
|
||||
|
||||
/* APTS PMF BIOS Interface */
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ static void amd_pmf_get_smu_info(struct amd_pmf_dev *dev, struct ta_pmf_enact_ta
|
|||
{
|
||||
/* Get the updated metrics table data */
|
||||
memset(dev->buf, 0, dev->mtable_size);
|
||||
amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, 0, 7, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, SET_CMD, 7, NULL);
|
||||
|
||||
switch (dev->cpu_id) {
|
||||
case AMD_CPU_ID_PS:
|
||||
|
|
|
|||
|
|
@ -192,15 +192,15 @@ static void amd_pmf_load_defaults_sps(struct amd_pmf_dev *dev)
|
|||
|
||||
static void amd_pmf_update_slider_v2(struct amd_pmf_dev *dev, int idx)
|
||||
{
|
||||
amd_pmf_send_cmd(dev, SET_PMF_PPT, false, apts_config_store.val[idx].pmf_ppt, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_PMF_PPT_APU_ONLY, false,
|
||||
amd_pmf_send_cmd(dev, SET_PMF_PPT, SET_CMD, apts_config_store.val[idx].pmf_ppt, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_PMF_PPT_APU_ONLY, SET_CMD,
|
||||
apts_config_store.val[idx].ppt_pmf_apu_only, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false,
|
||||
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, SET_CMD,
|
||||
apts_config_store.val[idx].stt_min_limit, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, SET_CMD,
|
||||
fixp_q88_fromint(apts_config_store.val[idx].stt_skin_temp_limit_apu),
|
||||
NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, SET_CMD,
|
||||
fixp_q88_fromint(apts_config_store.val[idx].stt_skin_temp_limit_hs2),
|
||||
NULL);
|
||||
}
|
||||
|
|
@ -211,30 +211,30 @@ void amd_pmf_update_slider(struct amd_pmf_dev *dev, bool op, int idx,
|
|||
int src = amd_pmf_get_power_source();
|
||||
|
||||
if (op == SLIDER_OP_SET) {
|
||||
amd_pmf_send_cmd(dev, SET_SPL, false, config_store.prop[src][idx].spl, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_FPPT, false, config_store.prop[src][idx].fppt, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPPT, false, config_store.prop[src][idx].sppt, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false,
|
||||
amd_pmf_send_cmd(dev, SET_SPL, SET_CMD, config_store.prop[src][idx].spl, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_FPPT, SET_CMD, config_store.prop[src][idx].fppt, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPPT, SET_CMD, config_store.prop[src][idx].sppt, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, SET_CMD,
|
||||
config_store.prop[src][idx].sppt_apu_only, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false,
|
||||
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, SET_CMD,
|
||||
config_store.prop[src][idx].stt_min, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, SET_CMD,
|
||||
fixp_q88_fromint(config_store.prop[src][idx].stt_skin_temp[STT_TEMP_APU]),
|
||||
NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, SET_CMD,
|
||||
fixp_q88_fromint(config_store.prop[src][idx].stt_skin_temp[STT_TEMP_HS2]),
|
||||
NULL);
|
||||
} else if (op == SLIDER_OP_GET) {
|
||||
amd_pmf_send_cmd(dev, GET_SPL, true, ARG_NONE, &table->prop[src][idx].spl);
|
||||
amd_pmf_send_cmd(dev, GET_FPPT, true, ARG_NONE, &table->prop[src][idx].fppt);
|
||||
amd_pmf_send_cmd(dev, GET_SPPT, true, ARG_NONE, &table->prop[src][idx].sppt);
|
||||
amd_pmf_send_cmd(dev, GET_SPPT_APU_ONLY, true, ARG_NONE,
|
||||
amd_pmf_send_cmd(dev, GET_SPL, GET_CMD, ARG_NONE, &table->prop[src][idx].spl);
|
||||
amd_pmf_send_cmd(dev, GET_FPPT, GET_CMD, ARG_NONE, &table->prop[src][idx].fppt);
|
||||
amd_pmf_send_cmd(dev, GET_SPPT, GET_CMD, ARG_NONE, &table->prop[src][idx].sppt);
|
||||
amd_pmf_send_cmd(dev, GET_SPPT_APU_ONLY, GET_CMD, ARG_NONE,
|
||||
&table->prop[src][idx].sppt_apu_only);
|
||||
amd_pmf_send_cmd(dev, GET_STT_MIN_LIMIT, true, ARG_NONE,
|
||||
amd_pmf_send_cmd(dev, GET_STT_MIN_LIMIT, GET_CMD, ARG_NONE,
|
||||
&table->prop[src][idx].stt_min);
|
||||
amd_pmf_send_cmd(dev, GET_STT_LIMIT_APU, true, ARG_NONE,
|
||||
amd_pmf_send_cmd(dev, GET_STT_LIMIT_APU, GET_CMD, ARG_NONE,
|
||||
(u32 *)&table->prop[src][idx].stt_skin_temp[STT_TEMP_APU]);
|
||||
amd_pmf_send_cmd(dev, GET_STT_LIMIT_HS2, true, ARG_NONE,
|
||||
amd_pmf_send_cmd(dev, GET_STT_LIMIT_HS2, GET_CMD, ARG_NONE,
|
||||
(u32 *)&table->prop[src][idx].stt_skin_temp[STT_TEMP_HS2]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_
|
|||
switch (out->actions_list[idx].action_index) {
|
||||
case PMF_POLICY_SPL:
|
||||
if (dev->prev_data->spl != val) {
|
||||
amd_pmf_send_cmd(dev, SET_SPL, false, val, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPL, SET_CMD, val, NULL);
|
||||
dev_dbg(dev->dev, "update SPL: %u\n", val);
|
||||
dev->prev_data->spl = val;
|
||||
}
|
||||
|
|
@ -91,7 +91,7 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_
|
|||
|
||||
case PMF_POLICY_SPPT:
|
||||
if (dev->prev_data->sppt != val) {
|
||||
amd_pmf_send_cmd(dev, SET_SPPT, false, val, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPPT, SET_CMD, val, NULL);
|
||||
dev_dbg(dev->dev, "update SPPT: %u\n", val);
|
||||
dev->prev_data->sppt = val;
|
||||
}
|
||||
|
|
@ -99,7 +99,7 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_
|
|||
|
||||
case PMF_POLICY_FPPT:
|
||||
if (dev->prev_data->fppt != val) {
|
||||
amd_pmf_send_cmd(dev, SET_FPPT, false, val, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_FPPT, SET_CMD, val, NULL);
|
||||
dev_dbg(dev->dev, "update FPPT: %u\n", val);
|
||||
dev->prev_data->fppt = val;
|
||||
}
|
||||
|
|
@ -107,7 +107,7 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_
|
|||
|
||||
case PMF_POLICY_SPPT_APU_ONLY:
|
||||
if (dev->prev_data->sppt_apuonly != val) {
|
||||
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false, val, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, SET_CMD, val, NULL);
|
||||
dev_dbg(dev->dev, "update SPPT_APU_ONLY: %u\n", val);
|
||||
dev->prev_data->sppt_apuonly = val;
|
||||
}
|
||||
|
|
@ -115,7 +115,7 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_
|
|||
|
||||
case PMF_POLICY_STT_MIN:
|
||||
if (dev->prev_data->stt_minlimit != val) {
|
||||
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false, val, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, SET_CMD, val, NULL);
|
||||
dev_dbg(dev->dev, "update STT_MIN: %u\n", val);
|
||||
dev->prev_data->stt_minlimit = val;
|
||||
}
|
||||
|
|
@ -123,7 +123,7 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_
|
|||
|
||||
case PMF_POLICY_STT_SKINTEMP_APU:
|
||||
if (dev->prev_data->stt_skintemp_apu != val) {
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, SET_CMD,
|
||||
fixp_q88_fromint(val), NULL);
|
||||
dev_dbg(dev->dev, "update STT_SKINTEMP_APU: %u\n", val);
|
||||
dev->prev_data->stt_skintemp_apu = val;
|
||||
|
|
@ -132,7 +132,7 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_
|
|||
|
||||
case PMF_POLICY_STT_SKINTEMP_HS2:
|
||||
if (dev->prev_data->stt_skintemp_hs2 != val) {
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
|
||||
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, SET_CMD,
|
||||
fixp_q88_fromint(val), NULL);
|
||||
dev_dbg(dev->dev, "update STT_SKINTEMP_HS2: %u\n", val);
|
||||
dev->prev_data->stt_skintemp_hs2 = val;
|
||||
|
|
@ -141,7 +141,7 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_
|
|||
|
||||
case PMF_POLICY_P3T:
|
||||
if (dev->prev_data->p3t_limit != val) {
|
||||
amd_pmf_send_cmd(dev, SET_P3T, false, val, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_P3T, SET_CMD, val, NULL);
|
||||
dev_dbg(dev->dev, "update P3T: %u\n", val);
|
||||
dev->prev_data->p3t_limit = val;
|
||||
}
|
||||
|
|
@ -149,7 +149,7 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_
|
|||
|
||||
case PMF_POLICY_PMF_PPT:
|
||||
if (dev->prev_data->pmf_ppt != val) {
|
||||
amd_pmf_send_cmd(dev, SET_PMF_PPT, false, val, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_PMF_PPT, SET_CMD, val, NULL);
|
||||
dev_dbg(dev->dev, "update PMF PPT: %u\n", val);
|
||||
dev->prev_data->pmf_ppt = val;
|
||||
}
|
||||
|
|
@ -157,7 +157,7 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_
|
|||
|
||||
case PMF_POLICY_PMF_PPT_APU_ONLY:
|
||||
if (dev->prev_data->pmf_ppt_apu_only != val) {
|
||||
amd_pmf_send_cmd(dev, SET_PMF_PPT_APU_ONLY, false, val, NULL);
|
||||
amd_pmf_send_cmd(dev, SET_PMF_PPT_APU_ONLY, SET_CMD, val, NULL);
|
||||
dev_dbg(dev->dev, "update PMF PPT APU ONLY: %u\n", val);
|
||||
dev->prev_data->pmf_ppt_apu_only = val;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user