From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423158AbbENXv7 (ORCPT ); Thu, 14 May 2015 19:51:59 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:54300 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1161102AbbENXvz (ORCPT ); Thu, 14 May 2015 19:51:55 -0400 From: "Rafael J. Wysocki" To: Viresh Kumar Cc: Sudeep Holla , "linux-pm@vger.kernel.org" , Linux Kernel Mailing List , Jon Medhurst Subject: Re: [PATCH v2] cpufreq: arm_big_little: remove compile-time dependency on BIG_LITTLE Date: Fri, 15 May 2015 02:17:08 +0200 Message-ID: <28082787.suy0OfQi45@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/4.0.0+; KDE/4.11.5; x86_64; ; ) In-Reply-To: References: <1431343473-9915-1-git-send-email-sudeep.holla@arm.com> <1431520552-27251-1-git-send-email-sudeep.holla@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday, May 13, 2015 06:30:23 PM Viresh Kumar wrote: > On 13 May 2015 at 18:05, Sudeep Holla wrote: > > With the addition of switcher code, there's compile-time dependency on > > BIG_LITTLE to get arm_big_little driver compiling on ARM64. Since ARM64 > > will never add support for bL switcher, it's better to remove the > > dependency so that the driver can be reused on ARM64 platforms. > > > > This patch adds stubs to remove BIG_LITTLE dependency in the driver. > > > > Cc: Viresh Kumar > > Cc: "Rafael J. Wysocki" > > Signed-off-by: Sudeep Holla > > --- > > drivers/cpufreq/Kconfig.arm | 2 +- > > drivers/cpufreq/arm_big_little.c | 27 ++++++++++++++++++++++----- > > 2 files changed, 23 insertions(+), 6 deletions(-) > > > > Changes v1->v2: replaced BL_SWITCHER with BIG_LITTLE in the title and > > commit log as suggested by Viresh > > > > Hi Viresh, > > > > As replied in the thread, I have retained one change which you suspected > > as not necessary, in order to fix the warning we get. > > > > Regards, > > Sudeep > > > > > > diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm > > index 4f3dbc8cf729..611cb09239eb 100644 > > --- a/drivers/cpufreq/Kconfig.arm > > +++ b/drivers/cpufreq/Kconfig.arm > > @@ -5,7 +5,7 @@ > > # big LITTLE core layer and glue drivers > > config ARM_BIG_LITTLE_CPUFREQ > > tristate "Generic ARM big LITTLE CPUfreq driver" > > - depends on ARM && BIG_LITTLE && ARM_CPU_TOPOLOGY && HAVE_CLK > > + depends on (ARM_CPU_TOPOLOGY || ARM64) && HAVE_CLK > > select PM_OPP > > help > > This enables the Generic CPUfreq driver for ARM big.LITTLE platforms. > > diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c > > index e4d75ca9f3b0..f1e42f8ce0fc 100644 > > --- a/drivers/cpufreq/arm_big_little.c > > +++ b/drivers/cpufreq/arm_big_little.c > > @@ -31,7 +31,6 @@ > > #include > > #include > > #include > > -#include > > > > #include "arm_big_little.h" > > > > @@ -41,12 +40,16 @@ > > #define MAX_CLUSTERS 2 > > > > #ifdef CONFIG_BL_SWITCHER > > +#include > > static bool bL_switching_enabled; > > #define is_bL_switching_enabled() bL_switching_enabled > > #define set_switching_enabled(x) (bL_switching_enabled = (x)) > > #else > > #define is_bL_switching_enabled() false > > #define set_switching_enabled(x) do { } while (0) > > +#define bL_switch_request(...) do { } while (0) > > +#define bL_switcher_put_enabled() do { } while (0) > > +#define bL_switcher_get_enabled() do { } while (0) > > #endif > > > > #define ACTUAL_FREQ(cluster, freq) ((cluster == A7_CLUSTER) ? freq << 1 : freq) > > @@ -513,6 +516,7 @@ static struct cpufreq_driver bL_cpufreq_driver = { > > .attr = cpufreq_generic_attr, > > }; > > > > +#ifdef CONFIG_BL_SWITCHER > > static int bL_cpufreq_switcher_notifier(struct notifier_block *nfb, > > unsigned long action, void *_arg) > > { > > @@ -545,6 +549,20 @@ static struct notifier_block bL_switcher_notifier = { > > .notifier_call = bL_cpufreq_switcher_notifier, > > }; > > > > +static int __bLs_register_notifier(void) > > +{ > > + return bL_switcher_register_notifier(&bL_switcher_notifier); > > +} > > + > > +static int __bLs_unregister_notifier(void) > > +{ > > + return bL_switcher_unregister_notifier(&bL_switcher_notifier); > > +} > > +#else > > +static int __bLs_register_notifier(void) { return 0; } > > +static int __bLs_unregister_notifier(void) { return 0; } > > +#endif > > + > > int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops) > > { > > int ret, i; > > @@ -562,8 +580,7 @@ int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops) > > > > arm_bL_ops = ops; > > > > - ret = bL_switcher_get_enabled(); > > - set_switching_enabled(ret); > > + set_switching_enabled(bL_switcher_get_enabled()); > > > > for (i = 0; i < MAX_CLUSTERS; i++) > > mutex_init(&cluster_lock[i]); > > @@ -574,7 +591,7 @@ int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops) > > __func__, ops->name, ret); > > arm_bL_ops = NULL; > > } else { > > - ret = bL_switcher_register_notifier(&bL_switcher_notifier); > > + ret = __bLs_register_notifier(); > > if (ret) { > > cpufreq_unregister_driver(&bL_cpufreq_driver); > > arm_bL_ops = NULL; > > @@ -598,7 +615,7 @@ void bL_cpufreq_unregister(struct cpufreq_arm_bL_ops *ops) > > } > > > > bL_switcher_get_enabled(); > > - bL_switcher_unregister_notifier(&bL_switcher_notifier); > > + __bLs_unregister_notifier(); > > cpufreq_unregister_driver(&bL_cpufreq_driver); > > bL_switcher_put_enabled(); > > pr_info("%s: Un-registered platform driver: %s\n", __func__, > > Acked-by: Viresh Kumar Queued up for 4.2, thanks! -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.