[U-Boot] [PATCH v2 0/2] drivers: timer: inroduce ARC timer driver

[U-Boot] [PATCH v2 0/2] drivers: timer: inroduce ARC timer driver

[Vlad Zakharov]

This patch series replaces legacy approach to access ARC timer
via specific code in "arch/arc/lib/time.c" and uses timer
driver instead.

ARC cores may have up to 2 built-in timers: timer0 and timer1,
usually at least one of them exists.

They are controlled through auxiliary registers and so we
don't have to remap their control registers as we used to do
with MMIO registers of external peripheral devices.

Cc: Simon Glass <sjg@chromium.org>
---
Changes v1..v2
 - Minor clean-ups of code and comments.
 - Moved TIMER and ARC_TIMER config symbols from each defconfig to
arch Kconfig file to avoid duplication

Vlad Zakharov (2):
  drivers: timer: Introduce ARC timer driver
  arc: use timer driver instead of arch/arc/lib/timer.c

 arch/arc/dts/skeleton.dtsi                   |  6 ++
 arch/arc/include/asm/arcregs.h               |  4 ++
 arch/arc/lib/Makefile                        |  1 -
 arch/arc/lib/timer.c                         | 24 -------
 configs/axs101_defconfig                     |  2 +
 configs/axs103_defconfig                     |  2 +
 configs/nsim_700_defconfig                   |  2 +
 configs/nsim_700be_defconfig                 |  2 +
 configs/nsim_hs38_defconfig                  |  2 +
 configs/nsim_hs38be_defconfig                |  2 +
 configs/tb100_defconfig                      |  2 +
 doc/device-tree-bindings/timer/arc_timer.txt | 24 +++++++
 drivers/timer/Kconfig                        |  7 ++
 drivers/timer/Makefile                       |  1 +
 drivers/timer/arc_timer.c                    | 95 ++++++++++++++++++++++++++++
 include/configs/axs10x.h                     |  2 -
 16 files changed, 151 insertions(+), 27 deletions(-)
 delete mode 100644 arch/arc/lib/timer.c
 create mode 100644 doc/device-tree-bindings/timer/arc_timer.txt
 create mode 100644 drivers/timer/arc_timer.c

-- 
2.7.4

[U-Boot] [PATCH v2 1/2] drivers: timer: Introduce ARC timer driver

[Vlad Zakharov]

This commit introduces timer driver for ARC.

ARC timers are configured via ARC AUX registers so we use special
functions to access timer control registers.

This driver allows utilization of either timer0 or timer1
depending on which one is available in real hardware. Essentially
only existing timers should be mentioned in board's Device Tree
description.

Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
Changes v1..v2
 - Minor clean-ups of code and comments

 arch/arc/include/asm/arcregs.h               |  4 ++
 doc/device-tree-bindings/timer/arc_timer.txt | 24 +++++++
 drivers/timer/Kconfig                        | 10 +++
 drivers/timer/Makefile                       |  1 +
 drivers/timer/arc_timer.c                    | 99 ++++++++++++++++++++++++++++
 5 files changed, 138 insertions(+)
 create mode 100644 doc/device-tree-bindings/timer/arc_timer.txt
 create mode 100644 drivers/timer/arc_timer.c

diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h
index cf999b0..54a9b00 100644
--- a/arch/arc/include/asm/arcregs.h
+++ b/arch/arc/include/asm/arcregs.h
@@ -33,6 +33,10 @@
 #define ARC_AUX_TIMER0_CTRL	0x22	/* Timer 0 control */
 #define ARC_AUX_TIMER0_LIMIT	0x23	/* Timer 0 limit */
 
+#define ARC_AUX_TIMER1_CNT	0x100	/* Timer 1 count */
+#define ARC_AUX_TIMER1_CTRL	0x101	/* Timer 1 control */
+#define ARC_AUX_TIMER1_LIMIT	0x102	/* Timer 1 limit */
+
 #define ARC_AUX_INTR_VEC_BASE	0x25
 
 /* Data cache related auxiliary registers */
diff --git a/doc/device-tree-bindings/timer/arc_timer.txt b/doc/device-tree-bindings/timer/arc_timer.txt
new file mode 100644
index 0000000..e25c6ae
--- /dev/null
+++ b/doc/device-tree-bindings/timer/arc_timer.txt
@@ -0,0 +1,24 @@
+ARC Timer
+
+Required properties:
+
+- compatible : should be "snps,arc-timer"
+- reg : Specifies timer ID, could be either 0 or 1.
+- clock-frequency : The frequency of the clock that drives the counter, in Hz.
+
+Examples:
+
+timer at 0 {
+	compatible = "snps,arc-timer";
+	clock-frequency = <100000000>;
+	reg = <0>;
+};
+
+timer at 1 {
+	compatible = "snps,arc-timer";
+	clock-frequency = <100000000>;
+	reg = <1>;
+};
+
+NOTE: if you specify both timers, frequencies should always be the same as both timers
+are driven by core clock.
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index cb18f12..e1e3e61 100644
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -46,4 +46,14 @@ config OMAP_TIMER
 	help
 	  Select this to enable an timer for Omap devices.
 
+config ARC_TIMER
+	bool "ARC timer support"
+	depends on TIMER
+	depends on ARC
+	help
+	  Select this to enable built-in ARC timers.
+	  ARC cores may have up to 2 built-in timers: timer0 and timer1,
+	  usually at least one of them exists. Either of them is supported
+	  in U-Boot.
+
 endmenu
diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile
index f351fbb..e9624dd 100644
--- a/drivers/timer/Makefile
+++ b/drivers/timer/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_ALTERA_TIMER)	+= altera_timer.o
 obj-$(CONFIG_SANDBOX_TIMER)	+= sandbox_timer.o
 obj-$(CONFIG_X86_TSC_TIMER)	+= tsc_timer.o
 obj-$(CONFIG_OMAP_TIMER)	+= omap-timer.o
+obj-$(CONFIG_ARC_TIMER)	+= arc_timer.o
diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c
new file mode 100644
index 0000000..c43ddd0
--- /dev/null
+++ b/drivers/timer/arc_timer.c
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2016 Synopsys, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <timer.h>
+#include <asm/io.h>
+#include <asm/arcregs.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define NH_MODE (1 << 1)
+
+/*
+ * ARC timer control registers are mapped to auxiliary address space.
+ * There are special ARC asm command to access that addresses.
+ * Therefore we use built-in functions to read from and write to timer
+ * control register.
+ */
+
+/* Driver private data. Contains AUX register number. */
+struct arc_timer_priv {
+		uint timer_id;
+};
+
+static int arc_timer_get_count(struct udevice *dev, u64 *count)
+{
+	struct arc_timer_priv *priv = dev_get_priv(dev);
+	switch (priv->timer_id) {
+	case 0:
+		*count = read_aux_reg(ARC_AUX_TIMER0_CNT);
+		break;
+	case 1:
+		*count = read_aux_reg(ARC_AUX_TIMER1_CNT);
+		break;
+	}
+
+	return 0;
+}
+
+static int arc_timer_probe(struct udevice *dev)
+{
+	int id;
+
+	struct arc_timer_priv *priv = dev_get_priv(dev);
+
+	/* Get registers offset and size */
+	id = fdtdec_get_int(gd->fdt_blob, dev->of_offset, "reg", -1);
+	if (id < 0)
+		return -EINVAL;
+	if (id > 1)
+		return -ENXIO;
+
+	priv->timer_id = (uint)id;
+
+	switch (priv->timer_id) {
+	case 0:
+		/* Disable timer if CPU is halted */
+		write_aux_reg(ARC_AUX_TIMER0_CTRL, NH_MODE);
+		/* Set max value for counter/timer */
+		write_aux_reg(ARC_AUX_TIMER0_LIMIT, 0xffffffff);
+		/* Set initial count value and restart counter/timer */
+		write_aux_reg(ARC_AUX_TIMER0_CNT, 0);
+		break;
+	case 1:
+		/* Disable timer if CPU is halted */
+		write_aux_reg(ARC_AUX_TIMER1_CTRL, NH_MODE);
+		/* Set max value for counter/timer */
+		write_aux_reg(ARC_AUX_TIMER1_LIMIT, 0xffffffff);
+		/* Set initial count value and restart counter/timer */
+		write_aux_reg(ARC_AUX_TIMER1_CNT, 0);
+		break;
+	}
+
+	return 0;
+}
+
+
+static const struct timer_ops arc_timer_ops = {
+	.get_count = arc_timer_get_count,
+};
+
+static const struct udevice_id arc_timer_ids[] = {
+	{ .compatible = "snps,arc-timer" },
+	{}
+};
+
+U_BOOT_DRIVER(arc_timer) = {
+	.name	= "arc_timer",
+	.id	= UCLASS_TIMER,
+	.of_match = arc_timer_ids,
+	.probe = arc_timer_probe,
+	.ops	= &arc_timer_ops,
+	.flags = DM_FLAG_PRE_RELOC,
+};
-- 
2.7.4

[U-Boot] [PATCH v2 2/2] arc: use timer driver instead of arch/arc/lib/timer.c

[Vlad Zakharov]

This commit replaces legacy timer code with usage of arc timer
driver.

Also it adds timer0 device tree node with corresponding
"clock-frequency" property.

Therefore we remove legacy CONFIG_SYS_TIMER_RATE config symbol
that is not longer required.

Furthermore the commit selects CONFIG_TIMER and CONFIG_ARC_TIMER
by default when selecting ARC architecture.

Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
Changes v1..v2
 - Moved TIMER and ARC_TIMER config symbols from each defconfig to 
arch Kconfig file to avoid duplication

 arch/Kconfig               |  2 ++
 arch/arc/dts/skeleton.dtsi |  6 ++++++
 arch/arc/lib/Makefile      |  1 -
 arch/arc/lib/timer.c       | 24 ------------------------
 include/configs/axs10x.h   |  2 --
 5 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 arch/arc/lib/timer.c

diff --git a/arch/Kconfig b/arch/Kconfig
index ffc7b45..56fa70e 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -12,6 +12,8 @@ config ARC
 	bool "ARC architecture"
 	select HAVE_PRIVATE_LIBGCC
 	select SUPPORT_OF_CONTROL
+	select TIMER
+	select ARC_TIMER
 
 config ARM
 	bool "ARM architecture"
diff --git a/arch/arc/dts/skeleton.dtsi b/arch/arc/dts/skeleton.dtsi
index b41d241..3e93d697 100644
--- a/arch/arc/dts/skeleton.dtsi
+++ b/arch/arc/dts/skeleton.dtsi
@@ -10,4 +10,10 @@
 	chosen { };
 	aliases { };
 	memory { device_type = "memory"; reg = <0 0>; };
+
+	timer at 0 {
+			compatible = "snps,arc-timer";
+			clock-frequency = <100000000>;
+			reg = <0>;
+	};
 };
diff --git a/arch/arc/lib/Makefile b/arch/arc/lib/Makefile
index eb62b3c..12097bf 100644
--- a/arch/arc/lib/Makefile
+++ b/arch/arc/lib/Makefile
@@ -18,7 +18,6 @@ obj-y += memcmp.o
 obj-y += memcpy-700.o
 obj-y += memset.o
 obj-y += reset.o
-obj-y += timer.o
 obj-y += ints_low.o
 obj-y += init_helpers.o
 
diff --git a/arch/arc/lib/timer.c b/arch/arc/lib/timer.c
deleted file mode 100644
index a0acbbc..0000000
--- a/arch/arc/lib/timer.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <asm/arcregs.h>
-
-#define NH_MODE	(1 << 1)	/* Disable timer if CPU is halted */
-
-int timer_init(void)
-{
-	write_aux_reg(ARC_AUX_TIMER0_CTRL, NH_MODE);
-	/* Set max value for counter/timer */
-	write_aux_reg(ARC_AUX_TIMER0_LIMIT, 0xffffffff);
-	/* Set initial count value and restart counter/timer */
-	write_aux_reg(ARC_AUX_TIMER0_CNT, 0);
-	return 0;
-}
-
-unsigned long timer_read_counter(void)
-{
-	return read_aux_reg(ARC_AUX_TIMER0_CNT);
-}
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index 3546c8d..0476223 100644
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -11,8 +11,6 @@
 /*
  *  CPU configuration
  */
-#define CONFIG_SYS_TIMER_RATE		CONFIG_SYS_CLK_FREQ
-
 #define ARC_FPGA_PERIPHERAL_BASE	0xE0000000
 #define ARC_APB_PERIPHERAL_BASE		0xF0000000
 #define ARC_DWMMC_BASE			(ARC_FPGA_PERIPHERAL_BASE + 0x15000)
-- 
2.7.4

[U-Boot] [PATCH v2 0/2] drivers: timer: inroduce ARC timer driver

[Alexey Brodkin]

Hi Tom, Simon,

On Thu, 2016-11-03 at 18:52 +0300, Vlad Zakharov wrote:
> This patch series replaces legacy approach to access ARC timer
> via specific code in "arch/arc/lib/time.c" and uses timer
> driver instead.
> 
> ARC cores may have up to 2 built-in timers: timer0 and timer1,
> usually at least one of them exists.
> 
> They are controlled through auxiliary registers and so we
> don't have to remap their control registers as we used to do
> with MMIO registers of external peripheral devices.
> 
> Cc: Simon Glass <sjg@chromium.org>
> ---
> Changes v1..v2
> ?- Minor clean-ups of code and comments.
> ?- Moved TIMER and ARC_TIMER config symbols from each defconfig to
> arch Kconfig file to avoid duplication
> 
> Vlad Zakharov (2):
> ? drivers: timer: Introduce ARC timer driver
> ? arc: use timer driver instead of arch/arc/lib/timer.c

I'm wondering if you guys would like to accept this short
series in your tree or I may apply it on mine and send pull-request
to Tom later on?

-Alexey

[U-Boot] [PATCH v2 0/2] drivers: timer: inroduce ARC timer driver

[Alexey Brodkin]

Tom, Simon,

Opps, there's actually v3 already, pls refer to it here:
http://patchwork.ozlabs.org/patch/696114/
http://patchwork.ozlabs.org/patch/696115/

And sorry for the noise!
Thanks to Vlad for catching this SNAFU.

-Alexey


On Mon, 2016-11-21 at 17:15 +0300, Alexey Brodkin wrote:
> Hi Tom, Simon,
> 
> On Thu, 2016-11-03 at 18:52 +0300, Vlad Zakharov wrote:
> > 
> > This patch series replaces legacy approach to access ARC timer
> > via specific code in "arch/arc/lib/time.c" and uses timer
> > driver instead.
> > 
> > ARC cores may have up to 2 built-in timers: timer0 and timer1,
> > usually at least one of them exists.
> > 
> > They are controlled through auxiliary registers and so we
> > don't have to remap their control registers as we used to do
> > with MMIO registers of external peripheral devices.
> > 
> > Cc: Simon Glass <sjg@chromium.org>
> > ---
> > Changes v1..v2
> > ?- Minor clean-ups of code and comments.
> > ?- Moved TIMER and ARC_TIMER config symbols from each defconfig to
> > arch Kconfig file to avoid duplication
> > 
> > Vlad Zakharov (2):
> > ? drivers: timer: Introduce ARC timer driver
> > ? arc: use timer driver instead of arch/arc/lib/timer.c
> 
> I'm wondering if you guys would like to accept this short
> series in your tree or I may apply it on mine and send pull-request
> to Tom later on?
> 
> -Alexey

[U-Boot] [PATCH v2 0/2] drivers: timer: inroduce ARC timer driver

[Tom Rini]

On Mon, Nov 21, 2016 at 02:16:25PM +0000, Alexey Brodkin wrote:
> Hi Tom, Simon,
> 
> On Thu, 2016-11-03 at 18:52 +0300, Vlad Zakharov wrote:
> > This patch series replaces legacy approach to access ARC timer
> > via specific code in "arch/arc/lib/time.c" and uses timer
> > driver instead.
> > 
> > ARC cores may have up to 2 built-in timers: timer0 and timer1,
> > usually at least one of them exists.
> > 
> > They are controlled through auxiliary registers and so we
> > don't have to remap their control registers as we used to do
> > with MMIO registers of external peripheral devices.
> > 
> > Cc: Simon Glass <sjg@chromium.org>
> > ---
> > Changes v1..v2
> > ?- Minor clean-ups of code and comments.
> > ?- Moved TIMER and ARC_TIMER config symbols from each defconfig to
> > arch Kconfig file to avoid duplication
> > 
> > Vlad Zakharov (2):
> > ? drivers: timer: Introduce ARC timer driver
> > ? arc: use timer driver instead of arch/arc/lib/timer.c
> 
> I'm wondering if you guys would like to accept this short
> series in your tree or I may apply it on mine and send pull-request
> to Tom later on?

FWIW, I have these assigned to you in patchwork as I figured they would
come via the arc tree, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161121/4f0fe4ed/attachment.sig>

[U-Boot] [PATCH v2 0/2] drivers: timer: inroduce ARC timer driver

[Alexey Brodkin]

Hi Tom,

On Mon, 2016-11-21 at 09:19 -0500, Tom Rini wrote:
> On Mon, Nov 21, 2016 at 02:16:25PM +0000, Alexey Brodkin wrote:
> > 
> > Hi Tom, Simon,
> > 
> > On Thu, 2016-11-03 at 18:52 +0300, Vlad Zakharov wrote:
> > > 
> > > This patch series replaces legacy approach to access ARC timer
> > > via specific code in "arch/arc/lib/time.c" and uses timer
> > > driver instead.
> > > 
> > > ARC cores may have up to 2 built-in timers: timer0 and timer1,
> > > usually at least one of them exists.
> > > 
> > > They are controlled through auxiliary registers and so we
> > > don't have to remap their control registers as we used to do
> > > with MMIO registers of external peripheral devices.
> > > 
> > > Cc: Simon Glass <sjg@chromium.org>
> > > ---
> > > Changes v1..v2
> > > ?- Minor clean-ups of code and comments.
> > > ?- Moved TIMER and ARC_TIMER config symbols from each defconfig to
> > > arch Kconfig file to avoid duplication
> > > 
> > > Vlad Zakharov (2):
> > > ? drivers: timer: Introduce ARC timer driver
> > > ? arc: use timer driver instead of arch/arc/lib/timer.c
> > 
> > I'm wondering if you guys would like to accept this short
> > series in your tree or I may apply it on mine and send pull-request
> > to Tom later on?
> 
> FWIW, I have these assigned to you in patchwork as I figured they would
> come via the arc tree, thanks!

See that's the first day after the weekend and I'm still thinking about
everything but work... that said I noticed you're a delegate for another
Vlad's patch and somehow decided you're the guys for all Vlad's patches :)

I'll apply this series to my tree and some other patches as well and
will send a pull-request shortly.

Hope to not mess things another time around... but cannot promise really :(

-Alexey