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

Allow platform specific implementation to get SST-TF/BF/CP capabilities
and status.

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 2d80438..0394b5b 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-core-mbox.c
+++ b/tools/power/x86/intel-speed-select/isst-core-mbox.c
@@ -67,12 +67,48 @@ static int mbox_get_config_levels(struct isst_id *id, struct isst_pkg_ctdp *pkg_
        return 0;
 }
 
+static int mbox_get_ctdp_control(struct isst_id *id, int config_index,
+                         struct isst_pkg_ctdp_level_info *ctdp_level)
+{
+       int cp_state, cp_cap;
+       unsigned int resp;
+       int ret;
+
+       ret = isst_send_mbox_command(id->cpu, CONFIG_TDP,
+                                    CONFIG_TDP_GET_TDP_CONTROL, 0,
+                                    config_index, &resp);
+       if (ret)
+               return ret;
+
+       ctdp_level->fact_support = resp & BIT(0);
+       ctdp_level->pbf_support = !!(resp & BIT(1));
+       ctdp_level->fact_enabled = !!(resp & BIT(16));
+       ctdp_level->pbf_enabled = !!(resp & BIT(17));
+
+       ret = isst_read_pm_config(id, &cp_state, &cp_cap);
+       if (ret) {
+               debug_printf("cpu:%d pm_config is not supported\n", id->cpu);
+       } else {
+               debug_printf("cpu:%d pm_config SST-CP state:%d cap:%d\n", id->cpu, cp_state, cp_cap);
+               ctdp_level->sst_cp_support = cp_cap;
+               ctdp_level->sst_cp_enabled = cp_state;
+       }
+
+       debug_printf(
+               "cpu:%d CONFIG_TDP_GET_TDP_CONTROL resp:%x fact_support:%d pbf_support: %d fact_enabled:%d pbf_enabled:%d\n",
+               id->cpu, resp, ctdp_level->fact_support, ctdp_level->pbf_support,
+               ctdp_level->fact_enabled, ctdp_level->pbf_enabled);
+
+       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,
        .get_trl_level_name = mbox_get_trl_level_name,
        .is_punit_valid = mbox_is_punit_valid,
        .get_config_levels = mbox_get_config_levels,
+       .get_ctdp_control = mbox_get_ctdp_control,
 };
 
 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 0cc5075..3d6fbf7 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-core.c
+++ b/tools/power/x86/intel-speed-select/isst-core.c
@@ -294,36 +294,8 @@ int isst_get_ctdp_levels(struct isst_id *id, struct isst_pkg_ctdp *pkg_dev)
 int isst_get_ctdp_control(struct isst_id *id, int config_index,
                          struct isst_pkg_ctdp_level_info *ctdp_level)
 {
-       int cp_state, cp_cap;
-       unsigned int resp;
-       int ret;
-
-       ret = isst_send_mbox_command(id->cpu, CONFIG_TDP,
-                                    CONFIG_TDP_GET_TDP_CONTROL, 0,
-                                    config_index, &resp);
-       if (ret)
-               return ret;
-
-       ctdp_level->fact_support = resp & BIT(0);
-       ctdp_level->pbf_support = !!(resp & BIT(1));
-       ctdp_level->fact_enabled = !!(resp & BIT(16));
-       ctdp_level->pbf_enabled = !!(resp & BIT(17));
-
-       ret = isst_read_pm_config(id, &cp_state, &cp_cap);
-       if (ret) {
-               debug_printf("cpu:%d pm_config is not supported\n", id->cpu);
-       } else {
-               debug_printf("cpu:%d pm_config SST-CP state:%d cap:%d\n", id->cpu, cp_state, cp_cap);
-               ctdp_level->sst_cp_support = cp_cap;
-               ctdp_level->sst_cp_enabled = cp_state;
-       }
-
-       debug_printf(
-               "cpu:%d CONFIG_TDP_GET_TDP_CONTROL resp:%x fact_support:%d pbf_support: %d fact_enabled:%d pbf_enabled:%d\n",
-               id->cpu, resp, ctdp_level->fact_support, ctdp_level->pbf_support,
-               ctdp_level->fact_enabled, ctdp_level->pbf_enabled);
-
-       return 0;
+       CHECK_CB(get_ctdp_control);
+       return isst_ops->get_ctdp_control(id, config_index, ctdp_level);
 }
 
 int isst_get_tdp_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 03ad9e3..496e5c4 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst.h
+++ b/tools/power/x86/intel-speed-select/isst.h
@@ -187,6 +187,7 @@ struct isst_platform_ops {
        char *(*get_trl_level_name)(int level);
        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);
 };
 
 extern int is_cpu_in_power_domain(int cpu, struct isst_id *id);