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

Allow platform specific implementation to get TDP information.

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 0394b5b..3353786 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-core-mbox.c
+++ b/tools/power/x86/intel-speed-select/isst-core-mbox.c
@@ -102,6 +102,29 @@ static int mbox_get_ctdp_control(struct isst_id *id, int config_index,
        return 0;
 }
 
+static int mbox_get_tdp_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_TDP_INFO,
+                                    0, config_index, &resp);
+       if (ret) {
+               isst_display_error_info_message(1, "Invalid level, Can't get TDP information at level", 1, config_index);
+               return ret;
+       }
+
+       ctdp_level->pkg_tdp = resp & GENMASK(14, 0);
+       ctdp_level->tdp_ratio = (resp & GENMASK(23, 16)) >> 16;
+
+       debug_printf(
+               "cpu:%d ctdp:%d CONFIG_TDP_GET_TDP_INFO resp:%x tdp_ratio:%d pkg_tdp:%d\n",
+               id->cpu, config_index, resp, ctdp_level->tdp_ratio,
+               ctdp_level->pkg_tdp);
+       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,
@@ -109,6 +132,7 @@ static struct isst_platform_ops mbox_ops = {
        .is_punit_valid = mbox_is_punit_valid,
        .get_config_levels = mbox_get_config_levels,
        .get_ctdp_control = mbox_get_ctdp_control,
+       .get_tdp_info = mbox_get_tdp_info,
 };
 
 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 3d6fbf7..b4f285d 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-core.c
+++ b/tools/power/x86/intel-speed-select/isst-core.c
@@ -301,24 +301,8 @@ int isst_get_ctdp_control(struct isst_id *id, int config_index,
 int isst_get_tdp_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_TDP_INFO,
-                                    0, config_index, &resp);
-       if (ret) {
-               isst_display_error_info_message(1, "Invalid level, Can't get TDP information at level", 1, config_index);
-               return ret;
-       }
-
-       ctdp_level->pkg_tdp = resp & GENMASK(14, 0);
-       ctdp_level->tdp_ratio = (resp & GENMASK(23, 16)) >> 16;
-
-       debug_printf(
-               "cpu:%d ctdp:%d CONFIG_TDP_GET_TDP_INFO resp:%x tdp_ratio:%d pkg_tdp:%d\n",
-               id->cpu, config_index, resp, ctdp_level->tdp_ratio,
-               ctdp_level->pkg_tdp);
-       return 0;
+       CHECK_CB(get_tdp_info);
+       return isst_ops->get_tdp_info(id, config_index, ctdp_level);
 }
 
 int isst_get_pwr_info(struct isst_id *id, int config_index,

diff --git a/tools/power/x86/intel-speed-select/isst.h b/tools/power/x86/intel-speed-select/isst.h
index 496e5c4..ed8bcb2 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst.h
+++ b/tools/power/x86/intel-speed-select/isst.h
@@ -188,6 +188,7 @@ struct isst_platform_ops {
        int (*is_punit_valid)(struct isst_id *id);
        int (*get_config_levels)(struct isst_id *id, struct isst_pkg_ctdp *pkg_ctdp);
        int (*get_ctdp_control)(struct isst_id *id, int config_index, struct isst_pkg_ctdp_level_info *ctdp_level);
+       int (*get_tdp_info)(struct isst_id *id, int config_index, struct isst_pkg_ctdp_level_info *ctdp_level);
 };
 
 extern int is_cpu_in_power_domain(int cpu, struct isst_id *id);