[RFC PATCH] ARM: clocksource: make ARM_GLOBAL_TIMER selectable

[RFC PATCH] ARM: clocksource: make ARM_GLOBAL_TIMER selectable

[Grygorii Strashko]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="y", Size: 6955 bytes --]

This patch intended to fix following cases: 
- SoC-A has ARM GT, defines DT node for ARM GT and selects ARM_GLOBAL_TIMER
statically in Kconfig file. SoC-B has ARM GT and defines DT node for ARM GT,
but do not selects ARM_GLOBAL_TIMER statically in Kconfig file. In case of
multiplatform build ARM GT will be implicitly enabled for SoC-B.

- There is no way to disable ARM GT without modifying Kconfig file,
once ARM_GLOBAL_TIMER is selected statically in Kconfig file.

Hence, fix above case by defining both HAVE_ARM_GLOBAL_TIMER and
ARM_GLOBAL_TIMER as recommended by 'Adding common features and make
the usage configurable' section in kconfig-language.txt. All places in
ARM folder where ARM_GLOBAL_TIMER was used now replaced on
HAVE_ARM_GLOBAL_TIMER.

Cc: Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
Cc: Wei Xu <xuwei5-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
Cc: Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Cc: Srinivas Kandagatla <srinivas.kandagatla-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Maxime Coquelin <maxime.coquelin-qxv4g6HH51o@public.gmane.org>
Cc: Masahiro Yamada <yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org>
Cc: Liviu Dudau <liviu.dudau-5wv7dgnIgG8@public.gmane.org>
Cc: Sudeep Holla <sudeep.holla-5wv7dgnIgG8@public.gmane.org>
Cc: Jun Nie <jun.nie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
Cc: "Sören Brinkmann" <soren.brinkmann-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
Cc: Daniel Lezcano <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

Signed-off-by: Grygorii Strashko <grygorii.strashko-l0cyMroinI0@public.gmane.org>
---
 arch/arm/mach-bcm/Kconfig      | 4 ++--
 arch/arm/mach-hisi/Kconfig     | 2 +-
 arch/arm/mach-imx/Kconfig      | 2 +-
 arch/arm/mach-rockchip/Kconfig | 2 +-
 arch/arm/mach-sti/Kconfig      | 2 +-
 arch/arm/mach-uniphier/Kconfig | 2 +-
 arch/arm/mach-vexpress/Kconfig | 2 +-
 arch/arm/mach-zx/Kconfig       | 2 +-
 arch/arm/mach-zynq/Kconfig     | 2 +-
 drivers/clocksource/Kconfig    | 7 ++++++-
 10 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 7ef1214..d4d079a7 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -14,7 +14,7 @@ config ARCH_BCM_IPROC
 	select CACHE_L2X0
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
-	select ARM_GLOBAL_TIMER
+	select HAVE_ARM_GLOBAL_TIMER
 	select COMMON_CLK_IPROC
 	select CLKSRC_MMIO
 	select ARCH_REQUIRE_GPIOLIB
@@ -156,7 +156,7 @@ config ARCH_BCM_63XX
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_764369 if SMP
 	select ARM_GIC
-	select ARM_GLOBAL_TIMER
+	select HAVE_ARM_GLOBAL_TIMER
 	select CACHE_L2X0
 	select HAVE_ARM_ARCH_TIMER
 	select HAVE_ARM_TWD if SMP
diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig
index a3b091a..251bb03 100644
--- a/arch/arm/mach-hisi/Kconfig
+++ b/arch/arm/mach-hisi/Kconfig
@@ -28,7 +28,7 @@ config ARCH_HIP01
        depends on ARCH_MULTI_V7
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
-       select ARM_GLOBAL_TIMER
+       select HAVE_ARM_GLOBAL_TIMER
        help
          Support for Hisilicon HIP01 SoC family
 
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 15df34fb..7ea4c65 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -600,7 +600,7 @@ choice
 	config VF_USE_ARM_GLOBAL_TIMER
 		bool "Use ARM Global Timer"
 		depends on ARCH_MULTI_V7
-		select ARM_GLOBAL_TIMER
+		select HAVE_ARM_GLOBAL_TIMER
 		select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 		help
 		  Use the ARM Global Timer as clocksource
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index cef42fd..a53b787 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -14,7 +14,7 @@ config ARCH_ROCKCHIP
 	select DW_APB_TIMER_OF
 	select REGULATOR if PM
 	select ROCKCHIP_TIMER
-	select ARM_GLOBAL_TIMER
+	select HAVE_ARM_GLOBAL_TIMER
 	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 	help
 	  Support for Rockchip's Cortex-A9 Single-to-Quad-Core-SoCs
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index a196d14..c799f9d 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -3,7 +3,7 @@ menuconfig ARCH_STI
 	depends on ARCH_MULTI_V7
 	select ARM_GIC
 	select ST_IRQCHIP
-	select ARM_GLOBAL_TIMER
+	select HAVE_ARM_GLOBAL_TIMER
 	select CLKSRC_ST_LPC
 	select PINCTRL
 	select PINCTRL_ST
diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 82dddee..81bdf77 100644
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -2,7 +2,7 @@ config ARCH_UNIPHIER
 	bool "Socionext UniPhier SoCs"
 	depends on ARCH_MULTI_V7
 	select ARM_AMBA
-	select ARM_GLOBAL_TIMER
+	select HAVE_ARM_GLOBAL_TIMER
 	select ARM_GIC
 	select HAVE_ARM_SCU
 	select HAVE_ARM_TWD if SMP
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 398a297..e89941d 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -5,7 +5,7 @@ menuconfig ARCH_VEXPRESS
 	select ARCH_SUPPORTS_BIG_ENDIAN
 	select ARM_AMBA
 	select ARM_GIC
-	select ARM_GLOBAL_TIMER
+	select HAVE_ARM_GLOBAL_TIMER
 	select ARM_TIMER_SP804
 	select COMMON_CLK_VERSATILE
 	select HAVE_ARM_SCU if SMP
diff --git a/arch/arm/mach-zx/Kconfig b/arch/arm/mach-zx/Kconfig
index 209c979..e84b0c2 100644
--- a/arch/arm/mach-zx/Kconfig
+++ b/arch/arm/mach-zx/Kconfig
@@ -11,7 +11,7 @@ if ARCH_ZX
 config SOC_ZX296702
 	def_bool y
 	select ARM_GIC
-	select ARM_GLOBAL_TIMER
+	select HAVE_ARM_GLOBAL_TIMER
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
 	select PM_GENERIC_DOMAINS if PM
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index fd0aeeb..3165720 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -5,7 +5,7 @@ config ARCH_ZYNQ
 	select ARCH_SUPPORTS_BIG_ENDIAN
 	select ARM_AMBA
 	select ARM_GIC
-	select ARM_GLOBAL_TIMER if !CPU_FREQ
+	select HAVE_ARM_GLOBAL_TIMER if !CPU_FREQ
 	select CADENCE_TTC_TIMER
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 33db740..9fcb5a8 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -206,9 +206,14 @@ config ARM_ARCH_TIMER_EVTSTREAM
 	  This must be disabled for hardware validation purposes to detect any
 	  hardware anomalies of missing events.
 
-config ARM_GLOBAL_TIMER
+config HAVE_ARM_GLOBAL_TIMER
 	bool
+
+config ARM_GLOBAL_TIMER
+	bool "Support for ARM global timer unit"
 	select CLKSRC_OF if OF
+	default y
+	depends on HAVE_ARM_GLOBAL_TIMER
 	help
 	  This options enables support for the ARM global timer unit
 
-- 
2.7.0



[-- Attachment #2: Type: text/plain, Size: 200 bytes --]

_______________________________________________
Linux-rockchip mailing list
Linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

Re: [RFC PATCH] ARM: clocksource: make ARM_GLOBAL_TIMER selectable

[Sören Brinkmann]

On Thu, 2016-02-04 at 20:20:17 +0200, Grygorii Strashko wrote:
> This patch intended to fix following cases: 
> - SoC-A has ARM GT, defines DT node for ARM GT and selects ARM_GLOBAL_TIMER
> statically in Kconfig file. SoC-B has ARM GT and defines DT node for ARM GT,
> but do not selects ARM_GLOBAL_TIMER statically in Kconfig file. In case of
> multiplatform build ARM GT will be implicitly enabled for SoC-B.
> 
> - There is no way to disable ARM GT without modifying Kconfig file,
> once ARM_GLOBAL_TIMER is selected statically in Kconfig file.
> 
> Hence, fix above case by defining both HAVE_ARM_GLOBAL_TIMER and
> ARM_GLOBAL_TIMER as recommended by 'Adding common features and make
> the usage configurable' section in kconfig-language.txt. All places in
> ARM folder where ARM_GLOBAL_TIMER was used now replaced on
> HAVE_ARM_GLOBAL_TIMER.
> 
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Wei Xu <xuwei5@hisilicon.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
> Cc: Maxime Coquelin <maxime.coquelin@st.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Liviu Dudau <liviu.dudau@arm.com>
> Cc: Sudeep Holla <sudeep.holla@arm.com>
> Cc: Jun Nie <jun.nie@linaro.org>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> 
> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
> ---
[...]
> diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
> index fd0aeeb..3165720 100644
> --- a/arch/arm/mach-zynq/Kconfig
> +++ b/arch/arm/mach-zynq/Kconfig
> @@ -5,7 +5,7 @@ config ARCH_ZYNQ
>  	select ARCH_SUPPORTS_BIG_ENDIAN
>  	select ARM_AMBA
>  	select ARM_GIC
> -	select ARM_GLOBAL_TIMER if !CPU_FREQ
> +	select HAVE_ARM_GLOBAL_TIMER if !CPU_FREQ

We actually have this issue, as we don't want to use GT when CPU_FREQ is
enabled. But with this change the 'if !CPU_FREQ' becomes obsolete.

Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>

	Sören

Re: [RFC PATCH] ARM: clocksource: make ARM_GLOBAL_TIMER selectable

[Moritz Fischer]

Hi Soeren,

On Thu, Feb 4, 2016 at 2:41 PM, Sören Brinkmann
<soren.brinkmann@xilinx.com> wrote:

> But with this change the 'if !CPU_FREQ' becomes obsolete.
I'm confused, could you explain that statement? You don't want people
accidentally running with GT when CPU_FREQ is on, right?

Patch looks good to me, FWIW:

Acked-by: Moritz Fischer <moritz.fischer@ettus.com>

Moritz

Re: [RFC PATCH] ARM: clocksource: make ARM_GLOBAL_TIMER selectable

[Sören Brinkmann]

On Thu, 2016-02-04 at 15:14:47 -0800, Moritz Fischer wrote:
> Hi Soeren,
> 
> On Thu, Feb 4, 2016 at 2:41 PM, Sören Brinkmann
> <soren.brinkmann@xilinx.com> wrote:
> 
> > But with this change the 'if !CPU_FREQ' becomes obsolete.
> I'm confused, could you explain that statement? You don't want people
> accidentally running with GT when CPU_FREQ is on, right?

Correct. But with this Kconfig rework you can just deselect it in
Kconfig. The generic HAVE_GT could always be selected.

	Sören

Re: [RFC PATCH] ARM: clocksource: make ARM_GLOBAL_TIMER selectable

[Grygorii Strashko]

On 02/05/2016 01:39 AM, Sören Brinkmann wrote:
> On Thu, 2016-02-04 at 15:14:47 -0800, Moritz Fischer wrote:
>> Hi Soeren,
>>
>> On Thu, Feb 4, 2016 at 2:41 PM, Sören Brinkmann
>> <soren.brinkmann@xilinx.com> wrote:
>>
>>> But with this change the 'if !CPU_FREQ' becomes obsolete.
>> I'm confused, could you explain that statement? You don't want people
>> accidentally running with GT when CPU_FREQ is on, right?
> 
> Correct. But with this Kconfig rework you can just deselect it in
> Kconfig. The generic HAVE_GT could always be selected.
> 


Don't know whom should i ask - but what will be the final conclusion here?
Can it be merged?

-- 
regards,
-grygorii

_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

Re: [RFC PATCH] ARM: clocksource: make ARM_GLOBAL_TIMER selectable

[Sören Brinkmann]

On Fri, 2016-02-26 at 15:03:19 +0200, Grygorii Strashko wrote:
> On 02/05/2016 01:39 AM, Sören Brinkmann wrote:
> > On Thu, 2016-02-04 at 15:14:47 -0800, Moritz Fischer wrote:
> >> Hi Soeren,
> >>
> >> On Thu, Feb 4, 2016 at 2:41 PM, Sören Brinkmann
> >> <soren.brinkmann@xilinx.com> wrote:
> >>
> >>> But with this change the 'if !CPU_FREQ' becomes obsolete.
> >> I'm confused, could you explain that statement? You don't want people
> >> accidentally running with GT when CPU_FREQ is on, right?
> > 
> > Correct. But with this Kconfig rework you can just deselect it in
> > Kconfig. The generic HAVE_GT could always be selected.
> > 
> 
> 
> Don't know whom should i ask - but what will be the final conclusion here?
> Can it be merged?

I think we don't break anything either way. Would just be some
additional clean up to get rid of that mentioned constraint (which
doesn't really work well anyway in the multi-arch kernel). So, no real
objections to merging it from my side.

	Thanks,
	Sören

_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

Re: [RFC PATCH] ARM: clocksource: make ARM_GLOBAL_TIMER selectable

[Grygorii Strashko]

On 02/26/2016 10:27 PM, Sören Brinkmann wrote:
> On Fri, 2016-02-26 at 15:03:19 +0200, Grygorii Strashko wrote:
>> On 02/05/2016 01:39 AM, Sören Brinkmann wrote:
>>> On Thu, 2016-02-04 at 15:14:47 -0800, Moritz Fischer wrote:
>>>> Hi Soeren,
>>>>
>>>> On Thu, Feb 4, 2016 at 2:41 PM, Sören Brinkmann
>>>> <soren.brinkmann@xilinx.com> wrote:
>>>>
>>>>> But with this change the 'if !CPU_FREQ' becomes obsolete.
>>>> I'm confused, could you explain that statement? You don't want people
>>>> accidentally running with GT when CPU_FREQ is on, right?
>>>
>>> Correct. But with this Kconfig rework you can just deselect it in
>>> Kconfig. The generic HAVE_GT could always be selected.
>>>
>>
>>
>> Don't know whom should i ask - but what will be the final conclusion here?
>> Can it be merged?
> 
> I think we don't break anything either way. Would just be some
> additional clean up to get rid of that mentioned constraint (which
> doesn't really work well anyway in the multi-arch kernel). So, no real
> objections to merging it from my side.
> 

Yeah. Thanks

I'll re-send it after 4.6-rc.
But What I'm not fully understand is how to get it merged taking into account that
it touches few maches & clocksource :( 

-- 
regards,
-grygorii

_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

Re: [RFC PATCH] ARM: clocksource: make ARM_GLOBAL_TIMER selectable

[Daniel Lezcano]

On 03/08/2016 11:55 AM, Grygorii Strashko wrote:
> Yeah. Thanks
>
> I'll re-send it after 4.6-rc.
> But What I'm not fully understand is how to get it merged taking into account that
> it touches few maches & clocksource :(

This is not a problem. Send it based on timers/core from the tip tree 
and Cc the maintainers for the maches dir. As soon as they ack the 
patches, I will merge it through my tree.

Thanks

   -- Daniel



-- 
  <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: [RFC PATCH] ARM: clocksource: make ARM_GLOBAL_TIMER selectable

[Grygorii Strashko]

Hi Daniel,
On 03/17/2016 03:42 PM, Daniel Lezcano wrote:
> On 03/08/2016 11:55 AM, Grygorii Strashko wrote:
>> Yeah. Thanks
>>
>> I'll re-send it after 4.6-rc.
>> But What I'm not fully understand is how to get it merged taking into 
>> account that
>> it touches few maches & clocksource :(
> 
> This is not a problem. Send it based on timers/core from the tip tree 
> and Cc the maintainers for the maches dir. As soon as they ack the 
> patches, I will merge it through my tree.
> 

I've rebased my patch on top of 4.6-rc2 and extended it on new mach
arch/arm/mach-artpec.

Then, as you've suggested, I've tried to apply it on top of 
kernel-tip/timers/core
kernel-tip := git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git

but seems timers/core is obsolete (It doesn't contain arch/arm/mach-artpec yet).

Should I wait more or can resend it basing on top of  4.6-rc2?



-- 
regards,
-grygorii

Re: [RFC PATCH] ARM: clocksource: make ARM_GLOBAL_TIMER selectable

[Daniel Lezcano]

On Mon, Apr 04, 2016 at 06:12:30PM +0300, Grygorii Strashko wrote:
> Hi Daniel,
> On 03/17/2016 03:42 PM, Daniel Lezcano wrote:
> > On 03/08/2016 11:55 AM, Grygorii Strashko wrote:
> >> Yeah. Thanks
> >>
> >> I'll re-send it after 4.6-rc.
> >> But What I'm not fully understand is how to get it merged taking into 
> >> account that
> >> it touches few maches & clocksource :(
> > 
> > This is not a problem. Send it based on timers/core from the tip tree 
> > and Cc the maintainers for the maches dir. As soon as they ack the 
> > patches, I will merge it through my tree.
> > 
> 
> I've rebased my patch on top of 4.6-rc2 and extended it on new mach
> arch/arm/mach-artpec.
> 
> Then, as you've suggested, I've tried to apply it on top of 
> kernel-tip/timers/core
> kernel-tip := git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
> 
> but seems timers/core is obsolete (It doesn't contain arch/arm/mach-artpec yet).
> 
> Should I wait more or can resend it basing on top of  4.6-rc2?
> 

Yes, wait a bit the tip tree is updated.

Thanks

  -- Daniel