tools/power/x86/intel-speed-select: Abstract get_get_trl

Allow platform specific implementation to get turbo ratio limit of the
selected SST-PP level, and AVX level.

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>

diff --git a/tools/power/x86/intel-speed-select/isst-core-mbox.c b/tools/power/x86/intel-speed-select/isst-core-mbox.c
index 51f589fe6bf99f74a6117605fd280311b918551b..4d31b49b4a26eeac46a1e7d22e30960f38ff05d1 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-core-mbox.c
+++ b/tools/power/x86/intel-speed-select/isst-core-mbox.c
@@ -193,6 +193,45 @@ static int mbox_get_coremask_info(struct isst_id *id, int config_index,
        return 0;
 }
 
+static int mbox_get_get_trl(struct isst_id *id, int level, int avx_level, int *trl)
+{
+       unsigned int req, resp;
+       int ret;
+
+       req = level | (avx_level << 16);
+       ret = isst_send_mbox_command(id->cpu, CONFIG_TDP,
+                                    CONFIG_TDP_GET_TURBO_LIMIT_RATIOS, 0, req,
+                                    &resp);
+       if (ret)
+               return ret;
+
+       debug_printf(
+               "cpu:%d CONFIG_TDP_GET_TURBO_LIMIT_RATIOS req:%x resp:%x\n",
+               id->cpu, req, resp);
+
+       trl[0] = resp & GENMASK(7, 0);
+       trl[1] = (resp & GENMASK(15, 8)) >> 8;
+       trl[2] = (resp & GENMASK(23, 16)) >> 16;
+       trl[3] = (resp & GENMASK(31, 24)) >> 24;
+
+       req = level | BIT(8) | (avx_level << 16);
+       ret = isst_send_mbox_command(id->cpu, CONFIG_TDP,
+                                    CONFIG_TDP_GET_TURBO_LIMIT_RATIOS, 0, req,
+                                    &resp);
+       if (ret)
+               return ret;
+
+       debug_printf("cpu:%d CONFIG_TDP_GET_TURBO_LIMIT req:%x resp:%x\n", id->cpu,
+                    req, resp);
+
+       trl[4] = resp & GENMASK(7, 0);
+       trl[5] = (resp & GENMASK(15, 8)) >> 8;
+       trl[6] = (resp & GENMASK(23, 16)) >> 16;
+       trl[7] = (resp & GENMASK(31, 24)) >> 24;
+
+       return 0;
+}
+
 static struct isst_platform_ops mbox_ops = {
        .get_disp_freq_multiplier = mbox_get_disp_freq_multiplier,
        .get_trl_max_levels = mbox_get_trl_max_levels,
@@ -203,6 +242,7 @@ static struct isst_platform_ops mbox_ops = {
        .get_tdp_info = mbox_get_tdp_info,
        .get_pwr_info = mbox_get_pwr_info,
        .get_coremask_info = mbox_get_coremask_info,
+       .get_get_trl = mbox_get_get_trl,
 };
 
 struct isst_platform_ops *mbox_get_platform_ops(void)

diff --git a/tools/power/x86/intel-speed-select/isst-core.c b/tools/power/x86/intel-speed-select/isst-core.c
index 43884632694d9417110a13d8b2f7ed6c1f5a7f9f..6afae60d68fee215ab5feda9bd80a33a2f1b62d6 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-core.c
+++ b/tools/power/x86/intel-speed-select/isst-core.c
@@ -342,41 +342,8 @@ int isst_get_get_trl_from_msr(struct isst_id *id, int *trl)
 
 int isst_get_get_trl(struct isst_id *id, int level, int avx_level, int *trl)
 {
-       unsigned int req, resp;
-       int ret;
-
-       req = level | (avx_level << 16);
-       ret = isst_send_mbox_command(id->cpu, CONFIG_TDP,
-                                    CONFIG_TDP_GET_TURBO_LIMIT_RATIOS, 0, req,
-                                    &resp);
-       if (ret)
-               return ret;
-
-       debug_printf(
-               "cpu:%d CONFIG_TDP_GET_TURBO_LIMIT_RATIOS req:%x resp:%x\n",
-               id->cpu, req, resp);
-
-       trl[0] = resp & GENMASK(7, 0);
-       trl[1] = (resp & GENMASK(15, 8)) >> 8;
-       trl[2] = (resp & GENMASK(23, 16)) >> 16;
-       trl[3] = (resp & GENMASK(31, 24)) >> 24;
-
-       req = level | BIT(8) | (avx_level << 16);
-       ret = isst_send_mbox_command(id->cpu, CONFIG_TDP,
-                                    CONFIG_TDP_GET_TURBO_LIMIT_RATIOS, 0, req,
-                                    &resp);
-       if (ret)
-               return ret;
-
-       debug_printf("cpu:%d CONFIG_TDP_GET_TURBO_LIMIT req:%x resp:%x\n", id->cpu,
-                    req, resp);
-
-       trl[4] = resp & GENMASK(7, 0);
-       trl[5] = (resp & GENMASK(15, 8)) >> 8;
-       trl[6] = (resp & GENMASK(23, 16)) >> 16;
-       trl[7] = (resp & GENMASK(31, 24)) >> 24;
-
-       return 0;
+       CHECK_CB(get_get_trl);
+       return isst_ops->get_get_trl(id, level, avx_level, trl);
 }
 
 int isst_get_trl_bucket_info(struct isst_id *id, unsigned long long *buckets_info)

diff --git a/tools/power/x86/intel-speed-select/isst.h b/tools/power/x86/intel-speed-select/isst.h
index 0d5d35582d55a673d133b4b457cc973c9635b1cf..b8b1bdafc18babed3501be82e0326c991bb83ace 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst.h
+++ b/tools/power/x86/intel-speed-select/isst.h
@@ -191,6 +191,7 @@ struct isst_platform_ops {
        int (*get_tdp_info)(struct isst_id *id, int config_index, struct isst_pkg_ctdp_level_info *ctdp_level);
        int (*get_pwr_info)(struct isst_id *id, int config_index, struct isst_pkg_ctdp_level_info *ctdp_level);
        int (*get_coremask_info)(struct isst_id *id, int config_index, struct isst_pkg_ctdp_level_info *ctdp_level);
+       int (*get_get_trl)(struct isst_id *id, int level, int avx_level, int *trl);
 };
 
 extern int is_cpu_in_power_domain(int cpu, struct isst_id *id);