Re: [PATCH 5/7] clocksource/drivers/pxa_timer: Move the Kconfig rule

Re: [PATCH 5/7] clocksource/drivers/pxa_timer: Move the Kconfig rule

[Amit Kucheria]

On Fri, Oct 30, 2015 at 4:22 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> Instead of having the clocksource's Kconfig depending on the arch, let the
> arch to select the timer it needs.

Is this the prescribed way to do things nowadays? It leads to more
options showing up in 'make menuconfig'. Why do I need to see
CLKSRC_PXA if I'm not even compiling for ARCH_PXA (and not interesting
in COMPILE_TEST)?

> The CLKSRC_OF dependency is removed because already selected by the ARCH_PXA,
> and it is added for SA1100.

This bit makes sense.

> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
>  arch/arm/Kconfig            | 3 +++
>  drivers/clocksource/Kconfig | 3 +--
>  2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 72ad724..aa32286 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -609,6 +609,7 @@ config ARCH_PXA
>         select AUTO_ZRELADDR
>         select COMMON_CLK
>         select CLKDEV_LOOKUP
> +       select CLKSRC_PXA
>         select CLKSRC_MMIO
>         select CLKSRC_OF
>         select GENERIC_CLOCKEVENTS
> @@ -669,6 +670,8 @@ config ARCH_SA1100
>         select ARCH_SPARSEMEM_ENABLE
>         select CLKDEV_LOOKUP
>         select CLKSRC_MMIO
> +       select CLKSRC_PXA
> +       select CLKSRC_OF if OF
>         select CPU_FREQ
>         select CPU_SA1100
>         select GENERIC_CLOCKEVENTS
> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> index 5cd000c..425abbd 100644
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -289,8 +289,7 @@ config CLKSRC_TANGO_XTAL
>         select CLKSRC_OF
>
>  config CLKSRC_PXA
> -       def_bool y if ARCH_PXA || ARCH_SA1100
> -       select CLKSRC_OF if OF
> +       bool

Re: [PATCH 5/7] clocksource/drivers/pxa_timer: Move the Kconfig rule

[Daniel Lezcano]

Hi Amit,

On 11/02/2015 08:44 AM, Amit Kucheria wrote:
> On Fri, Oct 30, 2015 at 4:22 AM, Daniel Lezcano
> <daniel.lezcano@linaro.org> wrote:
>> Instead of having the clocksource's Kconfig depending on the arch, let the
>> arch to select the timer it needs.
>
> Is this the prescribed way to do things nowadays? It leads to more
> options showing up in 'make menuconfig'. Why do I need to see
> CLKSRC_PXA if I'm not even compiling for ARCH_PXA (and not interesting
> in COMPILE_TEST)?

That won't happen.

As the 'bool' has no string after, it won't show up in the menuconfig.

Actually, with the next patch, only COMPILE_TEST will show it up in the

Device Drivers->Clocksource drivers.

>> The CLKSRC_OF dependency is removed because already selected by the ARCH_PXA,
>> and it is added for SA1100.
>
> This bit makes sense.
>
>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>> ---
>>   arch/arm/Kconfig            | 3 +++
>>   drivers/clocksource/Kconfig | 3 +--
>>   2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>> index 72ad724..aa32286 100644
>> --- a/arch/arm/Kconfig
>> +++ b/arch/arm/Kconfig
>> @@ -609,6 +609,7 @@ config ARCH_PXA
>>          select AUTO_ZRELADDR
>>          select COMMON_CLK
>>          select CLKDEV_LOOKUP
>> +       select CLKSRC_PXA
>>          select CLKSRC_MMIO
>>          select CLKSRC_OF
>>          select GENERIC_CLOCKEVENTS
>> @@ -669,6 +670,8 @@ config ARCH_SA1100
>>          select ARCH_SPARSEMEM_ENABLE
>>          select CLKDEV_LOOKUP
>>          select CLKSRC_MMIO
>> +       select CLKSRC_PXA
>> +       select CLKSRC_OF if OF
>>          select CPU_FREQ
>>          select CPU_SA1100
>>          select GENERIC_CLOCKEVENTS
>> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
>> index 5cd000c..425abbd 100644
>> --- a/drivers/clocksource/Kconfig
>> +++ b/drivers/clocksource/Kconfig
>> @@ -289,8 +289,7 @@ config CLKSRC_TANGO_XTAL
>>          select CLKSRC_OF
>>
>>   config CLKSRC_PXA
>> -       def_bool y if ARCH_PXA || ARCH_SA1100
>> -       select CLKSRC_OF if OF
>> +       bool


-- 
  <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 5/7] clocksource/drivers/pxa_timer: Move the Kconfig rule

[Amit Kucheria]

On Mon, Nov 2, 2015 at 1:33 PM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
>
> Hi Amit,
>
> On 11/02/2015 08:44 AM, Amit Kucheria wrote:
>>
>> On Fri, Oct 30, 2015 at 4:22 AM, Daniel Lezcano
>> <daniel.lezcano@linaro.org> wrote:
>>>
>>> Instead of having the clocksource's Kconfig depending on the arch, let
>>> the
>>> arch to select the timer it needs.
>>
>>
>> Is this the prescribed way to do things nowadays? It leads to more
>> options showing up in 'make menuconfig'. Why do I need to see
>> CLKSRC_PXA if I'm not even compiling for ARCH_PXA (and not interesting
>> in COMPILE_TEST)?
>
>
> That won't happen.
>
> As the 'bool' has no string after, it won't show up in the menuconfig.

Nice, I didn't know that.

> Actually, with the next patch, only COMPILE_TEST will show it up in the
>
> Device Drivers->Clocksource drivers.

Thanks.

[PATCH 1/7] time: Define dummy functions for the generic sched clock

[Daniel Lezcano]

When we try to compile a clocksource driver with the COMPILE_TEST option, we
can't select the GENERIC_SCHED_CLOCK because the sched_clock() symbol will be
duplicated with the one defined for the x86.

In order to fix that, we don't select the GENERIC_SCHED_CLOCK in the driver
Kconfig's file but we define some empty functions for the different symbols
in order to prevent the unresolved ones.

This patch fixes the COMPILE_TEST option for the compile test coverage for the
clocksource drivers. Without this patch, we can't add the COMPILE_TEST option
for the clocksource drivers using the GENERIC_SCHED_CLOCK.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 include/linux/sched_clock.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/linux/sched_clock.h b/include/linux/sched_clock.h
index efa931c..b2ec7bb 100644
--- a/include/linux/sched_clock.h
+++ b/include/linux/sched_clock.h
@@ -10,11 +10,17 @@
 
 #ifdef CONFIG_GENERIC_SCHED_CLOCK
 extern void sched_clock_postinit(void);
+
+extern void sched_clock_register(u64 (*read)(void), int bits,
+                                 unsigned long rate);
 #else
 static inline void sched_clock_postinit(void) { }
-#endif
 
-extern void sched_clock_register(u64 (*read)(void), int bits,
-				 unsigned long rate);
+static inline void sched_clock_register(u64 (*read)(void), int bits,
+					 unsigned long rate)
+{
+	;
+}
+#endif
 
 #endif
-- 
1.9.1

[PATCH 5/7] clocksource/drivers/pxa_timer: Move the Kconfig rule

[Daniel Lezcano]

Instead of having the clocksource's Kconfig depending on the arch, let the
arch to select the timer it needs.

The CLKSRC_OF dependency is removed because already selected by the ARCH_PXA,
and it is added for SA1100.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 arch/arm/Kconfig            | 3 +++
 drivers/clocksource/Kconfig | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 72ad724..aa32286 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -609,6 +609,7 @@ config ARCH_PXA
 	select AUTO_ZRELADDR
 	select COMMON_CLK
 	select CLKDEV_LOOKUP
+	select CLKSRC_PXA
 	select CLKSRC_MMIO
 	select CLKSRC_OF
 	select GENERIC_CLOCKEVENTS
@@ -669,6 +670,8 @@ config ARCH_SA1100
 	select ARCH_SPARSEMEM_ENABLE
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
+	select CLKSRC_PXA
+	select CLKSRC_OF if OF
 	select CPU_FREQ
 	select CPU_SA1100
 	select GENERIC_CLOCKEVENTS
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 5cd000c..425abbd 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -289,8 +289,7 @@ config CLKSRC_TANGO_XTAL
 	select CLKSRC_OF
 
 config CLKSRC_PXA
-	def_bool y if ARCH_PXA || ARCH_SA1100
-	select CLKSRC_OF if OF
+	bool
 	help
 	  This enables OST0 support available on PXA and SA-11x0
 	  platforms.
-- 
1.9.1