pass: pmqos: Rename the min/max level property of scenario section

This patch renames the min/max level property in 'Scenario(x)' section as
following:
- cpufreq_min_level -> min_level
- cpufreq_max_level -> max_level

It means that if 'Scenario(x)' section contains the minimum/maximum level
property according to each scenario. The renamed property don't depend on
the any specific h/w resource.

Change-Id: I61ec570a5d607bacc63270d0a72a5196057ee392
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/src/pass/pass-parser.c b/src/pass/pass-parser.c
index b6500a3a4be96a0f8a6f3dbfa46555f31a36a108..cc5fbe491f25d3dc3a9cf14d4f3f80b9c019f8ef 100644 (file)
--- a/src/pass/pass-parser.c
+++ b/src/pass/pass-parser.c
@@ -98,18 +98,10 @@ static int pass_parse_scenario(struct parse_result *result, void *user_data,
                scenario->list[index].state = is_supported(result->value);
                if (scenario->list[index].state < 0)
                        return -EINVAL;
-       } else if (MATCH(result->name, "cpufreq_min_level")) {
-               scenario->list[index].cpufreq_min_level = atoi(result->value);
-       } else if (MATCH(result->name, "cpufreq_max_level")) {
-               scenario->list[index].cpufreq_max_level = atoi(result->value);
-       } else if (MATCH(result->name, "busfreq_min_level")) {
-               scenario->list[index].busfreq_min_level = atoi(result->value);
-       } else if (MATCH(result->name, "busfreq_max_level")) {
-               scenario->list[index].busfreq_max_level = atoi(result->value);
-       } else if (MATCH(result->name, "gpufreq_min_level")) {
-               scenario->list[index].gpufreq_min_level = atoi(result->value);
-       } else if (MATCH(result->name, "gpufreq_max_level")) {
-               scenario->list[index].gpufreq_max_level = atoi(result->value);
+       } else if (MATCH(result->name, "min_level")) {
+               scenario->list[index].min_level = atoi(result->value);
+       } else if (MATCH(result->name, "max_level")) {
+               scenario->list[index].max_level = atoi(result->value);
        }
 
        return 0;

diff --git a/src/pass/pass-pmqos.c b/src/pass/pass-pmqos.c
index a589d3c7b0cae9da07b11185b01ac7f1fd57d738..6d23fc797aea26c2db3c4090ab6b12df91e02918 100644 (file)
--- a/src/pass/pass-pmqos.c
+++ b/src/pass/pass-pmqos.c
@@ -117,8 +117,8 @@ int pass_notifier_pmqos_func(struct pass_policy *policy, void *data)
        struct pass_scenario *scn = NULL;
        enum pass_state locked = PASS_UNUSED;
        char name[PASS_NAME_LEN] = {""};
-       unsigned int cpufreq_min_level = 0;
-       unsigned int cpufreq_max_level = 0;
+       unsigned int min_level = 0;
+       unsigned int max_level = 0;
        int count = 0;
        int index = -1;
        int i;
@@ -168,24 +168,20 @@ int pass_notifier_pmqos_func(struct pass_policy *policy, void *data)
                struct pass_scenario *scn = &scenario->list[i];
 
                if (is_scenario_locked(scn)) {
-                       if (scn->cpufreq_min_level > cpufreq_min_level)
-                               cpufreq_min_level = scn->cpufreq_min_level;
-                       if (scn->cpufreq_max_level > cpufreq_max_level)
-                               cpufreq_max_level = scn->cpufreq_max_level;
+                       if (scn->min_level > min_level)
+                               min_level = scn->min_level;
+                       if (scn->max_level > max_level)
+                               max_level = scn->max_level;
                        count++;
                }
-
-               /*
-                * TODO: PASS have to control busfreq/gpufreq as same as cpufreq
-                */
        }
 
        /*
         * Restore default min/max level if all scenarios hasn't locked state.
         */
        if (!is_scenario_locked(scn) && !count) {
-               cpufreq_min_level = policy->default_min_level;
-               cpufreq_max_level = policy->default_max_level;
+               min_level = policy->default_min_level;
+               max_level = policy->default_max_level;
        }
 
        if (locked) {
@@ -197,10 +193,7 @@ int pass_notifier_pmqos_func(struct pass_policy *policy, void *data)
                        (pass_get_time_ms() - scenario->list[index].locked_time));
        }
 
-       pass_governor_change_level_scope(policy, cpufreq_min_level,
-                                        cpufreq_max_level);
-
-       /* TODO: PASS have to control busfreq/gpufreq as same as cpufreq. */
+       pass_governor_change_level_scope(policy, min_level, max_level);
 
        return 0;
 }

diff --git a/src/pass/pass.h b/src/pass/pass.h
index b30a79e586a13e97103992c8b77da6205fe6b6de..a2f0eb30bce1134287bac605a43e0e9c7984fee1 100644 (file)
--- a/src/pass/pass.h
+++ b/src/pass/pass.h
@@ -183,14 +183,8 @@ struct pass_scenario {
        enum pass_state locked;
        int64_t locked_time;
 
-       unsigned int cpufreq_min_level;
-       unsigned int cpufreq_max_level;
-
-       unsigned int busfreq_min_level;
-       unsigned int busfreq_max_level;
-
-       unsigned int gpufreq_min_level;
-       unsigned int gpufreq_max_level;
+       unsigned int min_level;
+       unsigned int max_level;
 };
 
 struct pass_scenario_policy {