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

Allow platform specific implementation to enable/disable SST-TF/BF.

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 40e44fa..e6d3278 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-core-mbox.c
+++ b/tools/power/x86/intel-speed-select/isst-core-mbox.c
@@ -339,6 +339,57 @@ static int mbox_get_pbf_info(struct isst_id *id, int level, struct isst_pbf_info
        return 0;
 }
 
+static int mbox_set_pbf_fact_status(struct isst_id *id, int pbf, int enable)
+{
+       struct isst_pkg_ctdp pkg_dev;
+       struct isst_pkg_ctdp_level_info ctdp_level;
+       int current_level;
+       unsigned int req = 0, resp;
+       int ret;
+
+       ret = isst_get_ctdp_levels(id, &pkg_dev);
+       if (ret)
+               debug_printf("cpu:%d No support for dynamic ISST\n", id->cpu);
+
+       current_level = pkg_dev.current_level;
+
+       ret = isst_get_ctdp_control(id, current_level, &ctdp_level);
+       if (ret)
+               return ret;
+
+       if (pbf) {
+               if (ctdp_level.fact_enabled)
+                       req = BIT(16);
+
+               if (enable)
+                       req |= BIT(17);
+               else
+                       req &= ~BIT(17);
+       } else {
+
+               if (enable && !ctdp_level.sst_cp_enabled)
+                       isst_display_error_info_message(0, "Make sure to execute before: core-power enable", 0, 0);
+
+               if (ctdp_level.pbf_enabled)
+                       req = BIT(17);
+
+               if (enable)
+                       req |= BIT(16);
+               else
+                       req &= ~BIT(16);
+       }
+
+       ret = isst_send_mbox_command(id->cpu, CONFIG_TDP,
+                                    CONFIG_TDP_SET_TDP_CONTROL, 0, req, &resp);
+       if (ret)
+               return ret;
+
+       debug_printf("cpu:%d CONFIG_TDP_SET_TDP_CONTROL pbf/fact:%d req:%x\n",
+                    id->cpu, pbf, req);
+
+       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,
@@ -353,6 +404,7 @@ static struct isst_platform_ops mbox_ops = {
        .get_trl_bucket_info = mbox_get_trl_bucket_info,
        .set_tdp_level = mbox_set_tdp_level,
        .get_pbf_info = mbox_get_pbf_info,
+       .set_pbf_fact_status = mbox_set_pbf_fact_status,
 };
 
 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 41aa1ad..3765a1e 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-core.c
+++ b/tools/power/x86/intel-speed-select/isst-core.c
@@ -392,53 +392,8 @@ int isst_get_pbf_info(struct isst_id *id, int level, struct isst_pbf_info *pbf_i
 
 int isst_set_pbf_fact_status(struct isst_id *id, int pbf, int enable)
 {
-       struct isst_pkg_ctdp pkg_dev;
-       struct isst_pkg_ctdp_level_info ctdp_level;
-       int current_level;
-       unsigned int req = 0, resp;
-       int ret;
-
-       ret = isst_get_ctdp_levels(id, &pkg_dev);
-       if (ret)
-               debug_printf("cpu:%d No support for dynamic ISST\n", id->cpu);
-
-       current_level = pkg_dev.current_level;
-
-       ret = isst_get_ctdp_control(id, current_level, &ctdp_level);
-       if (ret)
-               return ret;
-
-       if (pbf) {
-               if (ctdp_level.fact_enabled)
-                       req = BIT(16);
-
-               if (enable)
-                       req |= BIT(17);
-               else
-                       req &= ~BIT(17);
-       } else {
-
-               if (enable && !ctdp_level.sst_cp_enabled)
-                       isst_display_error_info_message(0, "Make sure to execute before: core-power enable", 0, 0);
-
-               if (ctdp_level.pbf_enabled)
-                       req = BIT(17);
-
-               if (enable)
-                       req |= BIT(16);
-               else
-                       req &= ~BIT(16);
-       }
-
-       ret = isst_send_mbox_command(id->cpu, CONFIG_TDP,
-                                    CONFIG_TDP_SET_TDP_CONTROL, 0, req, &resp);
-       if (ret)
-               return ret;
-
-       debug_printf("cpu:%d CONFIG_TDP_SET_TDP_CONTROL pbf/fact:%d req:%x\n",
-                    id->cpu, pbf, req);
-
-       return 0;
+       CHECK_CB(set_pbf_fact_status);
+       return isst_ops->set_pbf_fact_status(id, pbf, enable);
 }
 
 int isst_get_fact_bucket_info(struct isst_id *id, int level,

diff --git a/tools/power/x86/intel-speed-select/isst.h b/tools/power/x86/intel-speed-select/isst.h
index 06e089e..e8251a1 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst.h
+++ b/tools/power/x86/intel-speed-select/isst.h
@@ -195,6 +195,7 @@ struct isst_platform_ops {
        int (*get_trl_bucket_info)(struct isst_id *id, int level, unsigned long long *buckets_info);
        int (*set_tdp_level)(struct isst_id *id, int tdp_level);
        int (*get_pbf_info)(struct isst_id *id, int level, struct isst_pbf_info *pbf_info);
+       int (*set_pbf_fact_status)(struct isst_id *id, int pbf, int enable);
 };
 
 extern int is_cpu_in_power_domain(int cpu, struct isst_id *id);