pass: parser: Change 'limit_max_cpu' name to 'limit_min_cpu'

The PASS uses the 'limit_max_cpu' as the minimum number of online cpu.
This name is not matched with the meaning of 'limit_max_cpu'.
So, this patch changes the name of 'limit_max_cpu' to 'limit_min_cpu'
to improve the readability of property in configuration files.

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

diff --git a/src/pass/pass-cluster0.conf b/src/pass/pass-cluster0.conf
index f77a75145892e861ae5f17d18c4c6ec97b292170..98a73d6e489a8918f7fc76dfc7e6be827d5aced3 100644 (file)
--- a/src/pass/pass-cluster0.conf
+++ b/src/pass/pass-cluster0.conf
@@ -19,7 +19,7 @@ pass_governor_timeout=0.4
 
 [Level0]
 limit_max_freq=1000000
-limit_max_cpu=1
+limit_min_cpu=1
 num_down_cond=0
 num_up_cond=1
 num_up_cond_freq=800000
@@ -30,7 +30,7 @@ num_right_cond_busy_cpu=1
 
 [Level1]
 limit_max_freq=1000000
-limit_max_cpu=2
+limit_min_cpu=2
 num_down_cond=0
 num_up_cond=1
 num_up_cond_freq=800000
@@ -43,7 +43,7 @@ num_right_cond_busy_cpu=2
 
 [Level2]
 limit_max_freq=1000000
-limit_max_cpu=3
+limit_min_cpu=3
 num_down_cond=0
 num_up_cond=1
 num_up_cond_freq=800000
@@ -56,7 +56,7 @@ num_right_cond_busy_cpu=3
 
 [Level3]
 limit_max_freq=1000000
-limit_max_cpu=4
+limit_min_cpu=4
 num_down_cond=0
 num_up_cond=1
 num_up_cond_freq=800000
@@ -67,7 +67,7 @@ num_right_cond=0
 
 [Level4]
 limit_max_freq=1200000
-limit_max_cpu=1
+limit_min_cpu=1
 num_down_cond=1
 num_down_cond_freq=1000000
 num_up_cond=1
@@ -79,7 +79,7 @@ num_right_cond_busy_cpu=1
 
 [Level5]
 limit_max_freq=1200000
-limit_max_cpu=2
+limit_min_cpu=2
 num_down_cond=1
 num_down_cond_freq=1000000
 num_up_cond=1
@@ -93,7 +93,7 @@ num_right_cond_busy_cpu=2
 
 [Level6]
 limit_max_freq=1200000
-limit_max_cpu=3
+limit_min_cpu=3
 num_down_cond=1
 num_down_cond_freq=1000000
 num_up_cond=1
@@ -107,7 +107,7 @@ num_right_cond_busy_cpu=3
 
 [Level7]
 limit_max_freq=1200000
-limit_max_cpu=4
+limit_min_cpu=4
 num_down_cond=1
 num_down_cond_freq=1000000
 num_up_cond=1
@@ -119,7 +119,7 @@ num_right_cond=0
 
 [Level8]
 limit_max_freq=1300000
-limit_max_cpu=1
+limit_min_cpu=1
 num_down_cond=1
 num_down_cond_freq=1200000
 num_up_cond=1
@@ -131,7 +131,7 @@ num_right_cond_busy_cpu=1
 
 [Level9]
 limit_max_freq=1300000
-limit_max_cpu=2
+limit_min_cpu=2
 num_down_cond=1
 num_down_cond_freq=1200000
 num_up_cond=1
@@ -145,7 +145,7 @@ num_right_cond_busy_cpu=2
 
 [Level10]
 limit_max_freq=1300000
-limit_max_cpu=3
+limit_min_cpu=3
 num_down_cond=1
 num_down_cond_freq=1200000
 num_up_cond=1
@@ -159,7 +159,7 @@ num_right_cond_busy_cpu=3
 
 [Level11]
 limit_max_freq=1300000
-limit_max_cpu=4
+limit_min_cpu=4
 num_down_cond=1
 num_down_cond_freq=1200000
 num_up_cond=1

diff --git a/src/pass/pass-cluster1.conf b/src/pass/pass-cluster1.conf
index bf7a7c3aa9f2395006e7c7938d04462b313d3623..9f65eee829c3edad992068781c57f858f69606a4 100644 (file)
--- a/src/pass/pass-cluster1.conf
+++ b/src/pass/pass-cluster1.conf
@@ -19,7 +19,7 @@ pass_governor_timeout=0.4
 
 [Level0]
 limit_max_freq=1000000
-limit_max_cpu=1
+limit_min_cpu=1
 num_down_cond=0
 num_up_cond=1
 num_up_cond_freq=1000000
@@ -30,7 +30,7 @@ num_right_cond_busy_cpu=1
 
 [Level1]
 limit_max_freq=1000000
-limit_max_cpu=2
+limit_min_cpu=2
 num_down_cond=0
 num_up_cond=1
 num_up_cond_freq=1000000
@@ -43,7 +43,7 @@ num_right_cond_busy_cpu=2
 
 [Level2]
 limit_max_freq=1000000
-limit_max_cpu=3
+limit_min_cpu=3
 num_down_cond=0
 num_up_cond=1
 num_up_cond_freq=1000000
@@ -56,7 +56,7 @@ num_right_cond_busy_cpu=3
 
 [Level3]
 limit_max_freq=1000000
-limit_max_cpu=4
+limit_min_cpu=4
 num_down_cond=0
 num_up_cond=1
 num_up_cond_freq=1000000
@@ -67,7 +67,7 @@ num_right_cond=0
 
 [Level4]
 limit_max_freq=1200000
-limit_max_cpu=1
+limit_min_cpu=1
 num_down_cond=1
 num_down_cond_freq=1000000
 num_up_cond=1
@@ -79,7 +79,7 @@ num_right_cond_busy_cpu=1
 
 [Level5]
 limit_max_freq=1200000
-limit_max_cpu=2
+limit_min_cpu=2
 num_down_cond=1
 num_down_cond_freq=1000000
 num_up_cond=1
@@ -93,7 +93,7 @@ num_right_cond_busy_cpu=2
 
 [Level6]
 limit_max_freq=1200000
-limit_max_cpu=3
+limit_min_cpu=3
 num_down_cond=1
 num_down_cond_freq=1000000
 num_up_cond=1
@@ -107,7 +107,7 @@ num_right_cond_busy_cpu=3
 
 [Level7]
 limit_max_freq=1200000
-limit_max_cpu=4
+limit_min_cpu=4
 num_down_cond=1
 num_down_cond_freq=1000000
 num_up_cond=1
@@ -119,7 +119,7 @@ num_right_cond=0
 
 [Level8]
 limit_max_freq=1300000
-limit_max_cpu=1
+limit_min_cpu=1
 num_down_cond=1
 num_down_cond_freq=1100000
 num_up_cond=1
@@ -131,7 +131,7 @@ num_right_cond_busy_cpu=1
 
 [Level9]
 limit_max_freq=1300000
-limit_max_cpu=2
+limit_min_cpu=2
 num_down_cond=1
 num_down_cond_freq=1100000
 num_up_cond=1
@@ -145,7 +145,7 @@ num_right_cond_busy_cpu=2
 
 [Level10]
 limit_max_freq=1300000
-limit_max_cpu=3
+limit_min_cpu=3
 num_down_cond=1
 num_down_cond_freq=1100000
 num_up_cond=1
@@ -159,7 +159,7 @@ num_right_cond_busy_cpu=3
 
 [Level11]
 limit_max_freq=1300000
-limit_max_cpu=4
+limit_min_cpu=4
 num_down_cond=1
 num_down_cond_freq=1100000
 num_up_cond=1
@@ -171,7 +171,7 @@ num_right_cond=0
 
 [Level12]
 limit_max_freq=1500000
-limit_max_cpu=1
+limit_min_cpu=1
 num_down_cond=1
 num_down_cond_freq=1300000
 num_up_cond=1
@@ -183,7 +183,7 @@ num_right_cond_busy_cpu=1
 
 [Level13]
 limit_max_freq=1500000
-limit_max_cpu=2
+limit_min_cpu=2
 num_down_cond=1
 num_down_cond_freq=1300000
 num_up_cond=1
@@ -197,7 +197,7 @@ num_right_cond_busy_cpu=2
 
 [Level14]
 limit_max_freq=1500000
-limit_max_cpu=3
+limit_min_cpu=3
 num_down_cond=1
 num_down_cond_freq=1300000
 num_up_cond=1
@@ -211,7 +211,7 @@ num_right_cond_busy_cpu=3
 
 [Level15]
 limit_max_freq=1500000
-limit_max_cpu=4
+limit_min_cpu=4
 num_down_cond=1
 num_down_cond_freq=1300000
 num_up_cond=1
@@ -223,7 +223,7 @@ num_right_cond=0
 
 [Level16]
 limit_max_freq=1700000
-limit_max_cpu=1
+limit_min_cpu=1
 num_down_cond=1
 num_down_cond_freq=1500000
 num_up_cond=0
@@ -234,7 +234,7 @@ num_right_cond_busy_cpu=1
 
 [Level17]
 limit_max_freq=1700000
-limit_max_cpu=2
+limit_min_cpu=2
 num_down_cond=1
 num_down_cond_freq=1500000
 num_up_cond=0
@@ -247,7 +247,7 @@ num_right_cond_busy_cpu=2
 
 [Level18]
 limit_max_freq=1700000
-limit_max_cpu=3
+limit_min_cpu=3
 num_down_cond=1
 num_down_cond_freq=1500000
 num_up_cond=0
@@ -260,7 +260,7 @@ num_right_cond_busy_cpu=3
 
 [Level19]
 limit_max_freq=1700000
-limit_max_cpu=4
+limit_min_cpu=4
 num_down_cond=1
 num_down_cond_freq=1500000
 num_up_cond=0

diff --git a/src/pass/pass-gov.c b/src/pass/pass-gov.c
index d8ecab0de305a6e674d20d8c43811f8d508a9f6a..7dab679c842816bbd5aa972d7318fc929362d4d1 100644 (file)
--- a/src/pass/pass-gov.c
+++ b/src/pass/pass-gov.c
@@ -167,7 +167,7 @@ static void pass_hotplug_stop(struct pass_policy *policy)
        if (!policy->hotplug)
                return;
 
-       policy->hotplug->online = table[level].limit_max_cpu;
+       policy->hotplug->online = table[level].limit_min_cpu;
        policy->hotplug->max_online = policy->cpufreq.num_nr_cpus;
 }
 
@@ -175,7 +175,7 @@ static int pass_hotplug_dummy_governor(struct pass_policy *policy)
 {
        int level = policy->curr_level;
 
-       return policy->pass_table[level].limit_max_cpu;
+       return policy->pass_table[level].limit_min_cpu;
 }
 
 /*
@@ -227,7 +227,7 @@ static int pass_governor_change_level(struct pass_policy *policy, int new_level)
        int curr_level = policy->curr_level;
        int limit_max_freq;
        int limit_min_freq;
-       int limit_max_cpu;
+       int limit_min_cpu;
        int online;
        int ret;
 
@@ -246,15 +246,15 @@ static int pass_governor_change_level(struct pass_policy *policy, int new_level)
         */
        limit_max_freq = table[new_level].limit_max_freq;
        limit_min_freq = table[new_level].limit_min_freq;
-       limit_max_cpu = table[new_level].limit_max_cpu;
+       limit_min_cpu = table[new_level].limit_min_cpu;
 
        policy->prev_level = policy->curr_level;
        policy->curr_level = new_level;
 
        /* Turn on/off CPUs according the maximum number of online CPU */
        if (hotplug) {
-               if (hotplug->max_online != limit_max_cpu)
-                       hotplug->max_online = limit_max_cpu;
+               if (hotplug->max_online != limit_min_cpu)
+                       hotplug->max_online = limit_min_cpu;
 
                if (hotplug->governor)
                        online = hotplug->governor(policy);
@@ -289,7 +289,7 @@ static int pass_governor_change_level(struct pass_policy *policy, int new_level)
                pass_res->cdata.res_name,
                (curr_level > new_level ? "DOWN" : "UP"),
                curr_level, new_level,
-               limit_max_freq, limit_min_freq, limit_max_cpu);
+               limit_max_freq, limit_min_freq, limit_min_cpu);
        */
 
        return 0;
@@ -313,11 +313,11 @@ static void pass_calculate_busy_cpu(struct pass_policy *policy)
        unsigned int sum_load;
        unsigned int sum_runnable_load;
        unsigned int nr_runnings;
-       int limit_max_cpu;
+       int limit_min_cpu;
        int i;
        int j;
 
-       limit_max_cpu = table[level].limit_max_cpu;
+       limit_min_cpu = table[level].limit_min_cpu;
 
        for (i = 0; i < policy->num_pass_cpu_stats; i++) {
                cur_freq = stats[i].freq;
@@ -350,8 +350,8 @@ static void pass_calculate_busy_cpu(struct pass_policy *policy)
                }
 
                stats[i].num_busy_cpu = busy_cpu;
-               stats[i].avg_load = sum_load / limit_max_cpu;
-               stats[i].avg_runnable_load = sum_runnable_load / limit_max_cpu;
+               stats[i].avg_load = sum_load / limit_min_cpu;
+               stats[i].avg_runnable_load = sum_runnable_load / limit_min_cpu;
                if (nr_runnings) {
                        stats[i].avg_thread_load
                                = (sum_load * 100) / nr_runnings;

diff --git a/src/pass/pass-micro.conf b/src/pass/pass-micro.conf
index 48ce2de3c5fd5b112b7ba73c49ff388ceb2011e4..d98b666c97ea3cb325debd7f9a5d6f3e137fe324 100644 (file)
--- a/src/pass/pass-micro.conf
+++ b/src/pass/pass-micro.conf
@@ -19,7 +19,7 @@ pass_governor_timeout=0.4
 
 [Level0]
 limit_max_freq=600000
-limit_max_cpu=1
+limit_min_cpu=1
 
 num_down_cond=0
 num_up_cond=1
@@ -31,7 +31,7 @@ num_right_cond=0
 
 [Level1]
 limit_max_freq=700000
-limit_max_cpu=1
+limit_min_cpu=1
 
 num_down_cond=1
 num_down_cond_freq=500000
@@ -46,7 +46,7 @@ num_right_cond=0
 
 [Level2]
 limit_max_freq=800000
-limit_max_cpu=1
+limit_min_cpu=1
 
 num_down_cond=1
 num_down_cond_freq=700000
@@ -61,7 +61,7 @@ num_right_cond=0
 
 [Level3]
 limit_max_freq=700000
-limit_max_cpu=2
+limit_min_cpu=2
 
 num_down_cond=1
 num_down_cond_freq=600000
@@ -76,7 +76,7 @@ num_right_cond=0
 
 [Level4]
 limit_max_freq=700000
-limit_max_cpu=2
+limit_min_cpu=2
 
 num_down_cond=1
 num_down_cond_freq=600000
@@ -91,7 +91,7 @@ num_right_cond=0
 
 [Level5]
 limit_max_freq=800000
-limit_max_cpu=2
+limit_min_cpu=2
 
 num_down_cond=1
 num_down_cond_freq=700000

diff --git a/src/pass/pass-parser.c b/src/pass/pass-parser.c
index cc5fbe491f25d3dc3a9cf14d4f3f80b9c019f8ef..5ae6cf1e403de3f1f837bbc09bb6df1f0e120b52 100644 (file)
--- a/src/pass/pass-parser.c
+++ b/src/pass/pass-parser.c
@@ -122,8 +122,8 @@ static int  pass_parse_level(struct parse_result *result,
                policy->pass_table[level].limit_max_freq = atoi(result->value);
        else if (MATCH(result->name, "limit_min_freq"))
                policy->pass_table[level].limit_min_freq = atoi(result->value);
-       else if (MATCH(result->name, "limit_max_cpu"))
-               policy->pass_table[level].limit_max_cpu = atoi(result->value);
+       else if (MATCH(result->name, "limit_min_cpu"))
+               policy->pass_table[level].limit_min_cpu = atoi(result->value);
 
        else if (MATCH(result->name, "num_down_cond"))
                policy->pass_table[level].num_down_cond = atoi(result->value);
@@ -365,10 +365,10 @@ int pass_get_table(struct pass_policy *policy, char *pass_conf_path)
                        _I("%s| policy->pass_table[%d].limit_min_freq : %d\n",
                                pass_res->cdata.res_name, level,
                                policy->pass_table[level].limit_min_freq);
-               if (policy->pass_table[level].limit_max_cpu)
-                       _I("%s| policy->pass_table[%d].limit_max_cpu : %d\n",
+               if (policy->pass_table[level].limit_min_cpu)
+                       _I("%s| policy->pass_table[%d].limit_min_cpu : %d\n",
                                pass_res->cdata.res_name, level,
-                               policy->pass_table[level].limit_max_cpu);
+                               policy->pass_table[level].limit_min_cpu);
                if (policy->pass_table[level].gov_timeout)
                        _I("%s| policy->pass_table[%d].gov_timeout : %f\n",
                                pass_res->cdata.res_name, level,

diff --git a/src/pass/pass.c b/src/pass/pass.c
index 599ea46827c41818ed77105d6c8e2c8e61112e4c..726bc649b03eb1e218c8b7102e12e5e3997bb001 100644 (file)
--- a/src/pass/pass.c
+++ b/src/pass/pass.c
@@ -156,8 +156,8 @@ static int pass_resource_init(struct pass_policy *policy)
        for (i = 0; i < policy->num_levels; i++) {
                if (max_freq < policy->pass_table[i].limit_max_freq)
                        max_freq = policy->pass_table[i].limit_max_freq;
-               if (max_cpu < policy->pass_table[i].limit_max_cpu)
-                       max_cpu = policy->pass_table[i].limit_max_cpu;
+               if (max_cpu < policy->pass_table[i].limit_min_cpu)
+                       max_cpu = policy->pass_table[i].limit_min_cpu;
        }
        policy->cpufreq.max_freq = max_freq;
        policy->cpufreq.num_nr_cpus = max_cpu;

diff --git a/src/pass/pass.h b/src/pass/pass.h
index 80b549760b642a87c0bbf88294a7baced676d5a8..427dc0ecf949eeca0065889ce3a9a70a6dccb0f0 100644 (file)
--- a/src/pass/pass.h
+++ b/src/pass/pass.h
@@ -139,7 +139,7 @@ struct pass_table {
        /* Constraints condition for powersaving */
        int limit_max_freq;
        int limit_min_freq;
-       int limit_max_cpu;
+       int limit_min_cpu;
 
        /* Governor timer's timeout for each pass level */
        double gov_timeout;