2019-10-19 08:02:59

by Amit Kucheria

Subject: [PATCH v4 3/6] cpufreq: Initialise the governors in core_initcall

Initialise the cpufreq governors earlier to allow for earlier
performance control during the boot process.

Signed-off-by: Amit Kucheria <[email protected]>
Acked-by: Viresh Kumar <[email protected]>
---
drivers/cpufreq/cpufreq_conservative.c | 2 +-
drivers/cpufreq/cpufreq_ondemand.c | 2 +-
drivers/cpufreq/cpufreq_performance.c | 2 +-
drivers/cpufreq/cpufreq_powersave.c | 2 +-
drivers/cpufreq/cpufreq_userspace.c | 2 +-
kernel/sched/cpufreq_schedutil.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index b66e81c06a575..737ff3b9c2c09 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -346,7 +346,7 @@ struct cpufreq_governor *cpufreq_default_governor(void)
return CPU_FREQ_GOV_CONSERVATIVE;
}

-fs_initcall(cpufreq_gov_dbs_init);
+core_initcall(cpufreq_gov_dbs_init);
#else
module_init(cpufreq_gov_dbs_init);
#endif
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index dced033875bf8..82a4d37ddecb3 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -483,7 +483,7 @@ struct cpufreq_governor *cpufreq_default_governor(void)
return CPU_FREQ_GOV_ONDEMAND;
}

-fs_initcall(cpufreq_gov_dbs_init);
+core_initcall(cpufreq_gov_dbs_init);
#else
module_init(cpufreq_gov_dbs_init);
#endif
diff --git a/drivers/cpufreq/cpufreq_performance.c b/drivers/cpufreq/cpufreq_performance.c
index aaa04dfcacd9d..def9afe0f5b86 100644
--- a/drivers/cpufreq/cpufreq_performance.c
+++ b/drivers/cpufreq/cpufreq_performance.c
@@ -50,5 +50,5 @@ MODULE_AUTHOR("Dominik Brodowski <[email protected]>");
MODULE_DESCRIPTION("CPUfreq policy governor 'performance'");
MODULE_LICENSE("GPL");

-fs_initcall(cpufreq_gov_performance_init);
+core_initcall(cpufreq_gov_performance_init);
module_exit(cpufreq_gov_performance_exit);
diff --git a/drivers/cpufreq/cpufreq_powersave.c b/drivers/cpufreq/cpufreq_powersave.c
index c143dc237d878..1ae66019eb835 100644
--- a/drivers/cpufreq/cpufreq_powersave.c
+++ b/drivers/cpufreq/cpufreq_powersave.c
@@ -43,7 +43,7 @@ struct cpufreq_governor *cpufreq_default_governor(void)
return &cpufreq_gov_powersave;
}

-fs_initcall(cpufreq_gov_powersave_init);
+core_initcall(cpufreq_gov_powersave_init);
#else
module_init(cpufreq_gov_powersave_init);
#endif
diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c
index cbd81c58cb8f0..b43e7cd502c58 100644
--- a/drivers/cpufreq/cpufreq_userspace.c
+++ b/drivers/cpufreq/cpufreq_userspace.c
@@ -147,7 +147,7 @@ struct cpufreq_governor *cpufreq_default_governor(void)
return &cpufreq_gov_userspace;
}

-fs_initcall(cpufreq_gov_userspace_init);
+core_initcall(cpufreq_gov_userspace_init);
#else
module_init(cpufreq_gov_userspace_init);
#endif
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index 86800b4d5453f..322ca8860f548 100644
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -915,7 +915,7 @@ static int __init sugov_register(void)
{
return cpufreq_register_governor(&schedutil_gov);
}
-fs_initcall(sugov_register);
+core_initcall(sugov_register);

#ifdef CONFIG_ENERGY_MODEL
extern bool sched_energy_update;
--
2.17.1

2019-10-19 08:13:11

by Rafael J. Wysocki

Subject: Re: [PATCH v4 3/6] cpufreq: Initialise the governors in core_initcall

On Friday, October 18, 2019 10:52:00 AM CEST Amit Kucheria wrote:
> Initialise the cpufreq governors earlier to allow for earlier
> performance control during the boot process.
>
> Signed-off-by: Amit Kucheria <[email protected]>
> Acked-by: Viresh Kumar <[email protected]>

No more issues found, so

Reviewed-by: Rafael J. Wysocki <[email protected]>

> ---
> drivers/cpufreq/cpufreq_conservative.c | 2 +-
> drivers/cpufreq/cpufreq_ondemand.c | 2 +-
> drivers/cpufreq/cpufreq_performance.c | 2 +-
> drivers/cpufreq/cpufreq_powersave.c | 2 +-
> drivers/cpufreq/cpufreq_userspace.c | 2 +-
> kernel/sched/cpufreq_schedutil.c | 2 +-
> 6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
> index b66e81c06a575..737ff3b9c2c09 100644
> --- a/drivers/cpufreq/cpufreq_conservative.c
> +++ b/drivers/cpufreq/cpufreq_conservative.c
> @@ -346,7 +346,7 @@ struct cpufreq_governor *cpufreq_default_governor(void)
> return CPU_FREQ_GOV_CONSERVATIVE;
> }
>
> -fs_initcall(cpufreq_gov_dbs_init);
> +core_initcall(cpufreq_gov_dbs_init);
> #else
> module_init(cpufreq_gov_dbs_init);
> #endif
> diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
> index dced033875bf8..82a4d37ddecb3 100644
> --- a/drivers/cpufreq/cpufreq_ondemand.c
> +++ b/drivers/cpufreq/cpufreq_ondemand.c
> @@ -483,7 +483,7 @@ struct cpufreq_governor *cpufreq_default_governor(void)
> return CPU_FREQ_GOV_ONDEMAND;
> }
>
> -fs_initcall(cpufreq_gov_dbs_init);
> +core_initcall(cpufreq_gov_dbs_init);
> #else
> module_init(cpufreq_gov_dbs_init);
> #endif
> diff --git a/drivers/cpufreq/cpufreq_performance.c b/drivers/cpufreq/cpufreq_performance.c
> index aaa04dfcacd9d..def9afe0f5b86 100644
> --- a/drivers/cpufreq/cpufreq_performance.c
> +++ b/drivers/cpufreq/cpufreq_performance.c
> @@ -50,5 +50,5 @@ MODULE_AUTHOR("Dominik Brodowski <[email protected]>");
> MODULE_DESCRIPTION("CPUfreq policy governor 'performance'");
> MODULE_LICENSE("GPL");
>
> -fs_initcall(cpufreq_gov_performance_init);
> +core_initcall(cpufreq_gov_performance_init);
> module_exit(cpufreq_gov_performance_exit);
> diff --git a/drivers/cpufreq/cpufreq_powersave.c b/drivers/cpufreq/cpufreq_powersave.c
> index c143dc237d878..1ae66019eb835 100644
> --- a/drivers/cpufreq/cpufreq_powersave.c
> +++ b/drivers/cpufreq/cpufreq_powersave.c
> @@ -43,7 +43,7 @@ struct cpufreq_governor *cpufreq_default_governor(void)
> return &cpufreq_gov_powersave;
> }
>
> -fs_initcall(cpufreq_gov_powersave_init);
> +core_initcall(cpufreq_gov_powersave_init);
> #else
> module_init(cpufreq_gov_powersave_init);
> #endif
> diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c
> index cbd81c58cb8f0..b43e7cd502c58 100644
> --- a/drivers/cpufreq/cpufreq_userspace.c
> +++ b/drivers/cpufreq/cpufreq_userspace.c
> @@ -147,7 +147,7 @@ struct cpufreq_governor *cpufreq_default_governor(void)
> return &cpufreq_gov_userspace;
> }
>
> -fs_initcall(cpufreq_gov_userspace_init);
> +core_initcall(cpufreq_gov_userspace_init);
> #else
> module_init(cpufreq_gov_userspace_init);
> #endif
> diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
> index 86800b4d5453f..322ca8860f548 100644
> --- a/kernel/sched/cpufreq_schedutil.c
> +++ b/kernel/sched/cpufreq_schedutil.c
> @@ -915,7 +915,7 @@ static int __init sugov_register(void)
> {
> return cpufreq_register_governor(&schedutil_gov);
> }
> -fs_initcall(sugov_register);
> +core_initcall(sugov_register);
>
> #ifdef CONFIG_ENERGY_MODEL
> extern bool sched_energy_update;
>