Skip to content

Commit 83f0442

Browse files
Shyam Sundar S Kij-intel
Shyam Sundar S K
authored and
ij-intel
committed
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>
1 parent bc3c0a3 commit 83f0442

7 files changed

Lines changed: 51 additions & 47 deletions

File tree

‎drivers/platform/x86/amd/pmf/auto-mode.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ static void amd_pmf_set_automode(struct amd_pmf_dev *dev, int idx,
114114
{
115115
struct power_table_control *pwr_ctrl = &config_store.mode_set[idx].power_control;
116116

117-
amd_pmf_send_cmd(dev, SET_SPL, false, pwr_ctrl->spl, NULL);
118-
amd_pmf_send_cmd(dev, SET_FPPT, false, pwr_ctrl->fppt, NULL);
119-
amd_pmf_send_cmd(dev, SET_SPPT, false, pwr_ctrl->sppt, NULL);
120-
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false, pwr_ctrl->sppt_apu_only, NULL);
121-
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false, pwr_ctrl->stt_min, NULL);
122-
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
117+
amd_pmf_send_cmd(dev, SET_SPL, SET_CMD, pwr_ctrl->spl, NULL);
118+
amd_pmf_send_cmd(dev, SET_FPPT, SET_CMD, pwr_ctrl->fppt, NULL);
119+
amd_pmf_send_cmd(dev, SET_SPPT, SET_CMD, pwr_ctrl->sppt, NULL);
120+
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, SET_CMD, pwr_ctrl->sppt_apu_only, NULL);
121+
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, SET_CMD, pwr_ctrl->stt_min, NULL);
122+
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, SET_CMD,
123123
fixp_q88_fromint(pwr_ctrl->stt_skin_temp[STT_TEMP_APU]), NULL);
124-
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
124+
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, SET_CMD,
125125
fixp_q88_fromint(pwr_ctrl->stt_skin_temp[STT_TEMP_HS2]), NULL);
126126

127127
if (is_apmf_func_supported(dev, APMF_FUNC_SET_FAN_IDX))

‎drivers/platform/x86/amd/pmf/cnqf.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ static int amd_pmf_set_cnqf(struct amd_pmf_dev *dev, int src, int idx,
7676

7777
pc = &config_store.mode_set[src][idx].power_control;
7878

79-
amd_pmf_send_cmd(dev, SET_SPL, false, pc->spl, NULL);
80-
amd_pmf_send_cmd(dev, SET_FPPT, false, pc->fppt, NULL);
81-
amd_pmf_send_cmd(dev, SET_SPPT, false, pc->sppt, NULL);
82-
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false, pc->sppt_apu_only, NULL);
83-
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false, pc->stt_min, NULL);
84-
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
79+
amd_pmf_send_cmd(dev, SET_SPL, SET_CMD, pc->spl, NULL);
80+
amd_pmf_send_cmd(dev, SET_FPPT, SET_CMD, pc->fppt, NULL);
81+
amd_pmf_send_cmd(dev, SET_SPPT, SET_CMD, pc->sppt, NULL);
82+
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, SET_CMD, pc->sppt_apu_only, NULL);
83+
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, SET_CMD, pc->stt_min, NULL);
84+
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, SET_CMD,
8585
fixp_q88_fromint(pc->stt_skin_temp[STT_TEMP_APU]), NULL);
86-
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
86+
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, SET_CMD,
8787
fixp_q88_fromint(pc->stt_skin_temp[STT_TEMP_HS2]), NULL);
8888

8989
if (is_apmf_func_supported(dev, APMF_FUNC_SET_FAN_IDX))

‎drivers/platform/x86/amd/pmf/core.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static void amd_pmf_get_metrics(struct work_struct *work)
131131

132132
/* Transfer table contents */
133133
memset(dev->buf, 0, sizeof(dev->m_table));
134-
amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, 0, 7, NULL);
134+
amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, SET_CMD, 7, NULL);
135135
memcpy(&dev->m_table, dev->buf, sizeof(dev->m_table));
136136

137137
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)
289289
hi = phys_addr >> 32;
290290
low = phys_addr & GENMASK(31, 0);
291291

292-
amd_pmf_send_cmd(dev, SET_DRAM_ADDR_HIGH, 0, hi, NULL);
293-
amd_pmf_send_cmd(dev, SET_DRAM_ADDR_LOW, 0, low, NULL);
292+
amd_pmf_send_cmd(dev, SET_DRAM_ADDR_HIGH, SET_CMD, hi, NULL);
293+
amd_pmf_send_cmd(dev, SET_DRAM_ADDR_LOW, SET_CMD, low, NULL);
294294

295295
return 0;
296296
}

‎drivers/platform/x86/amd/pmf/pmf.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@ struct cookie_header {
120120
#define APTS_MAX_STATES 16
121121
#define CUSTOM_BIOS_INPUT_BITS GENMASK(16, 7)
122122

123+
/* amd_pmf_send_cmd() set/get */
124+
#define SET_CMD false
125+
#define GET_CMD true
126+
123127
typedef void (*apmf_event_handler_t)(acpi_handle handle, u32 event, void *data);
124128

125129
/* APTS PMF BIOS Interface */

‎drivers/platform/x86/amd/pmf/spc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static void amd_pmf_get_smu_info(struct amd_pmf_dev *dev, struct ta_pmf_enact_ta
202202
{
203203
/* Get the updated metrics table data */
204204
memset(dev->buf, 0, dev->mtable_size);
205-
amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, 0, 7, NULL);
205+
amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, SET_CMD, 7, NULL);
206206

207207
switch (dev->cpu_id) {
208208
case AMD_CPU_ID_PS:

‎drivers/platform/x86/amd/pmf/sps.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,15 @@ static void amd_pmf_load_defaults_sps(struct amd_pmf_dev *dev)
192192

193193
static void amd_pmf_update_slider_v2(struct amd_pmf_dev *dev, int idx)
194194
{
195-
amd_pmf_send_cmd(dev, SET_PMF_PPT, false, apts_config_store.val[idx].pmf_ppt, NULL);
196-
amd_pmf_send_cmd(dev, SET_PMF_PPT_APU_ONLY, false,
195+
amd_pmf_send_cmd(dev, SET_PMF_PPT, SET_CMD, apts_config_store.val[idx].pmf_ppt, NULL);
196+
amd_pmf_send_cmd(dev, SET_PMF_PPT_APU_ONLY, SET_CMD,
197197
apts_config_store.val[idx].ppt_pmf_apu_only, NULL);
198-
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false,
198+
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, SET_CMD,
199199
apts_config_store.val[idx].stt_min_limit, NULL);
200-
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
200+
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, SET_CMD,
201201
fixp_q88_fromint(apts_config_store.val[idx].stt_skin_temp_limit_apu),
202202
NULL);
203-
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
203+
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, SET_CMD,
204204
fixp_q88_fromint(apts_config_store.val[idx].stt_skin_temp_limit_hs2),
205205
NULL);
206206
}
@@ -211,30 +211,30 @@ void amd_pmf_update_slider(struct amd_pmf_dev *dev, bool op, int idx,
211211
int src = amd_pmf_get_power_source();
212212

213213
if (op == SLIDER_OP_SET) {
214-
amd_pmf_send_cmd(dev, SET_SPL, false, config_store.prop[src][idx].spl, NULL);
215-
amd_pmf_send_cmd(dev, SET_FPPT, false, config_store.prop[src][idx].fppt, NULL);
216-
amd_pmf_send_cmd(dev, SET_SPPT, false, config_store.prop[src][idx].sppt, NULL);
217-
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false,
214+
amd_pmf_send_cmd(dev, SET_SPL, SET_CMD, config_store.prop[src][idx].spl, NULL);
215+
amd_pmf_send_cmd(dev, SET_FPPT, SET_CMD, config_store.prop[src][idx].fppt, NULL);
216+
amd_pmf_send_cmd(dev, SET_SPPT, SET_CMD, config_store.prop[src][idx].sppt, NULL);
217+
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, SET_CMD,
218218
config_store.prop[src][idx].sppt_apu_only, NULL);
219-
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false,
219+
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, SET_CMD,
220220
config_store.prop[src][idx].stt_min, NULL);
221-
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
221+
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, SET_CMD,
222222
fixp_q88_fromint(config_store.prop[src][idx].stt_skin_temp[STT_TEMP_APU]),
223223
NULL);
224-
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
224+
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, SET_CMD,
225225
fixp_q88_fromint(config_store.prop[src][idx].stt_skin_temp[STT_TEMP_HS2]),
226226
NULL);
227227
} else if (op == SLIDER_OP_GET) {
228-
amd_pmf_send_cmd(dev, GET_SPL, true, ARG_NONE, &table->prop[src][idx].spl);
229-
amd_pmf_send_cmd(dev, GET_FPPT, true, ARG_NONE, &table->prop[src][idx].fppt);
230-
amd_pmf_send_cmd(dev, GET_SPPT, true, ARG_NONE, &table->prop[src][idx].sppt);
231-
amd_pmf_send_cmd(dev, GET_SPPT_APU_ONLY, true, ARG_NONE,
228+
amd_pmf_send_cmd(dev, GET_SPL, GET_CMD, ARG_NONE, &table->prop[src][idx].spl);
229+
amd_pmf_send_cmd(dev, GET_FPPT, GET_CMD, ARG_NONE, &table->prop[src][idx].fppt);
230+
amd_pmf_send_cmd(dev, GET_SPPT, GET_CMD, ARG_NONE, &table->prop[src][idx].sppt);
231+
amd_pmf_send_cmd(dev, GET_SPPT_APU_ONLY, GET_CMD, ARG_NONE,
232232
&table->prop[src][idx].sppt_apu_only);
233-
amd_pmf_send_cmd(dev, GET_STT_MIN_LIMIT, true, ARG_NONE,
233+
amd_pmf_send_cmd(dev, GET_STT_MIN_LIMIT, GET_CMD, ARG_NONE,
234234
&table->prop[src][idx].stt_min);
235-
amd_pmf_send_cmd(dev, GET_STT_LIMIT_APU, true, ARG_NONE,
235+
amd_pmf_send_cmd(dev, GET_STT_LIMIT_APU, GET_CMD, ARG_NONE,
236236
(u32 *)&table->prop[src][idx].stt_skin_temp[STT_TEMP_APU]);
237-
amd_pmf_send_cmd(dev, GET_STT_LIMIT_HS2, true, ARG_NONE,
237+
amd_pmf_send_cmd(dev, GET_STT_LIMIT_HS2, GET_CMD, ARG_NONE,
238238
(u32 *)&table->prop[src][idx].stt_skin_temp[STT_TEMP_HS2]);
239239
}
240240
}

‎drivers/platform/x86/amd/pmf/tee-if.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,47 +83,47 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_
8383
switch (out->actions_list[idx].action_index) {
8484
case PMF_POLICY_SPL:
8585
if (dev->prev_data->spl != val) {
86-
amd_pmf_send_cmd(dev, SET_SPL, false, val, NULL);
86+
amd_pmf_send_cmd(dev, SET_SPL, SET_CMD, val, NULL);
8787
dev_dbg(dev->dev, "update SPL: %u\n", val);
8888
dev->prev_data->spl = val;
8989
}
9090
break;
9191

9292
case PMF_POLICY_SPPT:
9393
if (dev->prev_data->sppt != val) {
94-
amd_pmf_send_cmd(dev, SET_SPPT, false, val, NULL);
94+
amd_pmf_send_cmd(dev, SET_SPPT, SET_CMD, val, NULL);
9595
dev_dbg(dev->dev, "update SPPT: %u\n", val);
9696
dev->prev_data->sppt = val;
9797
}
9898
break;
9999

100100
case PMF_POLICY_FPPT:
101101
if (dev->prev_data->fppt != val) {
102-
amd_pmf_send_cmd(dev, SET_FPPT, false, val, NULL);
102+
amd_pmf_send_cmd(dev, SET_FPPT, SET_CMD, val, NULL);
103103
dev_dbg(dev->dev, "update FPPT: %u\n", val);
104104
dev->prev_data->fppt = val;
105105
}
106106
break;
107107

108108
case PMF_POLICY_SPPT_APU_ONLY:
109109
if (dev->prev_data->sppt_apuonly != val) {
110-
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false, val, NULL);
110+
amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, SET_CMD, val, NULL);
111111
dev_dbg(dev->dev, "update SPPT_APU_ONLY: %u\n", val);
112112
dev->prev_data->sppt_apuonly = val;
113113
}
114114
break;
115115

116116
case PMF_POLICY_STT_MIN:
117117
if (dev->prev_data->stt_minlimit != val) {
118-
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false, val, NULL);
118+
amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, SET_CMD, val, NULL);
119119
dev_dbg(dev->dev, "update STT_MIN: %u\n", val);
120120
dev->prev_data->stt_minlimit = val;
121121
}
122122
break;
123123

124124
case PMF_POLICY_STT_SKINTEMP_APU:
125125
if (dev->prev_data->stt_skintemp_apu != val) {
126-
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,
126+
amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, SET_CMD,
127127
fixp_q88_fromint(val), NULL);
128128
dev_dbg(dev->dev, "update STT_SKINTEMP_APU: %u\n", val);
129129
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_
132132

133133
case PMF_POLICY_STT_SKINTEMP_HS2:
134134
if (dev->prev_data->stt_skintemp_hs2 != val) {
135-
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,
135+
amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, SET_CMD,
136136
fixp_q88_fromint(val), NULL);
137137
dev_dbg(dev->dev, "update STT_SKINTEMP_HS2: %u\n", val);
138138
dev->prev_data->stt_skintemp_hs2 = val;
@@ -141,23 +141,23 @@ static void amd_pmf_apply_policies(struct amd_pmf_dev *dev, struct ta_pmf_enact_
141141

142142
case PMF_POLICY_P3T:
143143
if (dev->prev_data->p3t_limit != val) {
144-
amd_pmf_send_cmd(dev, SET_P3T, false, val, NULL);
144+
amd_pmf_send_cmd(dev, SET_P3T, SET_CMD, val, NULL);
145145
dev_dbg(dev->dev, "update P3T: %u\n", val);
146146
dev->prev_data->p3t_limit = val;
147147
}
148148
break;
149149

150150
case PMF_POLICY_PMF_PPT:
151151
if (dev->prev_data->pmf_ppt != val) {
152-
amd_pmf_send_cmd(dev, SET_PMF_PPT, false, val, NULL);
152+
amd_pmf_send_cmd(dev, SET_PMF_PPT, SET_CMD, val, NULL);
153153
dev_dbg(dev->dev, "update PMF PPT: %u\n", val);
154154
dev->prev_data->pmf_ppt = val;
155155
}
156156
break;
157157

158158
case PMF_POLICY_PMF_PPT_APU_ONLY:
159159
if (dev->prev_data->pmf_ppt_apu_only != val) {
160-
amd_pmf_send_cmd(dev, SET_PMF_PPT_APU_ONLY, false, val, NULL);
160+
amd_pmf_send_cmd(dev, SET_PMF_PPT_APU_ONLY, SET_CMD, val, NULL);
161161
dev_dbg(dev->dev, "update PMF PPT APU ONLY: %u\n", val);
162162
dev->prev_data->pmf_ppt_apu_only = val;
163163
}

0 commit comments

Comments
 (0)