From: Amit Kucheria <amit.kucheria@linaro.org>
To: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Sudeep Holla <sudeep.holla@arm.com>,
Linux PM list <linux-pm@vger.kernel.org>
Subject: Re: [PATCH v5 2/9] cpufreq: Auto-register the driver as a thermal cooling device if asked
Date: Wed, 30 Jan 2019 01:50:22 +0530 [thread overview]
Message-ID: <CAHLCerN-+57hH8r5e0ZyNY6+w102tHHhWORXk2admf1EU_=jjA@mail.gmail.com> (raw)
In-Reply-To: <CAJZ5v0hs2Af9DJoxiyMmFt7R5nYbGOCqgG5cvPOL8yrQXN-ZUw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2976 bytes --]
On Tue, Jan 29, 2019 at 2:43 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
>
> On Tue, Jan 29, 2019 at 6:46 AM Amit Kucheria <amit.kucheria@linaro.org> wrote:
> >
> > On Tue, Jan 29, 2019 at 11:06 AM Viresh Kumar <viresh.kumar@linaro.org> wrote:
> > >
> > > On 29-01-19, 10:25, Amit Kucheria wrote:
> > > > All cpufreq drivers do similar things to register as a cooling device.
> > > > Provide a cpufreq driver flag so drivers can just ask the cpufreq core
> > > > to register the cooling device on their behalf. This allows us to get
> > > > rid of duplicated code in the drivers.
> > > >
> > > > In order to allow this, we add a struct thermal_cooling_device pointer
> > > > to struct cpufreq_policy so that drivers don't need to store it in a
> > > > private data structure.
> > > >
> > > > Suggested-by: Stephen Boyd <swboyd@chromium.org>
> > > > Suggested-by: Viresh Kumar <viresh.kumar@linaro.org>
> > > > Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
> > > > Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
> > > > Tested-by: Matthias Kaehlcke <mka@chromium.org>
> > > > Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
> > > > ---
> > > > drivers/cpufreq/cpufreq.c | 13 +++++++++++++
> > > > include/linux/cpufreq.h | 9 +++++++++
> > > > 2 files changed, 22 insertions(+)
> > > >
> > > > diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
> > > > index e35a886e00bc..0f9b50d3ee91 100644
> > > > --- a/drivers/cpufreq/cpufreq.c
> > > > +++ b/drivers/cpufreq/cpufreq.c
> > > > @@ -19,6 +19,7 @@
> > > >
> > > > #include <linux/cpu.h>
> > > > #include <linux/cpufreq.h>
> > > > +#include <linux/cpu_cooling.h>
> > > > #include <linux/delay.h>
> > > > #include <linux/device.h>
> > > > #include <linux/init.h>
> > > > @@ -1318,6 +1319,11 @@ static int cpufreq_online(unsigned int cpu)
> > > > if (cpufreq_driver->ready)
> > > > cpufreq_driver->ready(policy);
> > > >
> > > > +#if IS_ENABLED(CONFIG_CPU_THERMAL)
> > > > + if (cpufreq_driver->flags & CPUFREQ_IS_COOLING_DEV)
> > > > + policy->cdev = of_cpufreq_cooling_register(policy);
> > > > +#endif
> > >
> > > I am not sure if Rafael wanted it this way but maybe something like this:
> > >
> > > if (IS_ENABLED(CONFIG_CPU_THERMAL) &&
> > > cpufreq_driver->flags & CPUFREQ_IS_COOLING_DEV))
> > > policy->cdev = of_cpufreq_cooling_register(policy);
> > >
> > > We never wanted ifdef hackery to be in there :)
> >
> > OK, that makes more sense. Should I just send out a fixup patch or the
> > entire series?
>
> Just a fixup patch, please.
Please find attached a fixup patch suitable to add to the top of the
series and use git rebase --autosquash on.
The entire series with this patch squashed in and rebased on top of
today's linux-next is available for your convenience if needed[1]
Thanks,
Amit
[1] https://git.linaro.org/people/amit.kucheria/kernel.git/log/?h=up/cpufreq/auto-register-cooling-dev-v5
[-- Attachment #2: 0001-fixup-cpufreq-Auto-register-the-driver-as-a-thermal-.patch --]
[-- Type: text/x-patch, Size: 1483 bytes --]
From cb5aa5001e86f4635b39fa1e3955a530f8a0ced8 Mon Sep 17 00:00:00 2001
Message-Id: <cb5aa5001e86f4635b39fa1e3955a530f8a0ced8.1548792485.git.amit.kucheria@linaro.org>
From: Amit Kucheria <amit.kucheria@linaro.org>
Date: Wed, 30 Jan 2019 01:37:40 +0530
Subject: [PATCH] fixup! cpufreq: Auto-register the driver as a thermal cooling
device if asked
---
drivers/cpufreq/cpufreq.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 0f9b50d3ee91..cd574f031318 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1319,10 +1319,9 @@ static int cpufreq_online(unsigned int cpu)
if (cpufreq_driver->ready)
cpufreq_driver->ready(policy);
-#if IS_ENABLED(CONFIG_CPU_THERMAL)
- if (cpufreq_driver->flags & CPUFREQ_IS_COOLING_DEV)
+ if (IS_ENABLED(CONFIG_CPU_THERMAL) &&
+ cpufreq_driver->flags & CPUFREQ_IS_COOLING_DEV)
policy->cdev = of_cpufreq_cooling_register(policy);
-#endif
pr_debug("initialization complete\n");
@@ -1411,12 +1410,11 @@ static int cpufreq_offline(unsigned int cpu)
goto unlock;
}
-#if IS_ENABLED(CONFIG_CPU_THERMAL)
- if (cpufreq_driver->flags & CPUFREQ_IS_COOLING_DEV) {
+ if (IS_ENABLED(CONFIG_CPU_THERMAL) &&
+ cpufreq_driver->flags & CPUFREQ_IS_COOLING_DEV) {
cpufreq_cooling_unregister(policy->cdev);
policy->cdev = NULL;
}
-#endif
if (cpufreq_driver->stop_cpu)
cpufreq_driver->stop_cpu(policy);
--
2.17.1
next prev parent reply other threads:[~2019-01-29 20:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-29 4:55 [PATCH v5 0/9] cpufreq: Add flag to auto-register as cooling device Amit Kucheria
2019-01-29 4:55 ` [PATCH v5 1/9] thermal: cpu_cooling: Require thermal core to be compiled in Amit Kucheria
2019-01-30 23:53 ` Rafael J. Wysocki
2019-01-29 4:55 ` [PATCH v5 2/9] cpufreq: Auto-register the driver as a thermal cooling device if asked Amit Kucheria
2019-01-29 5:36 ` Viresh Kumar
2019-01-29 5:46 ` Amit Kucheria
2019-01-29 6:20 ` Amit Kucheria
2019-01-29 7:09 ` Viresh Kumar
2019-01-29 9:16 ` Rafael J. Wysocki
2019-01-29 9:13 ` Rafael J. Wysocki
2019-01-29 20:20 ` Amit Kucheria [this message]
2019-01-29 22:22 ` Rafael J. Wysocki
2019-01-30 5:22 ` [PATCH] " Amit Kucheria
2019-01-30 6:34 ` Viresh Kumar
2019-01-30 7:28 ` Daniel Lezcano
2019-01-29 4:55 ` [PATCH v5 3/9] cpufreq: qcom-hw: Register as a cpufreq cooling device Amit Kucheria
2019-01-29 4:55 ` [PATCH v5 4/9] cpufreq: imx6q: Use auto-registration of thermal " Amit Kucheria
2019-01-29 4:55 ` [PATCH v5 5/9] cpufreq: cpufreq-dt: " Amit Kucheria
2019-01-29 4:55 ` [PATCH v5 6/9] cpufreq: mediatek: " Amit Kucheria
2019-02-06 13:55 ` Matthias Brugger
2019-01-29 4:55 ` [PATCH v5 7/9] cpufreq: qoriq: " Amit Kucheria
2019-01-29 4:55 ` [PATCH v5 8/9] cpufreq: scmi: " Amit Kucheria
2019-01-29 4:55 ` [PATCH v5 9/9] cpufreq: scpi: " Amit Kucheria
2019-02-06 10:32 ` [PATCH v5 0/9] cpufreq: Add flag to auto-register as " Rafael J. Wysocki
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='CAHLCerN-+57hH8r5e0ZyNY6+w102tHHhWORXk2admf1EU_=jjA@mail.gmail.com' \
--to=amit.kucheria@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sudeep.holla@arm.com \
--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).