Skip to contentSkip to conversation

ARM: S5PV310: Implement kernel timers using MCT

PATCH New Kukjin Kim 3 participants 7 messages Dec 22, 2010 – Dec 28, 2010

Subsystems (3)
lore
Share & tools
lore

Kukjin Kim

author
#0 lore raw

PATCH 1/1 ARM: S5PV310: Implement kernel timers using MCT

From: Changhwan Youn <[email protected]>

The Multi-Core Timer(MCT) of S5PV310 is designed for implementing clock source timer and clock event timers. This patch implements 1 clock source timer with 64 bit free running counter of MCT and 2 clock event timers with two of 31-bit tick counters.

---
 arch/arm/mach-s5pv310/Kconfig                 |    7 +
 arch/arm/mach-s5pv310/Makefile                |    8 +-
 arch/arm/mach-s5pv310/include/mach/regs-mct.h |   47 ++++
 arch/arm/mach-s5pv310/mct.c                   |  365 +++++++++++++++++++++++++
 4 files changed, 426 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-mct.h
 create mode 100644 arch/arm/mach-s5pv310/mct.c
arch/arm/mach-s5pv310/Kconfig +7 -0
index e0cef3f..02d7b4d 100644
@@ -14,6 +14,13 @@ config CPU_S5PV310
 	help
 	  Enable S5PV310 CPU support
 
+config S5PV310_MCT
+	bool "Kernel timer support by MCT"
+	depends on !LOCAL_TIMERS
+	help
+	  Use MCT (Multi Core Timer) as kernel timers
+	  NOTE: Can not choose this with LOCAL_TIMERS
+
 config S5PV310_DEV_PD
 	bool
 	help
arch/arm/mach-s5pv310/Makefile +7 -1
index e310609..08158e3 100644
@@ -13,7 +13,13 @@ obj-				:=
 # Core support for S5PV310 system
 
 obj-$(CONFIG_CPU_S5PV310)	+= cpu.o init.o clock.o irq-combiner.o
-obj-$(CONFIG_CPU_S5PV310)	+= setup-i2c0.o time.o gpiolib.o irq-eint.o
+obj-$(CONFIG_CPU_S5PV310)	+= setup-i2c0.o gpiolib.o irq-eint.o
+
+ifeq ($(CONFIG_S5PV310_MCT),y)
+obj-y				+= mct.o
+else
+obj-y				+= time.o
+endif
 
 obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
 obj-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o
arch/arm/mach-s5pv310/include/mach/regs-mct.h new file +47 -0

47 lines not on this page · raw message

arch/arm/mach-s5pv310/mct.c new file +365 -0

365 lines not on this page · raw message

Signature · 1 line
1.6.2.5
#1 lore raw

PATCH 1/1 ARM: S5PV310: Implement kernel timers using MCT

Hi Kukjin,

Just trying to learn what other people are doing in their platforms, so apologies if my comments aren't applicable! Looks good to me though.

Quoted 19 lines · Kukjin Kim

From: Changhwan Youn <[email protected]>

The Multi-Core Timer(MCT) of S5PV310 is designed for implementing clock source timer and clock event timers. This patch implements 1 clock source timer with 64 bit free running counter of MCT and 2 clock event timers with two of 31-bit tick counters.

---
 arch/arm/mach-s5pv310/Kconfig                 |    7 +
 arch/arm/mach-s5pv310/Makefile                |    8 +-
 arch/arm/mach-s5pv310/include/mach/regs-mct.h |   47 ++++
 arch/arm/mach-s5pv310/mct.c                   |  365 +++++++++++++++++++++++++
 4 files changed, 426 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-mct.h
 create mode 100644 arch/arm/mach-s5pv310/mct.c

[...]

Quoted 5 lines
arch/arm/mach-s5pv310/mct.c new file +0 -0
new file mode 100644
index 0000000..2fe189c

[...]

Quoted 7 lines
arch/arm/mach-s5pv310/mct.c new file +7 -0
+static struct clock_event_device mct_tick0_device = {
+	.name		= "mct-tick0",
+	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+	.rating		= 450,
+	.shift		= 20,
+	.set_next_event	= s5pv310_tick0_set_next_event,
+	.set_mode	= s5pv310_tick0_set_mode,

arch/arm/mach-s5pv310/mct.c line 213

Quoted 10 lines
arch/arm/mach-s5pv310/mct.c new file +10 -0
+};
+
+static struct clock_event_device mct_tick1_device = {
+	.name		= "mct-tick1",
+	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+	.rating		= 450,
+	.shift		= 20,
+	.set_next_event	= s5pv310_tick1_set_next_event,
+	.set_mode	= s5pv310_tick1_set_mode,
+};

Do you need to specify .shift here? Could you use clockevents_calc_mult_shift() to calculate mult and shift for you?

arch/arm/mach-s5pv310/mct.c line 223

Quoted 9 lines
arch/arm/mach-s5pv310/mct.c new file +9 -0
+irqreturn_t s5pv310_mct0_event_isr(int irq, void *dev_id)
+{
+	struct clock_event_device *evt;
+
+	/* Clear the MCT tick interrupt */
+
+	evt = &mct_tick0_device;
+	if (evt->mode != CLOCK_EVT_MODE_PERIODIC)
+		s5pv310_mct_tick_stop(MCT_TICK0);

I don't think you need to stop the timer here, the clockevents layer will handle this for you.

[...]

arch/arm/mach-s5pv310/mct.c line 266

Quoted 5 lines
arch/arm/mach-s5pv310/mct.c new file +5 -0
+static void s5pv310_mct_clockevent_init(struct clock_event_device *dev)
+{
+	dev->mult = div_sc(clk_rate / 2, NSEC_PER_SEC, dev->shift);
+
+	dev->max_delta_ns = clockevent_delta2ns(0xfffffff, dev);

Is there a reason that the delta is only using 28 bits here?

Jamie

author
#2 lore raw

PATCH 1/1 ARM: S5PV310: Implement kernel timers using MCT

Quoted 3 lines · Jamie Iles

Hi Kukjin,

Hi Jamie :-)

Quoted 3 lines

Just trying to learn what other people are doing in their platforms, so apologies if my comments aren't applicable! Looks good to me though.

No problem, thanks for your comments and always welcome to review ;-)

(snip)

Quoted 4 lines
Quoted 4 lines
arch/arm/mach-s5pv310/mct.c new file +4 -0
+
+static struct clock_event_device mct_tick1_device = {
+	.name		= "mct-tick1",
+	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
Quoted 9 lines

arch/arm/mach-s5pv310/mct.c line 213

Quoted 5 lines
arch/arm/mach-s5pv310/mct.c new file +5 -0
+	.rating		= 450,
+	.shift		= 20,
+	.set_next_event	= s5pv310_tick1_set_next_event,
+	.set_mode	= s5pv310_tick1_set_mode,
+};

Do you need to specify .shift here? Could you use clockevents_calc_mult_shift() to calculate mult and shift for you?

Oh, yeah...Mr. Youn and I didn't notice the existence of it...will fix.

Quoted 4 lines
Quoted 4 lines
arch/arm/mach-s5pv310/mct.c new file +4 -0
+irqreturn_t s5pv310_mct0_event_isr(int irq, void *dev_id)
+{
+	struct clock_event_device *evt;
+
Quoted 9 lines

arch/arm/mach-s5pv310/mct.c line 223

Quoted 5 lines
arch/arm/mach-s5pv310/mct.c new file +5 -0
+	/* Clear the MCT tick interrupt */
+
+	evt = &mct_tick0_device;
+	if (evt->mode != CLOCK_EVT_MODE_PERIODIC)
+		s5pv310_mct_tick_stop(MCT_TICK0);

I don't think you need to stop the timer here, the clockevents layer will handle this for you.

This is to support One-shot mode using MCT. Because basically MCT local timer only supports periodic mode.
But will be added comment.

Quoted 9 lines

[...]

arch/arm/mach-s5pv310/mct.c line 266

Quoted 5 lines
arch/arm/mach-s5pv310/mct.c new file +5 -0
+static void s5pv310_mct_clockevent_init(struct clock_event_device *dev)
+{
+	dev->mult = div_sc(clk_rate / 2, NSEC_PER_SEC, dev->shift);
+
+	dev->max_delta_ns = clockevent_delta2ns(0xfffffff, dev);

Is there a reason that the delta is only using 28 bits here?

Oh, your pointing out is right...Its max delta should be 31 bits. Will fix it...and correct value is 0x7fffffff.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

#3 lore raw

PATCH 1/1 ARM: S5PV310: Implement kernel timers using MCT

Quoted 14 lines · Kukjin Kim
Quoted 4 lines · Jamie Iles
Quoted 4 lines
arch/arm/mach-s5pv310/mct.c new file +4 -0
+irqreturn_t s5pv310_mct0_event_isr(int irq, void *dev_id)
+{
+	struct clock_event_device *evt;
+
Quoted 9 lines

arch/arm/mach-s5pv310/mct.c line 223

Quoted 5 lines
arch/arm/mach-s5pv310/mct.c new file +5 -0
+	/* Clear the MCT tick interrupt */
+
+	evt = &mct_tick0_device;
+	if (evt->mode != CLOCK_EVT_MODE_PERIODIC)
+		s5pv310_mct_tick_stop(MCT_TICK0);

I don't think you need to stop the timer here, the clockevents layer will handle this for you.

Quoted 3 lines

This is to support One-shot mode using MCT. Because basically MCT local timer only supports periodic mode.
But will be added comment.

Actually I think you can simply remove the s5pv310_mct_tick_stop() altogether. The onestop event handlers should schedule the next expiry and will respect the min and max deltas so after the event the timer will be correctly programmed for the next event.

I had to try this on hardware to convince myself (the timers on my platform have the same behaviour) but it does work!

Jamie

#4 lore raw

PATCH 1/1 ARM: S5PV310: Implement kernel timers using MCT

In reply to Kukjin Kim
Quoted 370 lines · Kukjin Kim

From: Changhwan Youn <[email protected]>

The Multi-Core Timer(MCT) of S5PV310 is designed for implementing clock source timer and clock event timers. This patch implements 1 clock source timer with 64 bit free running counter of MCT and 2 clock event timers with two of 31-bit tick counters.

---
 arch/arm/mach-s5pv310/Kconfig                 |    7 +
 arch/arm/mach-s5pv310/Makefile                |    8 +-
 arch/arm/mach-s5pv310/include/mach/regs-mct.h |   47 ++++
 arch/arm/mach-s5pv310/mct.c                   |  365 +++++++++++++++++++++++++
 4 files changed, 426 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-mct.h
 create mode 100644 arch/arm/mach-s5pv310/mct.c
arch/arm/mach-s5pv310/Kconfig +7 -0
index e0cef3f..02d7b4d 100644
@@ -14,6 +14,13 @@ config CPU_S5PV310
 	help
 	  Enable S5PV310 CPU support
 
+config S5PV310_MCT
+	bool "Kernel timer support by MCT"
+	depends on !LOCAL_TIMERS
+	help
+	  Use MCT (Multi Core Timer) as kernel timers
+	  NOTE: Can not choose this with LOCAL_TIMERS
+
 config S5PV310_DEV_PD
 	bool
 	help
arch/arm/mach-s5pv310/Makefile +7 -1
index e310609..08158e3 100644
@@ -13,7 +13,13 @@ obj-				:=
 # Core support for S5PV310 system
 
 obj-$(CONFIG_CPU_S5PV310)	+= cpu.o init.o clock.o irq-combiner.o
-obj-$(CONFIG_CPU_S5PV310)	+= setup-i2c0.o time.o gpiolib.o irq-eint.o
+obj-$(CONFIG_CPU_S5PV310)	+= setup-i2c0.o gpiolib.o irq-eint.o
+
+ifeq ($(CONFIG_S5PV310_MCT),y)
+obj-y				+= mct.o
+else
+obj-y				+= time.o
+endif
 
 obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
 obj-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o
arch/arm/mach-s5pv310/include/mach/regs-mct.h new file +47 -0
new file mode 100644
index 0000000..1480e2a
@@ -0,0 +1,47 @@
+/* arch/arm/mach-s5pv310/include/mach/regs-mct.h
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com
+ *
+ * S5PV310 MCT(Multi-Core Timer) configutation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __ASM_ARCH_REGS_MCT_H
+#define __ASM_ARCH_REGS_MCT_H __FILE__
+
+#include <mach/map.h>
+
+#define S5PV310_MCTREG(x)		(S5P_VA_SYSTIMER + (x))
+
+#define S5PV310_MCT_G_CNT_L		S5PV310_MCTREG(0x100)
+#define S5PV310_MCT_G_CNT_U		S5PV310_MCTREG(0x104)
+#define S5PV310_MCT_G_CNT_WSTAT		S5PV310_MCTREG(0x110)
+
+#define S5PV310_MCT_G_TCON		S5PV310_MCTREG(0x240)
+
+#define S5PV310_MCT_G_WSTAT		S5PV310_MCTREG(0x24C)
+
+#define S5PV310_MCT_L0_TCNTB		S5PV310_MCTREG(0x300)
+#define S5PV310_MCT_L0_ICNTB		S5PV310_MCTREG(0x308)
+#define S5PV310_MCT_L0_TCON		S5PV310_MCTREG(0x320)
+
+#define S5PV310_MCT_L0_INT_CSTAT	S5PV310_MCTREG(0x330)
+#define S5PV310_MCT_L0_INT_ENB		S5PV310_MCTREG(0x334)
+#define S5PV310_MCT_L0_WSTAT		S5PV310_MCTREG(0x340)
+
+#define S5PV310_MCT_L1_TCNTB		S5PV310_MCTREG(0x400)
+#define S5PV310_MCT_L1_ICNTB		S5PV310_MCTREG(0x408)
+#define S5PV310_MCT_L1_TCON		S5PV310_MCTREG(0x420)
+#define S5PV310_MCT_L1_INT_CSTAT	S5PV310_MCTREG(0x430)
+#define S5PV310_MCT_L1_INT_ENB		S5PV310_MCTREG(0x434)
+#define S5PV310_MCT_L1_WSTAT		S5PV310_MCTREG(0x440)
+
+#define MCT_L_TCON_INTERVAL_MODE	(1 << 2)
+#define MCT_L_TCON_INT_START		(1 << 1)
+#define MCT_L_TCON_TIMER_START		(1 << 0)
+
+#endif /* __ASM_ARCH_REGS_MCT_H */
arch/arm/mach-s5pv310/mct.c new file +254 -0
new file mode 100644
index 0000000..2fe189c
@@ -0,0 +1,365 @@
+/* linux/arch/arm/mach-s5pv310/mct.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com
+ *
+ * S5PV310 MCT(Multi-Core Timer) support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/err.h>
+#include <linux/clk.h>
+#include <linux/clockchips.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+
+#include <mach/map.h>
+#include <mach/regs-mct.h>
+#include <asm/mach/time.h>
+
+static unsigned long clk_cnt_per_tick;
+static unsigned long clk_rate;
+
+enum mct_tick_type {
+	MCT_TICK0,
+	MCT_TICK1,
+};
+
+static void s5pv310_mct_write(unsigned int value, void *addr)
+{
+	void __iomem *stat_addr;
+	u32 mask;
+	u32 i;
+
+	__raw_writel(value, addr);
+
+	switch ((u32) addr) {
+	case (u32) S5PV310_MCT_G_TCON:
+		stat_addr = S5PV310_MCT_G_WSTAT;
+		mask = 1 << 16;		/* G_WSTAT_TCON_STAT */
+		break;
+
+	case (u32) S5PV310_MCT_G_CNT_L:
+		stat_addr = S5PV310_MCT_G_CNT_WSTAT;
+		mask = 1 << 0;		/* G_CNT_L_STAT */
+		break;
+
+	case (u32) S5PV310_MCT_G_CNT_U:
+		stat_addr = S5PV310_MCT_G_CNT_WSTAT;
+		mask = 1 << 1;		/* G_CNT_U_STAT */
+		break;
+
+	case (u32) S5PV310_MCT_L0_TCON:
+		stat_addr = S5PV310_MCT_L0_WSTAT;
+		mask = 1 << 3;		/* L_TCON_STAT */
+		break;
+
+	case (u32) S5PV310_MCT_L1_TCON:
+		stat_addr = S5PV310_MCT_L1_WSTAT;
+		mask = 1 << 3;		/* L_TCON_STAT */
+		break;
+
+	case (u32) S5PV310_MCT_L0_TCNTB:
+		stat_addr = S5PV310_MCT_L0_WSTAT;
+		mask = 1 << 0;		/* L_TCNTB_STAT	*/
+		break;
+
+	case (u32) S5PV310_MCT_L1_TCNTB:
+		stat_addr = S5PV310_MCT_L1_WSTAT;
+		mask = 1 << 0;		/* L_TCNTB_STAT	*/
+		break;
+
+	case (u32) S5PV310_MCT_L0_ICNTB:
+		stat_addr = S5PV310_MCT_L0_WSTAT;
+		mask = 1 << 1;		/* L_ICNTB_STAT */
+		break;
+
+	case (u32) S5PV310_MCT_L1_ICNTB:
+		stat_addr = S5PV310_MCT_L1_WSTAT;
+		mask = 1 << 1;		/* L_ICNTB_STAT */
+		break;
+
+	default:
+		return;
+	}
+
+	/* Wait maximum 1 ms until written values are applied */
+	for (i = 0; i < loops_per_jiffy / 1000 * HZ; i++)
+		if (__raw_readl(stat_addr) & mask) {
+			__raw_writel(mask, stat_addr);
+			return;
+		}
+
+	panic("MCT hangs after writing %d (addr:0x%08x)\n", value, (u32)addr);
+}
+
+static void s5pv310_mct_tick_stop(enum mct_tick_type type)
+{
+	unsigned long tmp;
+	void __iomem *addr;
+
+	if (type == MCT_TICK0)
+		addr = S5PV310_MCT_L0_TCON;
+	else
+		addr = S5PV310_MCT_L1_TCON;
+
+	tmp = __raw_readl(addr);
+	tmp &= ~(MCT_L_TCON_INT_START | MCT_L_TCON_TIMER_START);
+	s5pv310_mct_write(tmp, addr);
+}
+
+static void s5pv310_mct_tick_start(enum mct_tick_type type,
+				   unsigned long cycles)
+{
+	unsigned long tmp;
+	unsigned int tmp1, tmp2;
+	void __iomem *addr;
+
+	s5pv310_mct_tick_stop(type);
+
+	tmp1 = (1 << 31) | cycles;	/* MCT_L_UPDATE_ICNTB */
+	tmp2 = 1 << 0;			/* L_INT_ENB_CNTIE */
+
+	if (type == MCT_TICK0) {
+		s5pv310_mct_write(tmp1, S5PV310_MCT_L0_ICNTB);
+		s5pv310_mct_write(tmp2, S5PV310_MCT_L0_INT_ENB);
+
+		addr = S5PV310_MCT_L0_TCON;
+	} else {
+		s5pv310_mct_write(tmp1, S5PV310_MCT_L1_ICNTB);
+		s5pv310_mct_write(tmp2, S5PV310_MCT_L1_INT_ENB);
+
+		addr = S5PV310_MCT_L1_TCON;
+	}
+
+	tmp = __raw_readl(addr);
+	tmp |= MCT_L_TCON_INT_START | MCT_L_TCON_TIMER_START |
+	       MCT_L_TCON_INTERVAL_MODE;
+	s5pv310_mct_write(tmp, addr);
+}
+
+static inline int s5pv310_tick_set_next_event(enum mct_tick_type type,
+					      unsigned long cycles)
+{
+	s5pv310_mct_tick_start(type, cycles);
+
+	return 0;
+}
+
+static inline void s5pv310_tick_set_mode(enum mct_tick_type type,
+					 enum clock_event_mode mode)
+{
+	s5pv310_mct_tick_stop(type);
+
+	switch (mode) {
+	case CLOCK_EVT_MODE_PERIODIC:
+		s5pv310_mct_tick_start(type, clk_cnt_per_tick);
+		break;
+
+	case CLOCK_EVT_MODE_ONESHOT:
+	case CLOCK_EVT_MODE_UNUSED:
+	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_RESUME:
+		break;
+	}
+}
+
+static int s5pv310_tick0_set_next_event(unsigned long cycles,
+					struct clock_event_device *evt)
+{
+	return s5pv310_tick_set_next_event(MCT_TICK0, cycles);
+}
+
+static int s5pv310_tick1_set_next_event(unsigned long cycles,
+					struct clock_event_device *evt)
+{
+	return s5pv310_tick_set_next_event(MCT_TICK1, cycles);
+}
+
+static void s5pv310_tick0_set_mode(enum clock_event_mode mode,
+				   struct clock_event_device *evt)
+{
+	s5pv310_tick_set_mode(MCT_TICK0, mode);
+}
+
+static void s5pv310_tick1_set_mode(enum clock_event_mode mode,
+				   struct clock_event_device *evt)
+{
+	s5pv310_tick_set_mode(MCT_TICK1, mode);
+}
+
+static struct clock_event_device mct_tick0_device = {
+	.name		= "mct-tick0",
+	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+	.rating		= 450,
+	.shift		= 20,
+	.set_next_event	= s5pv310_tick0_set_next_event,
+	.set_mode	= s5pv310_tick0_set_mode,
+};
+
+static struct clock_event_device mct_tick1_device = {
+	.name		= "mct-tick1",
+	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+	.rating		= 450,
+	.shift		= 20,
+	.set_next_event	= s5pv310_tick1_set_next_event,
+	.set_mode	= s5pv310_tick1_set_mode,
+};
+
+irqreturn_t s5pv310_mct0_event_isr(int irq, void *dev_id)
+{
+	struct clock_event_device *evt;
+
+	/* Clear the MCT tick interrupt */
+
+	evt = &mct_tick0_device;
+	if (evt->mode != CLOCK_EVT_MODE_PERIODIC)
+		s5pv310_mct_tick_stop(MCT_TICK0);
+
+	s5pv310_mct_write(0x1, S5PV310_MCT_L0_INT_CSTAT);
+
+	evt->event_handler(evt);
+
+	return IRQ_HANDLED;
+}
+
+irqreturn_t s5pv310_mct1_event_isr(int irq, void *dev_id)
+{
+	struct clock_event_device *evt;
+
+	/* Clear the MCT tick interrupt */
+
+	evt = &mct_tick1_device;
+
+	if (evt->mode != CLOCK_EVT_MODE_PERIODIC)
+		s5pv310_mct_tick_stop(MCT_TICK1);
+
+	s5pv310_mct_write(0x1, S5PV310_MCT_L1_INT_CSTAT);
+
+	evt->event_handler(evt);
+
+	return IRQ_HANDLED;
+}
+
+static struct irqaction mct_tick0_event_irq = {
+	.name		= "mct_tick0_irq",
+	.flags		= IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING,
+	.handler	= s5pv310_mct0_event_isr,
+};

arch/arm/mach-s5pv310/mct.c line 264

Quoted 10 lines
arch/arm/mach-s5pv310/mct.c new file +10 -0
+
+static struct irqaction mct_tick1_event_irq = {
+	.name		= "mct_tick1_irq",
+	.flags		= IRQF_TIMER | IRQF_NOBALANCING,
+	.handler	= s5pv310_mct1_event_isr,
+};
+
+static void s5pv310_mct_clockevent_init(struct clock_event_device *dev)
+{
+	dev->mult = div_sc(clk_rate / 2, NSEC_PER_SEC, dev->shift);

Best use the helper function to calculate both the multipler and shift, rather than hard-coding the shift. As the shift is defined to be '20' I guess this was copied rather than calculated for the optimal value.

Quoted 16 lines
arch/arm/mach-s5pv310/mct.c new file +16 -0
+
+	dev->max_delta_ns = clockevent_delta2ns(0xfffffff, dev);
+	dev->min_delta_ns = clockevent_delta2ns(0xf, dev);
+}
+
+static void __init s5pv310_clockevent0_init(void)
+{
+	clk_cnt_per_tick = clk_rate / 2 / HZ;
+
+	s5pv310_mct_write(0x1, S5PV310_MCT_L0_TCNTB);
+	s5pv310_mct_clockevent_init(&mct_tick0_device);
+	mct_tick0_device.cpumask = cpumask_of(0);
+	clockevents_register_device(&mct_tick0_device);
+
+	setup_irq(IRQ_MCT_L0, &mct_tick0_event_irq);
+}

arch/arm/mach-s5pv310/mct.c line 290

Quoted 10 lines
arch/arm/mach-s5pv310/mct.c new file +10 -0
+
+static void __init s5pv310_clockevent1_init(void *info)
+{
+	s5pv310_mct_write(0x1, S5PV310_MCT_L1_TCNTB);
+	s5pv310_mct_clockevent_init(&mct_tick1_device);
+	mct_tick1_device.cpumask = cpumask_of(1);
+	clockevents_register_device(&mct_tick1_device);
+
+	irq_set_affinity(IRQ_MCT1, cpumask_of(1));
+	setup_irq(IRQ_MCT_L1, &mct_tick1_event_irq);

This looks like it's supporting SMP - is there some reason not to use the localtimer support built into SMP, which also supports hotplug CPU (the above doesn't because the local clockevents will be automatically unregistered.)

If you don't have a global timer, then register your boot CPU's clock event timer as the global timer for the time being - the SMP code needs tweaking so that a local timer can be registered early for those without global timers. Until then, if you have a global timer, I strongly suggest you register that as a clock event too (it'll automatically get shutdown when not needed.)

Quoted 19 lines
arch/arm/mach-s5pv310/mct.c new file +19 -0
+}
+
+static void s5pv310_mct_frc_start(unsigned int hi, unsigned int lo)
+{
+	unsigned int tmp;
+
+	s5pv310_mct_write(lo, S5PV310_MCT_G_CNT_L);
+	s5pv310_mct_write(hi, S5PV310_MCT_G_CNT_U);
+
+	tmp = __raw_readl(S5PV310_MCT_G_TCON);
+	tmp |= (1 << 8);	/* G_TCON_START */
+	s5pv310_mct_write(tmp, S5PV310_MCT_G_TCON);
+}
+
+/* Clocksource handling */
+
+static cycle_t s5pv310_frc_read(struct clocksource *cs)
+{
+	unsigned int lo, hi0, hi1;

arch/arm/mach-s5pv310/mct.c line 319

Quoted 10 lines
arch/arm/mach-s5pv310/mct.c new file +10 -0
+
+	hi0 = __raw_readl(S5PV310_MCT_G_CNT_U);
+	lo = __raw_readl(S5PV310_MCT_G_CNT_L);
+	dsb();
+	hi1 = __raw_readl(S5PV310_MCT_G_CNT_U);
+
+	if (hi0 != hi1) {
+		lo = __raw_readl(S5PV310_MCT_G_CNT_L);
+		hi1 = __raw_readl(S5PV310_MCT_G_CNT_U);
+	}

Are you sure this is safe? Would it not be better to do this as:

	hi1 = __raw_readl(S5PV310_MCT_G_CNT_U);
	do {
		hi0 = hi1;
		lo = __raw_readl(S5PV310_MCT_G_CNT_L);
		hi1 = __raw_readl(S5PV310_MCT_G_CNT_U);
	} while (hi0 != hi1);

Note that I don't believe you need a dsb() in there either, as device accesses are ordered with respect to themselves. I know it's highly unlikely that we'll see two updates, but I think having it obviously robust is a good idea.

author
#5 lore raw

PATCH 1/1 ARM: S5PV310: Implement kernel timers using MCT

Quoted 3 lines · Russell King - ARM Linux
Quoted 1 line · Kukjin Kim

From: Changhwan Youn <[email protected]>

(snip)

Quoted 8 lines

arch/arm/mach-s5pv310/mct.c line 264

Quoted 3 lines
arch/arm/mach-s5pv310/mct.c new file +3 -0
+static void s5pv310_mct_clockevent_init(struct clock_event_device *dev)
+{
+	dev->mult = div_sc(clk_rate / 2, NSEC_PER_SEC, dev->shift);

Best use the helper function to calculate both the multipler and shift, rather than hard-coding the shift. As the shift is defined to be '20' I guess this was copied rather than calculated for the optimal value.

You're right...will fix it.

(snip)

Quoted 6 lines
Quoted 6 lines
arch/arm/mach-s5pv310/mct.c new file +6 -0
+static void __init s5pv310_clockevent1_init(void *info)
+{
+	s5pv310_mct_write(0x1, S5PV310_MCT_L1_TCNTB);
+	s5pv310_mct_clockevent_init(&mct_tick1_device);
+	mct_tick1_device.cpumask = cpumask_of(1);
+	clockevents_register_device(&mct_tick1_device);
Quoted 9 lines

arch/arm/mach-s5pv310/mct.c line 290

Quoted 3 lines
arch/arm/mach-s5pv310/mct.c new file +3 -0
+
+	irq_set_affinity(IRQ_MCT1, cpumask_of(1));
+	setup_irq(IRQ_MCT_L1, &mct_tick1_event_irq);

This looks like it's supporting SMP - is there some reason not to use the localtimer support built into SMP, which also supports hotplug CPU (the above doesn't because the local clockevents will be automatically unregistered.)

As I know, to use the localtimer support, it needs to support PPI. Unfortunately the MCT of S5PV310 supports SPI. For hotplug CPU, I'm looking for the methods to register clockevents again at CPU hotplug-in.

Quoted 7 lines

If you don't have a global timer, then register your boot CPU's clock event timer as the global timer for the time being - the SMP code needs tweaking so that a local timer can be registered early for those without global timers. Until then, if you have a global timer, I strongly suggest you register that as a clock event too (it'll automatically get shutdown when not needed.)

Ok...will add another timer for the global timer.

(snip)

Quoted 23 lines

arch/arm/mach-s5pv310/mct.c line 319

Quoted 13 lines
arch/arm/mach-s5pv310/mct.c new file +13 -0
+static cycle_t s5pv310_frc_read(struct clocksource *cs)
+{
+	unsigned int lo, hi0, hi1;
+
+	hi0 = __raw_readl(S5PV310_MCT_G_CNT_U);
+	lo = __raw_readl(S5PV310_MCT_G_CNT_L);
+	dsb();
+	hi1 = __raw_readl(S5PV310_MCT_G_CNT_U);
+
+	if (hi0 != hi1) {
+		lo = __raw_readl(S5PV310_MCT_G_CNT_L);
+		hi1 = __raw_readl(S5PV310_MCT_G_CNT_U);
+	}

Are you sure this is safe? Would it not be better to do this as:

	hi1 = __raw_readl(S5PV310_MCT_G_CNT_U);
	do {
		hi0 = hi1;
		lo = __raw_readl(S5PV310_MCT_G_CNT_L);
		hi1 = __raw_readl(S5PV310_MCT_G_CNT_U);
	} while (hi0 != hi1);
Quoted 4 lines

Note that I don't believe you need a dsb() in there either, as device accesses are ordered with respect to themselves. I know it's highly unlikely that we'll see two updates, but I think having it obviously robust is a good idea.

Yes, would be better..will change as your suggestion.

Merry Xmas :-)
Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

#6 lore raw

PATCH 1/1 ARM: S5PV310: Implement kernel timers using MCT

Quoted 9 lines · Kukjin Kim
Quoted 5 lines · Russell King - ARM Linux

This looks like it's supporting SMP - is there some reason not to use the localtimer support built into SMP, which also supports hotplug CPU (the above doesn't because the local clockevents will be automatically unregistered.)

As I know, to use the localtimer support, it needs to support PPI. Unfortunately the MCT of S5PV310 supports SPI. For hotplug CPU, I'm looking for the methods to register clockevents again at CPU hotplug-in.

We can avoid that - nothing forces you to use the PPI interrupt. Just register your interrupt handler in the normal way.

There's really no need to reinvent the wheel.