[PATCH 1/2] cpuidle / kirkwood: remove redundant Kconfig option

[PATCH 1/2] cpuidle / kirkwood: remove redundant Kconfig option

[Daniel Lezcano]

When the CPU_IDLE and the ARCH_KIRKWOOD options are set it is
pointless to define a new option CPU_IDLE_KIRKWOOD because it
is redundant.

The Makefile drivers directory contains a condition to compile
the cpuidle drivers:

obj-$(CONFIG_CPU_IDLE)          += cpuidle/

Hence, if CPU_IDLE is not set we won't enter this directory.

This patch removes the useless Kconfig option and replaces the
condition in the Makefile by CONFIG_ARCH_KIRKWOOD.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 arch/arm/configs/kirkwood_defconfig |    1 -
 drivers/cpuidle/Kconfig             |    6 ------
 drivers/cpuidle/Makefile            |    2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 13482ea..93f3794 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -56,7 +56,6 @@ CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_KIRKWOOD=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index 071e2c3..c4cc27e 100644
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -39,10 +39,4 @@ config CPU_IDLE_CALXEDA
 	help
 	  Select this to enable cpuidle on Calxeda processors.
 
-config CPU_IDLE_KIRKWOOD
-	bool "CPU Idle Driver for Kirkwood processors"
-	depends on ARCH_KIRKWOOD
-	help
-	  Select this to enable cpuidle on Kirkwood processors.
-
 endif
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
index 24c6e7d..0d8bd55 100644
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@ -6,4 +6,4 @@ obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
 obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
 
 obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
-obj-$(CONFIG_CPU_IDLE_KIRKWOOD) += cpuidle-kirkwood.o
+obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
-- 
1.7.9.5

[PATCH 2/2] cpuidle / calxeda: remove redundant Kconfig option

[Daniel Lezcano]

When the CPU_IDLE and the ARCH_HIGHBANK options are set it is
pointless to define a new option CPU_IDLE_CALXEDA because it
is redundant.

The Makefile drivers directory contains a condition to compile
the cpuidle drivers:

obj-$(CONFIG_CPU_IDLE)          += cpuidle/

Hence, if CPU_IDLE is not set we won't enter this directory.

This patch removes the useless Kconfig option and replaces the
condition in the Makefile by CONFIG_ARCH_HIGHBANK.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/cpuidle/Kconfig  |   10 ----------
 drivers/cpuidle/Makefile |    2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index c4cc27e..234ae65 100644
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -30,13 +30,3 @@ config CPU_IDLE_GOV_MENU
 
 config ARCH_NEEDS_CPU_IDLE_COUPLED
 	def_bool n
-
-if CPU_IDLE
-
-config CPU_IDLE_CALXEDA
-	bool "CPU Idle Driver for Calxeda processors"
-	depends on ARCH_HIGHBANK
-	help
-	  Select this to enable cpuidle on Calxeda processors.
-
-endif
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
index 0d8bd55..d1aba71 100644
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@ -5,5 +5,5 @@
 obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
 obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
 
-obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
+obj-$(CONFIG_ARCH_HIGHBANK) += cpuidle-calxeda.o
 obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
-- 
1.7.9.5

[PATCH 1/2] cpuidle / kirkwood: remove redundant Kconfig option

[Jason Cooper]

On Tue, Mar 12, 2013 at 10:27:55AM +0100, Daniel Lezcano wrote:
> When the CPU_IDLE and the ARCH_KIRKWOOD options are set it is
> pointless to define a new option CPU_IDLE_KIRKWOOD because it
> is redundant.
> 
> The Makefile drivers directory contains a condition to compile
> the cpuidle drivers:
> 
> obj-$(CONFIG_CPU_IDLE)          += cpuidle/
> 
> Hence, if CPU_IDLE is not set we won't enter this directory.
> 
> This patch removes the useless Kconfig option and replaces the
> condition in the Makefile by CONFIG_ARCH_KIRKWOOD.
> 
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
>  arch/arm/configs/kirkwood_defconfig |    1 -
>  drivers/cpuidle/Kconfig             |    6 ------
>  drivers/cpuidle/Makefile            |    2 +-
>  3 files changed, 1 insertion(+), 8 deletions(-)

Acked-by: Jason Cooper <jason@lakedaemon.net>

> 
> diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
> index 13482ea..93f3794 100644
> --- a/arch/arm/configs/kirkwood_defconfig
> +++ b/arch/arm/configs/kirkwood_defconfig
> @@ -56,7 +56,6 @@ CONFIG_AEABI=y
>  CONFIG_ZBOOT_ROM_TEXT=0x0
>  CONFIG_ZBOOT_ROM_BSS=0x0
>  CONFIG_CPU_IDLE=y
> -CONFIG_CPU_IDLE_KIRKWOOD=y
>  CONFIG_NET=y
>  CONFIG_PACKET=y
>  CONFIG_UNIX=y
> diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
> index 071e2c3..c4cc27e 100644
> --- a/drivers/cpuidle/Kconfig
> +++ b/drivers/cpuidle/Kconfig
> @@ -39,10 +39,4 @@ config CPU_IDLE_CALXEDA
>  	help
>  	  Select this to enable cpuidle on Calxeda processors.
>  
> -config CPU_IDLE_KIRKWOOD
> -	bool "CPU Idle Driver for Kirkwood processors"
> -	depends on ARCH_KIRKWOOD
> -	help
> -	  Select this to enable cpuidle on Kirkwood processors.
> -
>  endif
> diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
> index 24c6e7d..0d8bd55 100644
> --- a/drivers/cpuidle/Makefile
> +++ b/drivers/cpuidle/Makefile
> @@ -6,4 +6,4 @@ obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
>  obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
>  
>  obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
> -obj-$(CONFIG_CPU_IDLE_KIRKWOOD) += cpuidle-kirkwood.o
> +obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/2] cpuidle / calxeda: remove redundant Kconfig option

[Daniel Lezcano]

On 03/12/2013 10:27 AM, Daniel Lezcano wrote:
> When the CPU_IDLE and the ARCH_HIGHBANK options are set it is
> pointless to define a new option CPU_IDLE_CALXEDA because it
> is redundant.
> 
> The Makefile drivers directory contains a condition to compile
> the cpuidle drivers:
> 
> obj-$(CONFIG_CPU_IDLE)          += cpuidle/
> 
> Hence, if CPU_IDLE is not set we won't enter this directory.
> 
> This patch removes the useless Kconfig option and replaces the
> condition in the Makefile by CONFIG_ARCH_HIGHBANK.
> 
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---

Hi Rob,

sorry I missed to add you in Cc for this patch.

Regards
  -- Daniel


>  drivers/cpuidle/Kconfig  |   10 ----------
>  drivers/cpuidle/Makefile |    2 +-
>  2 files changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
> index c4cc27e..234ae65 100644
> --- a/drivers/cpuidle/Kconfig
> +++ b/drivers/cpuidle/Kconfig
> @@ -30,13 +30,3 @@ config CPU_IDLE_GOV_MENU
>  
>  config ARCH_NEEDS_CPU_IDLE_COUPLED
>  	def_bool n
> -
> -if CPU_IDLE
> -
> -config CPU_IDLE_CALXEDA
> -	bool "CPU Idle Driver for Calxeda processors"
> -	depends on ARCH_HIGHBANK
> -	help
> -	  Select this to enable cpuidle on Calxeda processors.
> -
> -endif
> diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
> index 0d8bd55..d1aba71 100644
> --- a/drivers/cpuidle/Makefile
> +++ b/drivers/cpuidle/Makefile
> @@ -5,5 +5,5 @@
>  obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
>  obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
>  
> -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
> +obj-$(CONFIG_ARCH_HIGHBANK) += cpuidle-calxeda.o
>  obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
> 


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

[PATCH 2/2] cpuidle / calxeda: remove redundant Kconfig option

[Rob Herring]

On 03/12/2013 04:27 AM, Daniel Lezcano wrote:
> When the CPU_IDLE and the ARCH_HIGHBANK options are set it is
> pointless to define a new option CPU_IDLE_CALXEDA because it
> is redundant.
> 
> The Makefile drivers directory contains a condition to compile
> the cpuidle drivers:
> 
> obj-$(CONFIG_CPU_IDLE)          += cpuidle/
> 
> Hence, if CPU_IDLE is not set we won't enter this directory.
> 
> This patch removes the useless Kconfig option and replaces the
> condition in the Makefile by CONFIG_ARCH_HIGHBANK.

If I have multiple platforms including highbank compiled in, but want to
disable cpuidle just for highbank, then you can't disable it at compile
time.

Also, with my PSCI support patches for highbank, it is no longer
dependent on ARCH_HIGHBANK which gives us better compile test coverage.

Rob

> 
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
>  drivers/cpuidle/Kconfig  |   10 ----------
>  drivers/cpuidle/Makefile |    2 +-
>  2 files changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
> index c4cc27e..234ae65 100644
> --- a/drivers/cpuidle/Kconfig
> +++ b/drivers/cpuidle/Kconfig
> @@ -30,13 +30,3 @@ config CPU_IDLE_GOV_MENU
>  
>  config ARCH_NEEDS_CPU_IDLE_COUPLED
>  	def_bool n
> -
> -if CPU_IDLE
> -
> -config CPU_IDLE_CALXEDA
> -	bool "CPU Idle Driver for Calxeda processors"
> -	depends on ARCH_HIGHBANK
> -	help
> -	  Select this to enable cpuidle on Calxeda processors.
> -
> -endif
> diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
> index 0d8bd55..d1aba71 100644
> --- a/drivers/cpuidle/Makefile
> +++ b/drivers/cpuidle/Makefile
> @@ -5,5 +5,5 @@
>  obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
>  obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
>  
> -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
> +obj-$(CONFIG_ARCH_HIGHBANK) += cpuidle-calxeda.o
>  obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
> 

[PATCH 2/2] cpuidle / calxeda: remove redundant Kconfig option

[Daniel Lezcano]

On 03/19/2013 01:22 PM, Rob Herring wrote:
> On 03/12/2013 04:27 AM, Daniel Lezcano wrote:
>> When the CPU_IDLE and the ARCH_HIGHBANK options are set it is
>> pointless to define a new option CPU_IDLE_CALXEDA because it
>> is redundant.
>>
>> The Makefile drivers directory contains a condition to compile
>> the cpuidle drivers:
>>
>> obj-$(CONFIG_CPU_IDLE)          += cpuidle/
>>
>> Hence, if CPU_IDLE is not set we won't enter this directory.
>>
>> This patch removes the useless Kconfig option and replaces the
>> condition in the Makefile by CONFIG_ARCH_HIGHBANK.
> 
> If I have multiple platforms including highbank compiled in, but want to
> disable cpuidle just for highbank, then you can't disable it at compile
> time.

Could you elaborate a bit ? Is it today possible to have multiple
platforms in a single kernel ?

> Also, with my PSCI support patches for highbank, it is no longer
> dependent on ARCH_HIGHBANK which gives us better compile test coverage.




>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>> ---
>>  drivers/cpuidle/Kconfig  |   10 ----------
>>  drivers/cpuidle/Makefile |    2 +-
>>  2 files changed, 1 insertion(+), 11 deletions(-)
>>
>> diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
>> index c4cc27e..234ae65 100644
>> --- a/drivers/cpuidle/Kconfig
>> +++ b/drivers/cpuidle/Kconfig
>> @@ -30,13 +30,3 @@ config CPU_IDLE_GOV_MENU
>>  
>>  config ARCH_NEEDS_CPU_IDLE_COUPLED
>>  	def_bool n
>> -
>> -if CPU_IDLE
>> -
>> -config CPU_IDLE_CALXEDA
>> -	bool "CPU Idle Driver for Calxeda processors"
>> -	depends on ARCH_HIGHBANK
>> -	help
>> -	  Select this to enable cpuidle on Calxeda processors.
>> -
>> -endif
>> diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
>> index 0d8bd55..d1aba71 100644
>> --- a/drivers/cpuidle/Makefile
>> +++ b/drivers/cpuidle/Makefile
>> @@ -5,5 +5,5 @@
>>  obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
>>  obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
>>  
>> -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
>> +obj-$(CONFIG_ARCH_HIGHBANK) += cpuidle-calxeda.o
>>  obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
>>
> 


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

[PATCH 2/2] cpuidle / calxeda: remove redundant Kconfig option

[Rob Herring]

On 03/19/2013 09:35 AM, Daniel Lezcano wrote:
> On 03/19/2013 01:22 PM, Rob Herring wrote:
>> On 03/12/2013 04:27 AM, Daniel Lezcano wrote:
>>> When the CPU_IDLE and the ARCH_HIGHBANK options are set it is
>>> pointless to define a new option CPU_IDLE_CALXEDA because it
>>> is redundant.
>>>
>>> The Makefile drivers directory contains a condition to compile
>>> the cpuidle drivers:
>>>
>>> obj-$(CONFIG_CPU_IDLE)          += cpuidle/
>>>
>>> Hence, if CPU_IDLE is not set we won't enter this directory.
>>>
>>> This patch removes the useless Kconfig option and replaces the
>>> condition in the Makefile by CONFIG_ARCH_HIGHBANK.
>>
>> If I have multiple platforms including highbank compiled in, but want to
>> disable cpuidle just for highbank, then you can't disable it at compile
>> time.
> 
> Could you elaborate a bit ? Is it today possible to have multiple
> platforms in a single kernel ?

You've heard of single zImage, right? Vexpress, mvebu, highbank, imx,
omap2+, socfpga, vt8500 off the top of my head as of 3.8.

Rob

[PATCH 2/2] cpuidle / calxeda: remove redundant Kconfig option

[Daniel Lezcano]

On 03/19/2013 04:13 PM, Rob Herring wrote:
> On 03/19/2013 09:35 AM, Daniel Lezcano wrote:
>> On 03/19/2013 01:22 PM, Rob Herring wrote:
>>> On 03/12/2013 04:27 AM, Daniel Lezcano wrote:
>>>> When the CPU_IDLE and the ARCH_HIGHBANK options are set it is
>>>> pointless to define a new option CPU_IDLE_CALXEDA because it
>>>> is redundant.
>>>>
>>>> The Makefile drivers directory contains a condition to compile
>>>> the cpuidle drivers:
>>>>
>>>> obj-$(CONFIG_CPU_IDLE)          += cpuidle/
>>>>
>>>> Hence, if CPU_IDLE is not set we won't enter this directory.
>>>>
>>>> This patch removes the useless Kconfig option and replaces the
>>>> condition in the Makefile by CONFIG_ARCH_HIGHBANK.
>>>
>>> If I have multiple platforms including highbank compiled in, but want to
>>> disable cpuidle just for highbank, then you can't disable it at compile
>>> time.
>>
>> Could you elaborate a bit ? Is it today possible to have multiple
>> platforms in a single kernel ?
> 
> You've heard of single zImage, right? Vexpress, mvebu, highbank, imx,
> omap2+, socfpga, vt8500 off the top of my head as of 3.8.

Yes, I have heard of single zImage but I am not aware of the status.

IIUC, the approach would be the same as cpufreq, right ?

I am not sure the cpuidle drivers are ready for that.

We can keep the current Makefile but I am in favor of removing this
Kconfig option for now, unify as much as possible all the drivers,
create a common driver for all and then address the single zImage for
all these drivers at the same time.



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