mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
tools/power/x86/intel-speed-select: Enhance get_tdp_info
mbox_get_uncore_p0_p1_info/get_p1_info/get_uncore_mem_freq can be done inside get_tdp_info(). Fold the code into get_tdp_info(). No functional changes are expected. Signed-off-by: Zhang Rui <rui.zhang@intel.com> [srinivas.pandruvada@linux.intel.com: changelog edits] Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
This commit is contained in:
parent
00c26c1f7e
commit
8559328315
2 changed files with 60 additions and 59 deletions
|
@ -148,6 +148,62 @@ static void mbox_get_uncore_p0_p1_info(struct isst_id *id, int config_index,
|
||||||
ctdp_level->uncore_p1);
|
ctdp_level->uncore_p1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void _get_p1_info(struct isst_id *id, int config_index,
|
||||||
|
struct isst_pkg_ctdp_level_info *ctdp_level)
|
||||||
|
{
|
||||||
|
unsigned int resp;
|
||||||
|
int ret;
|
||||||
|
ret = isst_send_mbox_command(id->cpu, CONFIG_TDP, CONFIG_TDP_GET_P1_INFO, 0,
|
||||||
|
config_index, &resp);
|
||||||
|
if (ret) {
|
||||||
|
ctdp_level->sse_p1 = 0;
|
||||||
|
ctdp_level->avx2_p1 = 0;
|
||||||
|
ctdp_level->avx512_p1 = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ctdp_level->sse_p1 = resp & GENMASK(7, 0);
|
||||||
|
ctdp_level->avx2_p1 = (resp & GENMASK(15, 8)) >> 8;
|
||||||
|
ctdp_level->avx512_p1 = (resp & GENMASK(23, 16)) >> 16;
|
||||||
|
debug_printf(
|
||||||
|
"cpu:%d ctdp:%d CONFIG_TDP_GET_P1_INFO resp:%x sse_p1:%d avx2_p1:%d avx512_p1:%d\n",
|
||||||
|
id->cpu, config_index, resp, ctdp_level->sse_p1,
|
||||||
|
ctdp_level->avx2_p1, ctdp_level->avx512_p1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void _get_uncore_mem_freq(struct isst_id *id, int config_index,
|
||||||
|
struct isst_pkg_ctdp_level_info *ctdp_level)
|
||||||
|
{
|
||||||
|
unsigned int resp;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = isst_send_mbox_command(id->cpu, CONFIG_TDP, CONFIG_TDP_GET_MEM_FREQ,
|
||||||
|
0, config_index, &resp);
|
||||||
|
if (ret) {
|
||||||
|
ctdp_level->mem_freq = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ctdp_level->mem_freq = resp & GENMASK(7, 0);
|
||||||
|
if (is_spr_platform()) {
|
||||||
|
ctdp_level->mem_freq *= 200;
|
||||||
|
} else if (is_icx_platform()) {
|
||||||
|
if (ctdp_level->mem_freq < 7) {
|
||||||
|
ctdp_level->mem_freq = (12 - ctdp_level->mem_freq) * 133.33 * 2 * 10;
|
||||||
|
ctdp_level->mem_freq /= 10;
|
||||||
|
if (ctdp_level->mem_freq % 10 > 5)
|
||||||
|
ctdp_level->mem_freq++;
|
||||||
|
} else {
|
||||||
|
ctdp_level->mem_freq = 0;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ctdp_level->mem_freq = 0;
|
||||||
|
}
|
||||||
|
debug_printf(
|
||||||
|
"cpu:%d ctdp:%d CONFIG_TDP_GET_MEM_FREQ resp:%x uncore mem_freq:%d\n",
|
||||||
|
id->cpu, config_index, resp, ctdp_level->mem_freq);
|
||||||
|
}
|
||||||
|
|
||||||
static int mbox_get_tdp_info(struct isst_id *id, int config_index,
|
static int mbox_get_tdp_info(struct isst_id *id, int config_index,
|
||||||
struct isst_pkg_ctdp_level_info *ctdp_level)
|
struct isst_pkg_ctdp_level_info *ctdp_level)
|
||||||
{
|
{
|
||||||
|
@ -176,6 +232,10 @@ static int mbox_get_tdp_info(struct isst_id *id, int config_index,
|
||||||
|
|
||||||
ctdp_level->t_proc_hot = resp & GENMASK(7, 0);
|
ctdp_level->t_proc_hot = resp & GENMASK(7, 0);
|
||||||
|
|
||||||
|
mbox_get_uncore_p0_p1_info(id, config_index, ctdp_level);
|
||||||
|
_get_p1_info(id, config_index, ctdp_level);
|
||||||
|
_get_uncore_mem_freq(id, config_index, ctdp_level);
|
||||||
|
|
||||||
debug_printf(
|
debug_printf(
|
||||||
"cpu:%d ctdp:%d CONFIG_TDP_GET_TJMAX_INFO resp:%x t_proc_hot:%d\n",
|
"cpu:%d ctdp:%d CONFIG_TDP_GET_TJMAX_INFO resp:%x t_proc_hot:%d\n",
|
||||||
id->cpu, config_index, resp, ctdp_level->t_proc_hot);
|
id->cpu, config_index, resp, ctdp_level->t_proc_hot);
|
||||||
|
|
|
@ -525,62 +525,6 @@ void isst_get_uncore_p0_p1_info(struct isst_id *id, int config_index,
|
||||||
return isst_ops->get_uncore_p0_p1_info(id, config_index, ctdp_level);
|
return isst_ops->get_uncore_p0_p1_info(id, config_index, ctdp_level);
|
||||||
}
|
}
|
||||||
|
|
||||||
void isst_get_p1_info(struct isst_id *id, int config_index,
|
|
||||||
struct isst_pkg_ctdp_level_info *ctdp_level)
|
|
||||||
{
|
|
||||||
unsigned int resp;
|
|
||||||
int ret;
|
|
||||||
ret = isst_send_mbox_command(id->cpu, CONFIG_TDP, CONFIG_TDP_GET_P1_INFO, 0,
|
|
||||||
config_index, &resp);
|
|
||||||
if (ret) {
|
|
||||||
ctdp_level->sse_p1 = 0;
|
|
||||||
ctdp_level->avx2_p1 = 0;
|
|
||||||
ctdp_level->avx512_p1 = 0;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ctdp_level->sse_p1 = resp & GENMASK(7, 0);
|
|
||||||
ctdp_level->avx2_p1 = (resp & GENMASK(15, 8)) >> 8;
|
|
||||||
ctdp_level->avx512_p1 = (resp & GENMASK(23, 16)) >> 16;
|
|
||||||
debug_printf(
|
|
||||||
"cpu:%d ctdp:%d CONFIG_TDP_GET_P1_INFO resp:%x sse_p1:%d avx2_p1:%d avx512_p1:%d\n",
|
|
||||||
id->cpu, config_index, resp, ctdp_level->sse_p1,
|
|
||||||
ctdp_level->avx2_p1, ctdp_level->avx512_p1);
|
|
||||||
}
|
|
||||||
|
|
||||||
void isst_get_uncore_mem_freq(struct isst_id *id, int config_index,
|
|
||||||
struct isst_pkg_ctdp_level_info *ctdp_level)
|
|
||||||
{
|
|
||||||
unsigned int resp;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
ret = isst_send_mbox_command(id->cpu, CONFIG_TDP, CONFIG_TDP_GET_MEM_FREQ,
|
|
||||||
0, config_index, &resp);
|
|
||||||
if (ret) {
|
|
||||||
ctdp_level->mem_freq = 0;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ctdp_level->mem_freq = resp & GENMASK(7, 0);
|
|
||||||
if (is_spr_platform()) {
|
|
||||||
ctdp_level->mem_freq *= 200;
|
|
||||||
} else if (is_icx_platform()) {
|
|
||||||
if (ctdp_level->mem_freq < 7) {
|
|
||||||
ctdp_level->mem_freq = (12 - ctdp_level->mem_freq) * 133.33 * 2 * 10;
|
|
||||||
ctdp_level->mem_freq /= 10;
|
|
||||||
if (ctdp_level->mem_freq % 10 > 5)
|
|
||||||
ctdp_level->mem_freq++;
|
|
||||||
} else {
|
|
||||||
ctdp_level->mem_freq = 0;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
ctdp_level->mem_freq = 0;
|
|
||||||
}
|
|
||||||
debug_printf(
|
|
||||||
"cpu:%d ctdp:%d CONFIG_TDP_GET_MEM_FREQ resp:%x uncore mem_freq:%d\n",
|
|
||||||
id->cpu, config_index, resp, ctdp_level->mem_freq);
|
|
||||||
}
|
|
||||||
|
|
||||||
int isst_get_process_ctdp(struct isst_id *id, int tdp_level, struct isst_pkg_ctdp *pkg_dev)
|
int isst_get_process_ctdp(struct isst_id *id, int tdp_level, struct isst_pkg_ctdp *pkg_dev)
|
||||||
{
|
{
|
||||||
int i, ret, valid = 0;
|
int i, ret, valid = 0;
|
||||||
|
@ -680,9 +624,6 @@ int isst_get_process_ctdp(struct isst_id *id, int tdp_level, struct isst_pkg_ctd
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
isst_get_uncore_p0_p1_info(id, i, ctdp_level);
|
|
||||||
isst_get_p1_info(id, i, ctdp_level);
|
|
||||||
isst_get_uncore_mem_freq(id, i, ctdp_level);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!valid)
|
if (!valid)
|
||||||
|
|
Loading…
Reference in a new issue