[PATCH] cpuidle: move ARCH_NEEDS_CPU_IDLE_COUPLED Kconfig option

[PATCH] cpuidle: move ARCH_NEEDS_CPU_IDLE_COUPLED Kconfig option

[Arnd Bergmann]

There is no reason why ARCH_NEEDS_CPU_IDLE_COUPLED needs to be
hidden inside of "if CPU_IDLE", since it is a silent option.
Moving it outside lets platforms select this symbol unconditionally,
which avoid a warning from the ARM omap2plus_defconfig build:

warning: (ARCH_OMAP4 && ARCH_TEGRA_2x_SOC) selects
	ARCH_NEEDS_CPU_IDLE_COUPLED which has unmet direct
	dependencies (CPU_IDLE)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-pm@vger.kernel.org

diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index f4511e6..2caddb0 100644
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -29,9 +29,6 @@ config CPU_IDLE_GOV_MENU
 	bool "Menu governor (for tickless system)"
 	default y
 
-config ARCH_NEEDS_CPU_IDLE_COUPLED
-	def_bool n
-
 config CPU_IDLE_CALXEDA
 	bool "CPU Idle Driver for Calxeda processors"
 	depends on ARCH_HIGHBANK
@@ -39,3 +36,6 @@ config CPU_IDLE_CALXEDA
 	help
 	  Select this to enable cpuidle on Calxeda processors.
 endif
+
+config ARCH_NEEDS_CPU_IDLE_COUPLED
+	def_bool n

Re: [PATCH] cpuidle: move ARCH_NEEDS_CPU_IDLE_COUPLED Kconfig option

[Daniel Lezcano]

On 06/05/2013 02:38 PM, Arnd Bergmann wrote:
> There is no reason why ARCH_NEEDS_CPU_IDLE_COUPLED needs to be
> hidden inside of "if CPU_IDLE", since it is a silent option.
> Moving it outside lets platforms select this symbol unconditionally,
> which avoid a warning from the ARM omap2plus_defconfig build:
> 
> warning: (ARCH_OMAP4 && ARCH_TEGRA_2x_SOC) selects
> 	ARCH_NEEDS_CPU_IDLE_COUPLED which has unmet direct
> 	dependencies (CPU_IDLE)

IMHO, this option depends on CPU_IDLE and thus must be kept inside the
CPU_IDLE menuconfig.

The warning raised here is because this option is selected by the arch
Kconfig without checking if CPU_IDLE is set or not.

I am in favor to change the OMAP / TEGRA Kconfigs instead, in this way:

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index f49cd51..831e89e 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -83,7 +83,7 @@ config ARCH_OMAP4
        depends on ARCH_OMAP2PLUS
        depends on ARCH_MULTI_V7
        select ARCH_HAS_OPP
-       select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
+       select ARCH_NEEDS_CPU_IDLE_COUPLED if (SMP && CPU_IDLE)
        select ARM_CPU_SUSPEND if PM
        select ARM_ERRATA_720789
        select ARM_GIC
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 84d72fc..04c6221 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -23,7 +23,7 @@ menu "NVIDIA Tegra options"

 config ARCH_TEGRA_2x_SOC
        bool "Enable support for Tegra20 family"
-       select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
+       select ARCH_NEEDS_CPU_IDLE_COUPLED if (SMP && CPU_IDLE)
        select ARM_ERRATA_720789
        select ARM_ERRATA_754327 if SMP
        select ARM_ERRATA_764369 if SMP
diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig

[ ... ]

-- 
 <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

Re: [PATCH] cpuidle: move ARCH_NEEDS_CPU_IDLE_COUPLED Kconfig option

[Rafael J. Wysocki]

On Wednesday, June 05, 2013 02:50:44 PM Daniel Lezcano wrote:
> On 06/05/2013 02:38 PM, Arnd Bergmann wrote:
> > There is no reason why ARCH_NEEDS_CPU_IDLE_COUPLED needs to be
> > hidden inside of "if CPU_IDLE", since it is a silent option.
> > Moving it outside lets platforms select this symbol unconditionally,
> > which avoid a warning from the ARM omap2plus_defconfig build:
> > 
> > warning: (ARCH_OMAP4 && ARCH_TEGRA_2x_SOC) selects
> > 	ARCH_NEEDS_CPU_IDLE_COUPLED which has unmet direct
> > 	dependencies (CPU_IDLE)
> 
> IMHO, this option depends on CPU_IDLE and thus must be kept inside the
> CPU_IDLE menuconfig.
> 
> The warning raised here is because this option is selected by the arch
> Kconfig without checking if CPU_IDLE is set or not.
> 
> I am in favor to change the OMAP / TEGRA Kconfigs instead, in this way:

I prefer this one.

Thanks,
Rafael


> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index f49cd51..831e89e 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -83,7 +83,7 @@ config ARCH_OMAP4
>         depends on ARCH_OMAP2PLUS
>         depends on ARCH_MULTI_V7
>         select ARCH_HAS_OPP
> -       select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
> +       select ARCH_NEEDS_CPU_IDLE_COUPLED if (SMP && CPU_IDLE)
>         select ARM_CPU_SUSPEND if PM
>         select ARM_ERRATA_720789
>         select ARM_GIC
> diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
> index 84d72fc..04c6221 100644
> --- a/arch/arm/mach-tegra/Kconfig
> +++ b/arch/arm/mach-tegra/Kconfig
> @@ -23,7 +23,7 @@ menu "NVIDIA Tegra options"
> 
>  config ARCH_TEGRA_2x_SOC
>         bool "Enable support for Tegra20 family"
> -       select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
> +       select ARCH_NEEDS_CPU_IDLE_COUPLED if (SMP && CPU_IDLE)
>         select ARM_ERRATA_720789
>         select ARM_ERRATA_754327 if SMP
>         select ARM_ERRATA_764369 if SMP
> diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
> 
> [ ... ]
> 
> 
-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [PATCH] cpuidle: move ARCH_NEEDS_CPU_IDLE_COUPLED Kconfig option

[Arnd Bergmann]

On Wednesday 05 June 2013 14:50:44 Daniel Lezcano wrote:
> 
> IMHO, this option depends on CPU_IDLE and thus must be kept inside the
> CPU_IDLE menuconfig.
> 
> The warning raised here is because this option is selected by the arch
> Kconfig without checking if CPU_IDLE is set or not.
> 
> I am in favor to change the OMAP / TEGRA Kconfigs instead, in this way:

Fine with me as well.

	Arnd