examples/vm_power_manager: add per-core turbo

Add extra commands to command line to allow enable/disable of
per-core turbo.

When a core has turbo enabled, calling for max frequency will allow it to
go to a turbo frequency (P0n).

When a core has turbo disabled, calling for max frequency will allow it to
go to the maximum non-turbo frequency (P1), but not beyond.

Signed-off-by: David Hunt <david.hunt@intel.com>

diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c
index e7f5cc4..ac40dac 100644 (file)
--- a/examples/vm_power_manager/channel_monitor.c
+++ b/examples/vm_power_manager/channel_monitor.c
@@ -105,6 +105,12 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info)
                        case(CPU_POWER_SCALE_UP):
                                        power_manager_scale_core_up(core_num);
                        break;
+                       case(CPU_POWER_ENABLE_TURBO):
+                               power_manager_enable_turbo_core(core_num);
+                       break;
+                       case(CPU_POWER_DISABLE_TURBO):
+                               power_manager_disable_turbo_core(core_num);
+                       break;
                        default:
                                break;
                        }
@@ -122,6 +128,12 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info)
                        case(CPU_POWER_SCALE_UP):
                                        power_manager_scale_mask_up(core_mask);
                        break;
+                       case(CPU_POWER_ENABLE_TURBO):
+                               power_manager_enable_turbo_mask(core_mask);
+                       break;
+                       case(CPU_POWER_DISABLE_TURBO):
+                               power_manager_disable_turbo_mask(core_mask);
+                       break;
                        default:
                                break;
                        }

diff --git a/examples/vm_power_manager/power_manager.c b/examples/vm_power_manager/power_manager.c
index 2644fce..80705f9 100644 (file)
--- a/examples/vm_power_manager/power_manager.c
+++ b/examples/vm_power_manager/power_manager.c
@@ -215,6 +215,24 @@ power_manager_scale_mask_max(uint64_t core_mask)
        return ret;
 }
 
+int
+power_manager_enable_turbo_mask(uint64_t core_mask)
+{
+       int ret = 0;
+
+       POWER_SCALE_MASK(enable_turbo, core_mask, ret);
+       return ret;
+}
+
+int
+power_manager_disable_turbo_mask(uint64_t core_mask)
+{
+       int ret = 0;
+
+       POWER_SCALE_MASK(disable_turbo, core_mask, ret);
+       return ret;
+}
+
 int
 power_manager_scale_core_up(unsigned core_num)
 {
@@ -250,3 +268,21 @@ power_manager_scale_core_max(unsigned core_num)
        POWER_SCALE_CORE(max, core_num, ret);
        return ret;
 }
+
+int
+power_manager_enable_turbo_core(unsigned int core_num)
+{
+       int ret = 0;
+
+       POWER_SCALE_CORE(enable_turbo, core_num, ret);
+       return ret;
+}
+
+int
+power_manager_disable_turbo_core(unsigned int core_num)
+{
+       int ret = 0;
+
+       POWER_SCALE_CORE(disable_turbo, core_num, ret);
+       return ret;
+}

diff --git a/examples/vm_power_manager/power_manager.h b/examples/vm_power_manager/power_manager.h
index 1b45bab..b74d09b 100644 (file)
--- a/examples/vm_power_manager/power_manager.h
+++ b/examples/vm_power_manager/power_manager.h
@@ -112,6 +112,32 @@ int power_manager_scale_mask_min(uint64_t core_mask);
  */
 int power_manager_scale_mask_max(uint64_t core_mask);
 
+/**
+ * Enable Turbo Boost on the cores specified in core_mask.
+ * It is thread-safe.
+ *
+ * @param core_mask
+ *  The uint64_t bit-mask of cores to change frequency.
+ *
+ * @return
+ *  - 1 on success.
+ *  - Negative on error.
+ */
+int power_manager_enable_turbo_mask(uint64_t core_mask);
+
+/**
+ * Disable Turbo Boost on the cores specified in core_mask.
+ * It is thread-safe.
+ *
+ * @param core_mask
+ *  The uint64_t bit-mask of cores to change frequency.
+ *
+ * @return
+ *  - 1 on success.
+ *  - Negative on error.
+ */
+int power_manager_disable_turbo_mask(uint64_t core_mask);
+
 /**
  * Scale up frequency for the core specified by core_num.
  * It is thread-safe.
@@ -167,6 +193,32 @@ int power_manager_scale_core_min(unsigned core_num);
  */
 int power_manager_scale_core_max(unsigned core_num);
 
+/**
+ * Enable Turbo Boost for the core specified by core_num.
+ * It is thread-safe.
+ *
+ * @param core_num
+ *  The core number to boost
+ *
+ * @return
+ *  - 1 on success.
+ *  - Negative on error.
+ */
+int power_manager_enable_turbo_core(unsigned int core_num);
+
+/**
+ * Disable Turbo Boost for the core specified by core_num.
+ * It is thread-safe.
+ *
+ * @param core_num
+ *  The core number to boost
+ *
+ * @return
+ *  - 1 on success.
+ *  - Negative on error.
+ */
+int power_manager_disable_turbo_core(unsigned int core_num);
+
 /**
  * Get the current freuency of the core specified by core_num
  *

diff --git a/examples/vm_power_manager/vm_power_cli.c b/examples/vm_power_manager/vm_power_cli.c
index c5e8d93..6f234fb 100644 (file)
--- a/examples/vm_power_manager/vm_power_cli.c
+++ b/examples/vm_power_manager/vm_power_cli.c
@@ -520,6 +520,10 @@ cmd_set_cpu_freq_mask_parsed(void *parsed_result, struct cmdline *cl,
                ret = power_manager_scale_mask_min(res->core_mask);
        else if (!strcmp(res->cmd , "max"))
                ret = power_manager_scale_mask_max(res->core_mask);
+       else if (!strcmp(res->cmd, "enable_turbo"))
+               ret = power_manager_enable_turbo_mask(res->core_mask);
+       else if (!strcmp(res->cmd, "disable_turbo"))
+               ret = power_manager_disable_turbo_mask(res->core_mask);
        if (ret < 0) {
                cmdline_printf(cl, "Error scaling core_mask(0x%"PRIx64") '%s' , not "
                                "all cores specified have been scaled\n",
@@ -535,14 +539,13 @@ cmdline_parse_token_num_t cmd_set_cpu_freq_mask_core_mask =
                        core_mask, UINT64);
 cmdline_parse_token_string_t cmd_set_cpu_freq_mask_result =
        TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_mask_result,
-                       cmd, "up#down#min#max");
+                       cmd, "up#down#min#max#enable_turbo#disable_turbo");
 
 cmdline_parse_inst_t cmd_set_cpu_freq_mask_set = {
        .f = cmd_set_cpu_freq_mask_parsed,
        .data = NULL,
-       .help_str = "set_cpu_freq <core_mask> <up|down|min|max>, Set the current "
-                       "frequency for the cores specified in <core_mask> by scaling "
-                       "each up/down/min/max.",
+       .help_str = "set_cpu_freq <core_mask> <up|down|min|max|enable_turbo|disable_turbo>, adjust the current "
+                       "frequency for the cores specified in <core_mask>",
        .tokens = {
                (void *)&cmd_set_cpu_freq_mask,
                (void *)&cmd_set_cpu_freq_mask_core_mask,
@@ -614,6 +617,10 @@ cmd_set_cpu_freq_parsed(void *parsed_result, struct cmdline *cl,
                ret = power_manager_scale_core_min(res->core_num);
        else if (!strcmp(res->cmd , "max"))
                ret = power_manager_scale_core_max(res->core_num);
+       else if (!strcmp(res->cmd, "enable_turbo"))
+               ret = power_manager_enable_turbo_core(res->core_num);
+       else if (!strcmp(res->cmd, "disable_turbo"))
+               ret = power_manager_disable_turbo_core(res->core_num);
        if (ret < 0) {
                cmdline_printf(cl, "Error scaling core(%u) '%s'\n", res->core_num,
                                res->cmd);
@@ -628,13 +635,13 @@ cmdline_parse_token_num_t cmd_set_cpu_freq_core_num =
                        core_num, UINT8);
 cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd =
        TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result,
-                       cmd, "up#down#min#max");
+                       cmd, "up#down#min#max#enable_turbo#disable_turbo");
 
 cmdline_parse_inst_t cmd_set_cpu_freq_set = {
        .f = cmd_set_cpu_freq_parsed,
        .data = NULL,
-       .help_str = "set_cpu_freq <core_num> <up|down|min|max>, Set the current "
-                       "frequency for the specified core by scaling up/down/min/max",
+       .help_str = "set_cpu_freq <core_num> <up|down|min|max|enable_turbo|disable_turbo>, adjust the current "
+                       "frequency for the specified core",
        .tokens = {
                (void *)&cmd_set_cpu_freq,
                (void *)&cmd_set_cpu_freq_core_num,