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

Allow platform specific implementation to set per core CLOS setting.

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 4e86cce..ca43cfc 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-core-mbox.c
+++ b/tools/power/x86/intel-speed-select/isst-core-mbox.c
@@ -776,6 +776,28 @@ static int mbox_clos_get_assoc_status(struct isst_id *id, int *clos_id)
 
        return 0;
 }
+
+static int mbox_clos_associate(struct isst_id *id, int clos_id)
+{
+       unsigned int req, resp;
+       unsigned int param;
+       int core_id, ret;
+
+       req = (clos_id & 0x03) << 16;
+       core_id = find_phy_core_num(id->cpu);
+       param = BIT(MBOX_CMD_WRITE_BIT) | core_id;
+
+       ret = isst_send_mbox_command(id->cpu, CONFIG_CLOS, CLOS_PQR_ASSOC, param,
+                                    req, &resp);
+       if (ret)
+               return ret;
+
+       debug_printf("cpu:%d CLOS_PQR_ASSOC param:%x req:%x\n", id->cpu, param,
+                    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,
@@ -799,6 +821,7 @@ static struct isst_platform_ops mbox_ops = {
        .pm_get_clos = mbox_pm_get_clos,
        .set_clos = mbox_set_clos,
        .clos_get_assoc_status = mbox_clos_get_assoc_status,
+       .clos_associate = mbox_clos_associate,
 };
 
 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 c006224..8ef71a8 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst-core.c
+++ b/tools/power/x86/intel-speed-select/isst-core.c
@@ -645,21 +645,7 @@ int isst_clos_get_assoc_status(struct isst_id *id, int *clos_id)
 
 int isst_clos_associate(struct isst_id *id, int clos_id)
 {
-       unsigned int req, resp;
-       unsigned int param;
-       int core_id, ret;
+       CHECK_CB(clos_associate);
+       return isst_ops->clos_associate(id, clos_id);
 
-       req = (clos_id & 0x03) << 16;
-       core_id = find_phy_core_num(id->cpu);
-       param = BIT(MBOX_CMD_WRITE_BIT) | core_id;
-
-       ret = isst_send_mbox_command(id->cpu, CONFIG_CLOS, CLOS_PQR_ASSOC, param,
-                                    req, &resp);
-       if (ret)
-               return ret;
-
-       debug_printf("cpu:%d CLOS_PQR_ASSOC param:%x req:%x\n", id->cpu, param,
-                    req);
-
-       return 0;
 }

diff --git a/tools/power/x86/intel-speed-select/isst.h b/tools/power/x86/intel-speed-select/isst.h
index 5794b31..752991e 100644 (file)
--- a/tools/power/x86/intel-speed-select/isst.h
+++ b/tools/power/x86/intel-speed-select/isst.h
@@ -204,6 +204,7 @@ struct isst_platform_ops {
        int (*pm_get_clos)(struct isst_id *id, int clos, struct isst_clos_config *clos_config);
        int (*set_clos)(struct isst_id *id, int clos, struct isst_clos_config *clos_config);
        int (*clos_get_assoc_status)(struct isst_id *id, int *clos_id);
+       int (*clos_associate)(struct isst_id *id, int clos_id);
 };
 
 extern int is_cpu_in_power_domain(int cpu, struct isst_id *id);