Skip to contentSkip to conversation

ARM: ux500: decomission the non-DT MTU init sequence

PATCH New Linus Walleij 3 participants 5 messages Nov 19, 2013 – Nov 20, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: ux500: decomission the non-DT MTU init sequence

The MTU is now only initialized using the native clocksource device tree matching.

---
 arch/arm/mach-ux500/timer.c | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)
arch/arm/mach-ux500/timer.c +2 -26
index ca60bbd9361b..1a9051b6f932 100644
@@ -10,7 +10,6 @@
 #include <linux/clocksource.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/platform_data/clocksource-nomadik-mtu.h>
 
 #include <asm/smp_twd.h>
 
@@ -44,17 +43,14 @@ const static struct of_device_id prcmu_timer_of_match[] __initconst = {
 
 void __init ux500_timer_init(void)
 {
-	void __iomem *mtu_timer_base;
 	void __iomem *prcmu_timer_base;
 	void __iomem *tmp_base;
 	struct device_node *np;
 
-	if (cpu_is_u8500_family() || cpu_is_ux540_family()) {
-		mtu_timer_base = __io_address(U8500_MTU0_BASE);
+	if (cpu_is_u8500_family() || cpu_is_ux540_family())
 		prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE);
-	} else {
+	else
 		ux500_unknown_soc();
-	}
 
 	np = of_find_matching_node(NULL, prcmu_timer_of_match);
 	if (!np)
@@ -67,26 +63,6 @@ void __init ux500_timer_init(void)
 	prcmu_timer_base = tmp_base;
 
 dt_fail:
-	/* Doing it the old fashioned way. */
-
-	/*
-	 * Here we register the timerblocks active in the system.
-	 * Localtimers (twd) is started when both cpu is up and running.
-	 * MTU register a clocksource, clockevent and sched_clock.
-	 * Since the MTU is located in the VAPE power domain
-	 * it will be cleared in sleep which makes it unsuitable.
-	 * We however need it as a timer tick (clockevent)
-	 * during boot to calibrate delay until twd is started.
-	 * RTC-RTT have problems as timer tick during boot since it is
-	 * depending on delay which is not yet calibrated. RTC-RTT is in the
-	 * always-on powerdomain and is used as clockevent instead of twd when
-	 * sleeping.
-	 * The PRCMU timer 4 register a clocksource and
-	 * sched_clock with higher rating then MTU since is always-on.
-	 *
-	 */
-	if (!of_have_populated_dt())
-		nmdk_timer_init(mtu_timer_base, IRQ_MTU0);
 	clksrc_dbx500_prcmu_init(prcmu_timer_base);
 	ux500_twd_init();
 }
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/2 ARM: ux500: decomission the non-DT MTU init sequence

Quoted 54 lines · Linus Walleij

The MTU is now only initialized using the native clocksource device tree matching.

---
  arch/arm/mach-ux500/timer.c | 28 ++--------------------------
  1 file changed, 2 insertions(+), 26 deletions(-)
arch/arm/mach-ux500/timer.c +2 -16
index ca60bbd9361b..1a9051b6f932 100644
@@ -10,7 +10,6 @@
  #include <linux/clocksource.h>
  #include <linux/of.h>
  #include <linux/of_address.h>
-#include <linux/platform_data/clocksource-nomadik-mtu.h>
 
  #include <asm/smp_twd.h>
 
@@ -44,17 +43,14 @@ const static struct of_device_id prcmu_timer_of_match[] __initconst = {
 
  void __init ux500_timer_init(void)
  {
-	void __iomem *mtu_timer_base;
  	void __iomem *prcmu_timer_base;
  	void __iomem *tmp_base;
  	struct device_node *np;
 
-	if (cpu_is_u8500_family() || cpu_is_ux540_family()) {
-		mtu_timer_base = __io_address(U8500_MTU0_BASE);
+	if (cpu_is_u8500_family() || cpu_is_ux540_family())
  		prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE);
-	} else {
+	else
  		ux500_unknown_soc();
-	}
 
  	np = of_find_matching_node(NULL, prcmu_timer_of_match);
  	if (!np)
@@ -67,26 +63,6 @@ void __init ux500_timer_init(void)
  	prcmu_timer_base = tmp_base;
 
  dt_fail:
-	/* Doing it the old fashioned way. */
-
-	/*
-	 * Here we register the timerblocks active in the system.
-	 * Localtimers (twd) is started when both cpu is up and running.
-	 * MTU register a clocksource, clockevent and sched_clock.
-	 * Since the MTU is located in the VAPE power domain
-	 * it will be cleared in sleep which makes it unsuitable.
-	 * We however need it as a timer tick (clockevent)
-	 * during boot to calibrate delay until twd is started.

arch/arm/mach-ux500/timer.c void __init ux500_timer_init(void) · line 89

Quoted 10 lines
arch/arm/mach-ux500/timer.c +0 -10
-	 * RTC-RTT have problems as timer tick during boot since it is
-	 * depending on delay which is not yet calibrated. RTC-RTT is in the
-	 * always-on powerdomain and is used as clockevent instead of twd when
-	 * sleeping.
-	 * The PRCMU timer 4 register a clocksource and
-	 * sched_clock with higher rating then MTU since is always-on.
-	 *
-	 */
-	if (!of_have_populated_dt())
-		nmdk_timer_init(mtu_timer_base, IRQ_MTU0);

If no timer have been defined in the dt [or wrongly defined], is there a message to tell the user what is wrong ?

Quoted 4 lines
arch/arm/mach-ux500/timer.c +0 -0
  	clksrc_dbx500_prcmu_init(prcmu_timer_base);
  	ux500_twd_init();
  }
Signature · 5 lines
  <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
#2 lore raw
Quoted 7 lines · Daniel Lezcano

Review

Quoted 2 lines · Linus Walleij
(quoted diff) +0 -2
-       if (!of_have_populated_dt())
-               nmdk_timer_init(mtu_timer_base, IRQ_MTU0);

If no timer have been defined in the dt [or wrongly defined], is there a message to tell the user what is wrong ?

Isn't that a question to be asked about a whole lot of such clocksource drivers and ARM platforms?

Most DT-only ARM platforms rely on arch/arm/kernel/time.c to call clocksource_of_init() if the machine_desc->init_time() hook is not set and has zero code to handle any such situation.

So I guess what you're asking is whether we should patch clocksource_of_init() to warn if it cannot find any matching clock sources, like this:

Quoted 1 line

From e55cf038b238d96b28d9fb01b5b6cdf345990d53 Mon Sep 17 00:00:00 2001

From: Linus Walleij <[email protected]>
Date: Tue, 19 Nov 2013 23:52:56 +0100
Subject: [PATCH] clksrc-of: warn if no clock sources are found

Many platforms rely on clocksource_of_init() being implicitly called for registering clock sources and will get zero warnings if no working clock source is available. Let's print a critical error message if no clock source is found.

---
 drivers/clocksource/clksrc-of.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/clocksource/clksrc-of.c +4 -0
index 35639cf4e5a2..a30b42c3ac3b 100644
@@ -28,6 +28,7 @@ void __init clocksource_of_init(void)
     struct device_node *np;
     const struct of_device_id *match;
     clocksource_of_init_fn init_func;
+    unsigned clocksources = 0;
 
     for_each_matching_node_and_match(np, __clksrc_of_table, &match) {
         if (!of_device_is_available(np))
@@ -36,5 +37,8 @@ void __init clocksource_of_init(void)
         init_func = match->data;
         init_func(np);
         of_node_put(np);
+        clocksources++;
     }
+    if (!clocksources)
+        pr_crit("%s: no matching clocksources found\n", __func__);
 }
Signature · 7 lines
1.8.3.1

You can apply this by itself to get the desired warning.
Tell me if you want me to send the patch separately.

Yours,
Linus Walleij
#3 lore raw
Quoted 4 lines · Linus Walleij
Quoted 1 line · Daniel Lezcano

On 11/19/2013 10:27 PM, Linus Walleij wrote:

Quoted 8 lines
Quoted 5 lines

Review

Quoted 2 lines
(quoted diff) +0 -2
-       if (!of_have_populated_dt())
-               nmdk_timer_init(mtu_timer_base, IRQ_MTU0);

If no timer have been defined in the dt [or wrongly defined], is there a message to tell the user what is wrong ?

Isn't that a question to be asked about a whole lot of such clocksource drivers and ARM platforms?

Yes, I did the comment based on your patch but I agree it must be addressed in a global manner.

Quoted 14 lines

Most DT-only ARM platforms rely on arch/arm/kernel/time.c to call clocksource_of_init() if the machine_desc->init_time() hook is not set and has zero code to handle any such situation.

So I guess what you're asking is whether we should patch clocksource_of_init() to warn if it cannot find any matching clock sources, like this:

From e55cf038b238d96b28d9fb01b5b6cdf345990d53 Mon Sep 17 00:00:00 2001
From: Linus Walleij <[email protected]>
Date: Tue, 19 Nov 2013 23:52:56 +0100
Subject: [PATCH] clksrc-of: warn if no clock sources are found

Quoted 6 lines

Many platforms rely on clocksource_of_init() being implicitly called for registering clock sources and will get zero warnings if no working clock source is available. Let's print a critical error message if no clock source is found.

Yes, it sounds right to do this.

Thanks !

-- Daniel

Quoted 26 lines
---
  drivers/clocksource/clksrc-of.c | 4 ++++
  1 file changed, 4 insertions(+)
drivers/clocksource/clksrc-of.c +4 -0
index 35639cf4e5a2..a30b42c3ac3b 100644
@@ -28,6 +28,7 @@ void __init clocksource_of_init(void)
      struct device_node *np;
      const struct of_device_id *match;
      clocksource_of_init_fn init_func;
+    unsigned clocksources = 0;
 
      for_each_matching_node_and_match(np, __clksrc_of_table, &match) {
          if (!of_device_is_available(np))
@@ -36,5 +37,8 @@ void __init clocksource_of_init(void)
          init_func = match->data;
          init_func(np);
          of_node_put(np);
+        clocksources++;
      }
+    if (!clocksources)
+        pr_crit("%s: no matching clocksources found\n", __func__);
  }
Signature · 5 lines
  <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
#4 lore raw

PATCH 1/2 ARM: ux500: decomission the non-DT MTU init sequence

In reply to Linus Walleij
Quoted 7 lines · Linus Walleij

The MTU is now only initialized using the native clocksource device tree matching.

---
 arch/arm/mach-ux500/timer.c | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog