From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Amit Kucheria <amit.kucheria@linaro.org>,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
bjorn.andersson@linaro.org, edubezval@gmail.com,
agross@kernel.org, tdas@codeaurora.org, swboyd@chromium.org,
ilina@codeaurora.org, "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Viresh Kumar <viresh.kumar@linaro.org>,
Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Subject: Re: [PATCH 1/5] thermal: Initialize thermal subsystem earlier
Date: Mon, 16 Sep 2019 22:00:43 +0200 [thread overview]
Message-ID: <6920d231-73cf-d83d-2cc7-f29e5f73192c@linaro.org> (raw)
In-Reply-To: <97b6f861e6e6a2ac7b50efb7211f3c8e7fe872b0.1568240476.git.amit.kucheria@linaro.org>
On 12/09/2019 00:32, Amit Kucheria wrote:
> From: Lina Iyer <ilina@codeaurora.org>
>
> Now that the thermal framework is built-in, in order to facilitate
> thermal mitigation as early as possible in the boot cycle, move the
> thermal framework initialization to core_initcall.
>
> However, netlink initialization happens only as part of subsys_initcall.
> At this time in the boot process, the userspace is not available yet. So
> initialize the netlink events later in fs_initcall.
Why not kill directly the netlink part, no one is using it in the kernel?
> Signed-off-by: Lina Iyer <ilina@codeaurora.org>
> [Rebased, refactored and moved to core_initcall]
> Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
> ---
> drivers/thermal/thermal_core.c | 41 ++++++++++++++++++++--------------
> 1 file changed, 24 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index 6bab66e84eb5..b13e8a9298cc 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -1468,6 +1468,8 @@ static struct genl_family thermal_event_genl_family __ro_after_init = {
> .n_mcgrps = ARRAY_SIZE(thermal_event_mcgrps),
> };
>
> +static bool allow_netlink_events;
> +
> int thermal_generate_netlink_event(struct thermal_zone_device *tz,
> enum events event)
> {
> @@ -1482,6 +1484,9 @@ int thermal_generate_netlink_event(struct thermal_zone_device *tz,
> if (!tz)
> return -EINVAL;
>
> + if (!allow_netlink_events)
> + return -ENODEV;
> +
> /* allocate memory */
> size = nla_total_size(sizeof(struct thermal_genl_event)) +
> nla_total_size(0);
> @@ -1533,16 +1538,18 @@ EXPORT_SYMBOL_GPL(thermal_generate_netlink_event);
>
> static int __init genetlink_init(void)
> {
> - return genl_register_family(&thermal_event_genl_family);
> -}
> + int ret;
>
> -static void genetlink_exit(void)
> -{
> - genl_unregister_family(&thermal_event_genl_family);
> + ret = genl_register_family(&thermal_event_genl_family);
> + if (!ret)
> + allow_netlink_events = true;
> + return ret;
> }
> +
> #else /* !CONFIG_NET */
> static inline int genetlink_init(void) { return 0; }
> -static inline void genetlink_exit(void) {}
> +static inline int thermal_generate_netlink_event(struct thermal_zone_device *tz,
> + enum events event) { return -ENODEV; }
> #endif /* !CONFIG_NET */
>
> static int thermal_pm_notify(struct notifier_block *nb,
> @@ -1591,19 +1598,15 @@ static int __init thermal_init(void)
> mutex_init(&poweroff_lock);
> result = thermal_register_governors();
> if (result)
> - goto error;
> + goto init_exit;
>
> result = class_register(&thermal_class);
> if (result)
> goto unregister_governors;
>
> - result = genetlink_init();
> - if (result)
> - goto unregister_class;
> -
> result = of_parse_thermal_zones();
> if (result)
> - goto exit_netlink;
> + goto exit_zone_parse;
>
> result = register_pm_notifier(&thermal_pm_nb);
> if (result)
> @@ -1612,13 +1615,11 @@ static int __init thermal_init(void)
>
> return 0;
>
> -exit_netlink:
> - genetlink_exit();
> -unregister_class:
> +exit_zone_parse:
> class_unregister(&thermal_class);
> unregister_governors:
> thermal_unregister_governors();
> -error:
> +init_exit:
> ida_destroy(&thermal_tz_ida);
> ida_destroy(&thermal_cdev_ida);
> mutex_destroy(&thermal_list_lock);
> @@ -1626,4 +1627,10 @@ static int __init thermal_init(void)
> mutex_destroy(&poweroff_lock);
> return result;
> }
> -fs_initcall(thermal_init);
> +
> +static int __init thermal_netlink_init(void)
> +{
> + return genetlink_init();
> +}
> +core_initcall(thermal_init);
> +fs_initcall(thermal_netlink_init);
>
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
next prev parent reply other threads:[~2019-09-16 20:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-11 22:32 [PATCH 0/5] Initialise thermal framework earlier during boot Amit Kucheria
2019-09-11 22:32 ` [PATCH 1/5] thermal: Initialize thermal subsystem earlier Amit Kucheria
2019-09-16 20:00 ` Daniel Lezcano [this message]
2019-09-17 9:18 ` Amit Kucheria
2019-09-19 14:13 ` Zhang Rui
2019-09-11 22:32 ` [PATCH 2/5] cpufreq: Initialise the governors in core_initcall Amit Kucheria
2019-09-17 8:17 ` Viresh Kumar
2019-09-11 22:32 ` [PATCH 3/5] cpufreq: Initialize cpufreq-dt driver earlier Amit Kucheria
2019-09-17 8:18 ` Viresh Kumar
2019-09-11 22:32 ` [PATCH 5/5] cpufreq: qcom-hw: Move driver initialisation earlier Amit Kucheria
2019-09-17 8:17 ` Viresh Kumar
2019-09-17 9:34 ` Sudeep Holla
2019-09-17 12:47 ` Daniel Lezcano
2019-09-17 13:05 ` Quentin Perret
2019-09-17 13:20 ` Sudeep Holla
2019-09-20 20:03 ` Amit Kucheria
2019-09-18 9:09 ` Viresh Kumar
2019-09-18 9:17 ` Sudeep Holla
2019-09-18 9:29 ` Viresh Kumar
2019-09-17 12:48 ` Daniel Lezcano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6920d231-73cf-d83d-2cc7-f29e5f73192c@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=agross@kernel.org \
--cc=amit.kucheria@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=edubezval@gmail.com \
--cc=ilina@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=rui.zhang@intel.com \
--cc=swboyd@chromium.org \
--cc=tdas@codeaurora.org \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).