Skip to contentSkip to conversation

clocksource/clockevents fixes for 3.13

GIT PULL Daniel Lezcano 3 participants 4 messages Dec 10, 2013

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

Hi Thomas, Ingo,

here are the fixes for 3.13 based on timers/urgent

* Axel Lin added a missing dependency on CLKSRC_MMIO in the Kconfig
for the time-efm32.

* Dinh Nguyen fixed read_sched_clock to return the right value for the
dw_apb_timer.

* Ezequiel Garcia registered the sched clock after the counter, thus
preventing time jump in the traces for the armada-370-xp.

* Marc Zyngier stopped the timer before enabling the irq in order to
prevent it to be fired before the clockevent is registered for the sunxi.

* Thierry Reding removed a of_node_put in clksrc-of because the
reference is not held.

Thanks

-- Daniel

----------------------------------------------------------------

The following changes since commit 0e576acbc1d9600cf2d9b4a141a2554639959d50:

nohz: Fix another inconsistency between CONFIG_NO_HZ=n and nohz=off
(2013-11-29 12:23:03 +0100)

are available in the git repository at:

git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/fixes

for you to fetch changes up to d28420aabbe4a7792c9ef4f5c4bd6e776414583f:

clocksource: sunxi: Stop timer from ticking before enabling
interrupts (2013-12-10 13:56:43 +0100)

----------------------------------------------------------------
Axel Lin (1):
clocksource: time-efm32: Select CLKSRC_MMIO

Dinh Nguyen (2):
clocksource: dw_apb_timer: Move timer defines to header file.
clocksource: dw_apb_timer_of: Fix read_sched_clock

Ezequiel Garcia (1):
clocksource: armada-370-xp: Register sched_clock after the
counter res
Marc Zyngier (1):
clocksource: sunxi: Stop timer from ticking before enabling
interrupts

Thierry Reding (1):
clocksource: clksrc-of: Do not drop unheld reference on device node

 drivers/clocksource/Kconfig              |    1 +
 drivers/clocksource/clksrc-of.c          |    1 -
 drivers/clocksource/dw_apb_timer.c       |   19 -------------------
 drivers/clocksource/dw_apb_timer_of.c    |    9 +++++----
 drivers/clocksource/sun4i_timer.c        |    3 +++
 drivers/clocksource/time-armada-370-xp.c |   10 +++++-----
 include/linux/dw_apb_timer.h             |   19 +++++++++++++++++++
 7 files changed, 33 insertions(+), 29 deletions(-)
drivers/clocksource/Kconfig +1 -0
index 5c07a56..634c4d6 100644
@@ -75,6 +75,7 @@ config CLKSRC_DBX500_PRCMU_SCHED_CLOCK
 config CLKSRC_EFM32
 	bool "Clocksource for Energy Micro's EFM32 SoCs" if !ARCH_EFM32
 	depends on OF && ARM && (ARCH_EFM32 || COMPILE_TEST)
+	select CLKSRC_MMIO
 	default ARCH_EFM32
 	help
 	  Support to use the timers of EFM32 SoCs as clock source and clock
drivers/clocksource/clksrc-of.c +0 -1
index 35639cf4..b9ddd9e 100644
@@ -35,6 +35,5 @@ void __init clocksource_of_init(void)
 
 		init_func = match->data;
 		init_func(np);
-		of_node_put(np);
 	}
 }
drivers/clocksource/dw_apb_timer.c +0 -19
index e54ca10..c3a8f52 100644
@@ -18,25 +18,6 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
-#define APBT_MIN_PERIOD			4
-#define APBT_MIN_DELTA_USEC		200
-
-#define APBTMR_N_LOAD_COUNT		0x00
-#define APBTMR_N_CURRENT_VALUE		0x04
-#define APBTMR_N_CONTROL		0x08
-#define APBTMR_N_EOI			0x0c
-#define APBTMR_N_INT_STATUS		0x10
-
-#define APBTMRS_INT_STATUS		0xa0
-#define APBTMRS_EOI			0xa4
-#define APBTMRS_RAW_INT_STATUS		0xa8
-#define APBTMRS_COMP_VERSION		0xac
-
-#define APBTMR_CONTROL_ENABLE		(1 << 0)
-/* 1: periodic, 0:free running. */
-#define APBTMR_CONTROL_MODE_PERIODIC	(1 << 1)
-#define APBTMR_CONTROL_INT		(1 << 2)
-
 static inline struct dw_apb_clock_event_device *
 ced_to_dw_apb_ced(struct clock_event_device *evt)
 {
drivers/clocksource/dw_apb_timer_of.c +2 -3
index 45ba8ae..c3fe17e 100644
@@ -102,18 +102,17 @@ static void __init add_clocksource(struct device_node *source_timer)
 	 * timer is found. sched_io_base then points to the current_value
 	 * register of the clocksource timer.
 	 */
-	sched_io_base = iobase + 0x04;
+	sched_io_base = iobase;
 	sched_rate = rate;
 }
 
 static u64 read_sched_clock(void)
 {
-	return __raw_readl(sched_io_base);
+	return ~__raw_readl(sched_io_base + APBTMR_N_CURRENT_VALUE);
 }
 
 static const struct of_device_id sptimer_ids[] __initconst = {
 	{ .compatible = "picochip,pc3x2-rtc" },
-	{ .compatible = "snps,dw-apb-timer-sp" },
 	{ /* Sentinel */ },
 };
 
@@ -151,4 +150,6 @@ static void __init dw_apb_timer_init(struct device_node *timer)
 	num_called++;
 }
 CLOCKSOURCE_OF_DECLARE(pc3x2_timer, "picochip,pc3x2-timer", 

dw_apb_timer_init);
-CLOCKSOURCE_OF_DECLARE(apb_timer, "snps,dw-apb-timer-osc", dw_apb_timer_init); +CLOCKSOURCE_OF_DECLARE(apb_timer_osc, "snps,dw-apb-timer-osc", dw_apb_timer_init); +CLOCKSOURCE_OF_DECLARE(apb_timer_sp, "snps,dw-apb-timer-sp", dw_apb_timer_init); +CLOCKSOURCE_OF_DECLARE(apb_timer, "snps,dw-apb-timer", dw_apb_timer_init);

drivers/clocksource/sun4i_timer.c +3 -0
index 2fb4695..a4f6119 100644
@@ -179,6 +179,9 @@ static void __init sun4i_timer_init(struct device_node *node)
 	writel(TIMER_CTL_CLK_SRC(TIMER_CTL_CLK_SRC_OSC24M),
 	       timer_base + TIMER_CTL_REG(0));
 
+	/* Make sure timer is stopped before playing with interrupts */
+	sun4i_clkevt_time_stop(0);
+
 	ret = setup_irq(irq, &sun4i_timer_irq);
 	if (ret)
 		pr_warn("failed to setup irq %d\n", irq);
drivers/clocksource/time-armada-370-xp.c +5 -5
index d8e47e5..4e7f680 100644
@@ -256,11 +256,6 @@ static void __init armada_370_xp_timer_common_init(struct device_node *np)
 	ticks_per_jiffy = (timer_clk + HZ / 2) / HZ;
 
 	/*
-	 * Set scale and timer for sched_clock.
-	 */
-	sched_clock_register(armada_370_xp_read_sched_clock, 32, timer_clk);
-
-	/*
 	 * Setup free-running clocksource timer (interrupts
 	 * disabled).
 	 */
@@ -270,6 +265,11 @@ static void __init armada_370_xp_timer_common_init(struct device_node *np)
 	timer_ctrl_clrset(0, TIMER0_EN | TIMER0_RELOAD_EN |
 			     TIMER0_DIV(TIMER_DIVIDER_SHIFT));
 
+	/*
+	 * Set scale and timer for sched_clock.
+	 */
+	sched_clock_register(armada_370_xp_read_sched_clock, 32, timer_clk);
+
 	clocksource_mmio_init(timer_base + TIMER0_VAL_OFF,
 			      "armada_370_xp_clocksource",
 			      timer_clk, 300, 32, clocksource_mmio_readl_down);
include/linux/dw_apb_timer.h +19 -0
index 1f79b20..1d2b949 100644
@@ -19,6 +19,25 @@
 
 #define APBTMRS_REG_SIZE       0x14
 
+#define APBT_MIN_PERIOD                 4
+#define APBT_MIN_DELTA_USEC             200
+
+#define APBTMR_N_LOAD_COUNT             0x00
+#define APBTMR_N_CURRENT_VALUE          0x04
+#define APBTMR_N_CONTROL                0x08
+#define APBTMR_N_EOI                    0x0c
+#define APBTMR_N_INT_STATUS             0x10
+
+#define APBTMRS_INT_STATUS              0xa0
+#define APBTMRS_EOI                     0xa4
+#define APBTMRS_RAW_INT_STATUS          0xa8
+#define APBTMRS_COMP_VERSION            0xac
+
+#define APBTMR_CONTROL_ENABLE           (1 << 0)
+/* 1: periodic, 0:free running. */
+#define APBTMR_CONTROL_MODE_PERIODIC    (1 << 1)
+#define APBTMR_CONTROL_INT              (1 << 2)
+
 struct dw_apb_timer {
 	void __iomem				*base;
 	unsigned long				freq;
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
#1 lore raw
Quoted 14 lines · Daniel Lezcano

Hi Thomas, Ingo,

here are the fixes for 3.13 based on timers/urgent

* Axel Lin added a missing dependency on CLKSRC_MMIO in the Kconfig
for the time-efm32.

* Dinh Nguyen fixed read_sched_clock to return the right value for
the dw_apb_timer.

* Ezequiel Garcia registered the sched clock after the counter,
thus preventing time jump in the traces for the armada-370-xp.

Quoted 6 lines

* Marc Zyngier stopped the timer before enabling the irq in order
to prevent it to be fired before the clockevent is registered for the sunxi.

* Thierry Reding removed a of_node_put in clksrc-of because the
reference is not held.

(For future reference, please post all patches not just a combo patch.)

Quoted 3 lines

Dinh Nguyen (2):
clocksource: dw_apb_timer: Move timer defines to header file.
clocksource: dw_apb_timer_of: Fix read_sched_clock

Nit: we generally don't use periods at the end of titles, it looks inconsistent in shortlogs.

Quoted 40 lines
drivers/clocksource/dw_apb_timer.c +0 -19
index e54ca10..c3a8f52 100644
@@ -18,25 +18,6 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
-#define APBT_MIN_PERIOD			4
-#define APBT_MIN_DELTA_USEC		200
-
-#define APBTMR_N_LOAD_COUNT		0x00
-#define APBTMR_N_CURRENT_VALUE		0x04
-#define APBTMR_N_CONTROL		0x08
-#define APBTMR_N_EOI			0x0c
-#define APBTMR_N_INT_STATUS		0x10
-
-#define APBTMRS_INT_STATUS		0xa0
-#define APBTMRS_EOI			0xa4
-#define APBTMRS_RAW_INT_STATUS		0xa8
-#define APBTMRS_COMP_VERSION		0xac
-
-#define APBTMR_CONTROL_ENABLE		(1 << 0)
-/* 1: periodic, 0:free running. */
-#define APBTMR_CONTROL_MODE_PERIODIC	(1 << 1)
-#define APBTMR_CONTROL_INT		(1 << 2)
-
 static inline struct dw_apb_clock_event_device *
 ced_to_dw_apb_ced(struct clock_event_device *evt)
 {
drivers/clocksource/dw_apb_timer_of.c +0 -0
index 45ba8ae..c3fe17e 100644
@@ -102,18 +102,17 @@ static void __init add_clocksource(struct
 device_node *source_timer)
 	 * timer is found. sched_io_base then points to the current_value
 	 * register of the clocksource timer.

drivers/clocksource/dw_apb_timer_of.c static void __init add_clocksource(struct · line 112

Quoted 10 lines
drivers/clocksource/dw_apb_timer_of.c +2 -2
 	 */
-	sched_io_base = iobase + 0x04;
+	sched_io_base = iobase;
 	sched_rate = rate;
 }
 
 static u64 read_sched_clock(void)
 {
-	return __raw_readl(sched_io_base);
+	return ~__raw_readl(sched_io_base + APBTMR_N_CURRENT_VALUE);

AFAICS the minimal fix here for v3.13 would be to just do:

drivers/clocksource/dw_apb_timer_of.c static void __init add_clocksource(struct · line 113

Quoted 2 lines
drivers/clocksource/dw_apb_timer_of.c +1 -1
-	return __raw_readl(sched_io_base);
+	return ~__raw_readl(sched_io_base);

Right? That way the fix is just a oneliner and we could delay the header file and magic-constants use cleanups to v3.14.

Thanks,

Ingo

#2 lore raw
Quoted 86 lines · Ingo Molnar
Quoted 14 lines · Daniel Lezcano

Hi Thomas, Ingo,

here are the fixes for 3.13 based on timers/urgent

* Axel Lin added a missing dependency on CLKSRC_MMIO in the Kconfig
for the time-efm32.

* Dinh Nguyen fixed read_sched_clock to return the right value for
the dw_apb_timer.

* Ezequiel Garcia registered the sched clock after the counter,
thus preventing time jump in the traces for the armada-370-xp.

Quoted 6 lines

* Marc Zyngier stopped the timer before enabling the irq in order
to prevent it to be fired before the clockevent is registered for the sunxi.

* Thierry Reding removed a of_node_put in clksrc-of because the
reference is not held.

(For future reference, please post all patches not just a combo patch.)

Quoted 3 lines

Dinh Nguyen (2):
clocksource: dw_apb_timer: Move timer defines to header file.
clocksource: dw_apb_timer_of: Fix read_sched_clock

Nit: we generally don't use periods at the end of titles, it looks inconsistent in shortlogs.

Quoted 40 lines
drivers/clocksource/dw_apb_timer.c +0 -19
index e54ca10..c3a8f52 100644
@@ -18,25 +18,6 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
-#define APBT_MIN_PERIOD			4
-#define APBT_MIN_DELTA_USEC		200
-
-#define APBTMR_N_LOAD_COUNT		0x00
-#define APBTMR_N_CURRENT_VALUE		0x04
-#define APBTMR_N_CONTROL		0x08
-#define APBTMR_N_EOI			0x0c
-#define APBTMR_N_INT_STATUS		0x10
-
-#define APBTMRS_INT_STATUS		0xa0
-#define APBTMRS_EOI			0xa4
-#define APBTMRS_RAW_INT_STATUS		0xa8
-#define APBTMRS_COMP_VERSION		0xac
-
-#define APBTMR_CONTROL_ENABLE		(1 << 0)
-/* 1: periodic, 0:free running. */
-#define APBTMR_CONTROL_MODE_PERIODIC	(1 << 1)
-#define APBTMR_CONTROL_INT		(1 << 2)
-
 static inline struct dw_apb_clock_event_device *
 ced_to_dw_apb_ced(struct clock_event_device *evt)
 {
drivers/clocksource/dw_apb_timer_of.c +0 -0
index 45ba8ae..c3fe17e 100644
@@ -102,18 +102,17 @@ static void __init add_clocksource(struct
 device_node *source_timer)
 	 * timer is found. sched_io_base then points to the current_value
 	 * register of the clocksource timer.

drivers/clocksource/dw_apb_timer_of.c static void __init add_clocksource(struct · line 112

Quoted 10 lines
drivers/clocksource/dw_apb_timer_of.c +2 -2
 	 */
-	sched_io_base = iobase + 0x04;
+	sched_io_base = iobase;
 	sched_rate = rate;
 }
 
 static u64 read_sched_clock(void)
 {
-	return __raw_readl(sched_io_base);
+	return ~__raw_readl(sched_io_base + APBTMR_N_CURRENT_VALUE);

AFAICS the minimal fix here for v3.13 would be to just do:

Quoted 5 lines

drivers/clocksource/dw_apb_timer_of.c static void __init add_clocksource(struct · line 113

Quoted 2 lines
drivers/clocksource/dw_apb_timer_of.c +1 -1
-	return __raw_readl(sched_io_base);
+	return ~__raw_readl(sched_io_base);

Right? That way the fix is just a oneliner and we could delay the header file and magic-constants use cleanups to v3.14.

Yes. That will be fine. Do you need me to send a new patch that does just that?

Thanks,
Dinh

Quoted 5 lines

Thanks,

Ingo

#3 lore raw
Quoted 87 lines · Dinh Nguyen
Quoted 86 lines · Ingo Molnar
Quoted 14 lines · Daniel Lezcano

Hi Thomas, Ingo,

here are the fixes for 3.13 based on timers/urgent

* Axel Lin added a missing dependency on CLKSRC_MMIO in the Kconfig
for the time-efm32.

* Dinh Nguyen fixed read_sched_clock to return the right value for
the dw_apb_timer.

* Ezequiel Garcia registered the sched clock after the counter,
thus preventing time jump in the traces for the armada-370-xp.

Quoted 6 lines

* Marc Zyngier stopped the timer before enabling the irq in order
to prevent it to be fired before the clockevent is registered for the sunxi.

* Thierry Reding removed a of_node_put in clksrc-of because the
reference is not held.

(For future reference, please post all patches not just a combo patch.)

Quoted 3 lines

Dinh Nguyen (2):
clocksource: dw_apb_timer: Move timer defines to header file.
clocksource: dw_apb_timer_of: Fix read_sched_clock

Nit: we generally don't use periods at the end of titles, it looks inconsistent in shortlogs.

Quoted 40 lines
drivers/clocksource/dw_apb_timer.c +0 -19
index e54ca10..c3a8f52 100644
@@ -18,25 +18,6 @@
  #include <linux/io.h>
  #include <linux/slab.h>
 
-#define APBT_MIN_PERIOD			4
-#define APBT_MIN_DELTA_USEC		200
-
-#define APBTMR_N_LOAD_COUNT		0x00
-#define APBTMR_N_CURRENT_VALUE		0x04
-#define APBTMR_N_CONTROL		0x08
-#define APBTMR_N_EOI			0x0c
-#define APBTMR_N_INT_STATUS		0x10
-
-#define APBTMRS_INT_STATUS		0xa0
-#define APBTMRS_EOI			0xa4
-#define APBTMRS_RAW_INT_STATUS		0xa8
-#define APBTMRS_COMP_VERSION		0xac
-
-#define APBTMR_CONTROL_ENABLE		(1 << 0)
-/* 1: periodic, 0:free running. */
-#define APBTMR_CONTROL_MODE_PERIODIC	(1 << 1)
-#define APBTMR_CONTROL_INT		(1 << 2)
-
  static inline struct dw_apb_clock_event_device *
  ced_to_dw_apb_ced(struct clock_event_device *evt)
  {
drivers/clocksource/dw_apb_timer_of.c +0 -0
index 45ba8ae..c3fe17e 100644
@@ -102,18 +102,17 @@ static void __init add_clocksource(struct
 device_node *source_timer)
  	 * timer is found. sched_io_base then points to the current_value
  	 * register of the clocksource timer.

drivers/clocksource/dw_apb_timer_of.c static void __init add_clocksource(struct · line 112

Quoted 10 lines
drivers/clocksource/dw_apb_timer_of.c +2 -2
  	 */
-	sched_io_base = iobase + 0x04;
+	sched_io_base = iobase;
  	sched_rate = rate;
  }
 
  static u64 read_sched_clock(void)
  {
-	return __raw_readl(sched_io_base);
+	return ~__raw_readl(sched_io_base + APBTMR_N_CURRENT_VALUE);

AFAICS the minimal fix here for v3.13 would be to just do:

Quoted 8 lines
Quoted 5 lines

drivers/clocksource/dw_apb_timer_of.c static void __init add_clocksource(struct · line 113

Quoted 2 lines
drivers/clocksource/dw_apb_timer_of.c +1 -1
-	return __raw_readl(sched_io_base);
+	return ~__raw_readl(sched_io_base);

Right? That way the fix is just a oneliner and we could delay the header file and magic-constants use cleanups to v3.14.

Yes. That will be fine. Do you need me to send a new patch that does just that?

Yes, please.

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