* [PATCH 1/1] arm: add generic smp twd timer
@ 2012-10-04 7:01 Jean-Christophe PLAGNIOL-VILLARD
2012-10-04 7:24 ` Sascha Hauer
0 siblings, 1 reply; 3+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-10-04 7:01 UTC (permalink / raw)
To: barebox
on Cortex A9 and Cortex A5 we have a generic timer which we can use as
clocksource
Limit the timer frequency to < 25Mhz
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/cpu/Kconfig | 3 ++
arch/arm/cpu/Makefile | 1 +
arch/arm/cpu/smp_twd.c | 93 ++++++++++++++++++++++++++++++++++++++++
arch/arm/include/asm/smp_twd.h | 23 ++++++++++
4 files changed, 120 insertions(+)
create mode 100644 arch/arm/cpu/smp_twd.c
create mode 100644 arch/arm/include/asm/smp_twd.h
diff --git a/arch/arm/cpu/Kconfig b/arch/arm/cpu/Kconfig
index f55e862..a7a1cdb 100644
--- a/arch/arm/cpu/Kconfig
+++ b/arch/arm/cpu/Kconfig
@@ -94,3 +94,6 @@ config CACHE_L2X0
bool "Enable L2x0 PrimeCell"
depends on MMU && ARCH_HAS_L2X0
+config ARM_SMP_TWD
+ bool
+ depends on CPU_V7
diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile
index f7ab276..c5cbdfb 100644
--- a/arch/arm/cpu/Makefile
+++ b/arch/arm/cpu/Makefile
@@ -18,5 +18,6 @@ pbl-$(CONFIG_CPU_32v6) += cache-armv6.o
obj-$(CONFIG_CPU_32v7) += cache-armv7.o
pbl-$(CONFIG_CPU_32v7) += cache-armv7.o
obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o
+obj-$(CONFIG_ARM_SMP_TWD) += smp_twd.o
pbl-y += start-pbl.o
diff --git a/arch/arm/cpu/smp_twd.c b/arch/arm/cpu/smp_twd.c
new file mode 100644
index 0000000..3825e6b
--- /dev/null
+++ b/arch/arm/cpu/smp_twd.c
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com>
+ *
+ * Under GPL v2
+ */
+#include <common.h>
+#include <init.h>
+#include <clock.h>
+#include <io.h>
+#include <driver.h>
+#include <errno.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+
+#include <asm/smp_twd.h>
+
+static __iomem void *twd_base;
+static struct clk *twd_clk;
+
+static uint64_t smp_twd_read(void)
+{
+ return ~readl(twd_base + TWD_TIMER_COUNTER);
+}
+
+static struct clocksource smp_twd_clksrc = {
+ .read = smp_twd_read,
+ .shift = 20,
+ .mask = CLOCKSOURCE_MASK(32),
+};
+
+#define SMP_TWD_MAX_FREQ (25 *1000 * 1000)
+
+void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq);
+
+static int smp_twd_probe(struct device_d *dev)
+{
+ u32 tick_rate;
+ u32 val;
+ int ret;
+ u32 presc = 0;
+
+ twd_clk = clk_get_sys("smp_twd", NULL);
+ if (IS_ERR(twd_clk)) {
+ ret = PTR_ERR(twd_clk);
+ pr_err("smp_twd: clock not found: %d\n", ret);
+ return ret;
+ }
+
+ ret = clk_enable(twd_clk);
+ if (ret < 0) {
+ pr_err("smp_twd: clock failed to enable: %d\n", ret);
+ clk_put(twd_clk);
+ return ret;
+ }
+
+ twd_base = dev_request_mem_region(dev, 0);
+
+ tick_rate = clk_get_rate(twd_clk);
+ if (tick_rate > SMP_TWD_MAX_FREQ) {
+ presc = tick_rate / SMP_TWD_MAX_FREQ;
+ if (presc)
+ presc--;
+ presc = min((u32)0xff, presc);
+ tick_rate /= presc + 1;
+ }
+
+ val = TWD_TIMER_CONTROL_PRESC(presc) |
+ TWD_TIMER_CONTROL_PERIODIC;
+ writel(val, twd_base + TWD_TIMER_CONTROL);
+
+ writel(0xffffffff, twd_base + TWD_TIMER_LOAD);
+
+ val = readl(twd_base + TWD_TIMER_CONTROL);
+ val |= TWD_TIMER_CONTROL_ENABLE;
+ writel(val, twd_base + TWD_TIMER_CONTROL);
+
+ smp_twd_clksrc.mult = clocksource_hz2mult(tick_rate, smp_twd_clksrc.shift);
+
+ init_clock(&smp_twd_clksrc);
+
+ return 0;
+}
+
+static struct driver_d smp_twd_driver = {
+ .name = "smp-twd",
+ .probe = smp_twd_probe,
+};
+
+static int smp_twd_init(void)
+{
+ return platform_driver_register(&smp_twd_driver);
+}
+coredevice_initcall(smp_twd_init);
diff --git a/arch/arm/include/asm/smp_twd.h b/arch/arm/include/asm/smp_twd.h
new file mode 100644
index 0000000..d461d0b
--- /dev/null
+++ b/arch/arm/include/asm/smp_twd.h
@@ -0,0 +1,23 @@
+#ifndef __ASMARM_SMP_TWD_H
+#define __ASMARM_SMP_TWD_H
+
+#define TWD_TIMER_LOAD 0x00
+#define TWD_TIMER_COUNTER 0x04
+#define TWD_TIMER_CONTROL 0x08
+#define TWD_TIMER_INTSTAT 0x0C
+
+#define TWD_WDOG_LOAD 0x20
+#define TWD_WDOG_COUNTER 0x24
+#define TWD_WDOG_CONTROL 0x28
+#define TWD_WDOG_INTSTAT 0x2C
+#define TWD_WDOG_RESETSTAT 0x30
+#define TWD_WDOG_DISABLE 0x34
+
+#define TWD_TIMER_CONTROL_ENABLE (1 << 0)
+#define TWD_TIMER_CONTROL_ONESHOT (0 << 1)
+#define TWD_TIMER_CONTROL_PERIODIC (1 << 1)
+#define TWD_TIMER_CONTROL_IT_ENABLE (1 << 2)
+
+#define TWD_TIMER_CONTROL_PRESC(x) (((x) & 0xff) << 8)
+
+#endif
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] arm: add generic smp twd timer
2012-10-04 7:01 [PATCH 1/1] arm: add generic smp twd timer Jean-Christophe PLAGNIOL-VILLARD
@ 2012-10-04 7:24 ` Sascha Hauer
2012-10-04 9:54 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 3+ messages in thread
From: Sascha Hauer @ 2012-10-04 7:24 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
On Thu, Oct 04, 2012 at 09:01:33AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> on Cortex A9 and Cortex A5 we have a generic timer which we can use as
> clocksource
>
> Limit the timer frequency to < 25Mhz
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
> arch/arm/cpu/Kconfig | 3 ++
> arch/arm/cpu/Makefile | 1 +
> arch/arm/cpu/smp_twd.c | 93 ++++++++++++++++++++++++++++++++++++++++
> arch/arm/include/asm/smp_twd.h | 23 ++++++++++
> 4 files changed, 120 insertions(+)
> create mode 100644 arch/arm/cpu/smp_twd.c
> create mode 100644 arch/arm/include/asm/smp_twd.h
>
> diff --git a/arch/arm/cpu/Kconfig b/arch/arm/cpu/Kconfig
> index f55e862..a7a1cdb 100644
> --- a/arch/arm/cpu/Kconfig
> +++ b/arch/arm/cpu/Kconfig
> @@ -94,3 +94,6 @@ config CACHE_L2X0
> bool "Enable L2x0 PrimeCell"
> depends on MMU && ARCH_HAS_L2X0
>
> +config ARM_SMP_TWD
> + bool
> + depends on CPU_V7
> diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile
> index f7ab276..c5cbdfb 100644
> --- a/arch/arm/cpu/Makefile
> +++ b/arch/arm/cpu/Makefile
> @@ -18,5 +18,6 @@ pbl-$(CONFIG_CPU_32v6) += cache-armv6.o
> obj-$(CONFIG_CPU_32v7) += cache-armv7.o
> pbl-$(CONFIG_CPU_32v7) += cache-armv7.o
> obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o
> +obj-$(CONFIG_ARM_SMP_TWD) += smp_twd.o
>
> pbl-y += start-pbl.o
> diff --git a/arch/arm/cpu/smp_twd.c b/arch/arm/cpu/smp_twd.c
I was thinking about a drivers/clocksource directory. Maybe this would
be a good opportunity to start it?
> +#include <common.h>
> +#include <init.h>
> +#include <clock.h>
> +#include <io.h>
> +#include <driver.h>
> +#include <errno.h>
> +#include <linux/clk.h>
> +#include <linux/err.h>
> +
> +#include <asm/smp_twd.h>
Please put the register includes either into the file or next to the
file.
> +
> +static __iomem void *twd_base;
> +static struct clk *twd_clk;
> +
> +static uint64_t smp_twd_read(void)
> +{
> + return ~readl(twd_base + TWD_TIMER_COUNTER);
> +}
> +
> +static struct clocksource smp_twd_clksrc = {
> + .read = smp_twd_read,
> + .shift = 20,
> + .mask = CLOCKSOURCE_MASK(32),
> +};
> +
> +#define SMP_TWD_MAX_FREQ (25 *1000 * 1000)
> +
> +void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq);
This is unused.
> +
> +static int smp_twd_probe(struct device_d *dev)
> +{
> + u32 tick_rate;
> + u32 val;
> + int ret;
> + u32 presc = 0;
> +
> + twd_clk = clk_get_sys("smp_twd", NULL);
clk_get
> + if (IS_ERR(twd_clk)) {
> + ret = PTR_ERR(twd_clk);
> + pr_err("smp_twd: clock not found: %d\n", ret);
dev_err, or maybe even dev_dbg. No need to increase the image size for
this.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] arm: add generic smp twd timer
2012-10-04 7:24 ` Sascha Hauer
@ 2012-10-04 9:54 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 0 replies; 3+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-10-04 9:54 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
On 09:24 Thu 04 Oct , Sascha Hauer wrote:
> On Thu, Oct 04, 2012 at 09:01:33AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > on Cortex A9 and Cortex A5 we have a generic timer which we can use as
> > clocksource
> >
> > Limit the timer frequency to < 25Mhz
> >
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > ---
> > arch/arm/cpu/Kconfig | 3 ++
> > arch/arm/cpu/Makefile | 1 +
> > arch/arm/cpu/smp_twd.c | 93 ++++++++++++++++++++++++++++++++++++++++
> > arch/arm/include/asm/smp_twd.h | 23 ++++++++++
> > 4 files changed, 120 insertions(+)
> > create mode 100644 arch/arm/cpu/smp_twd.c
> > create mode 100644 arch/arm/include/asm/smp_twd.h
> >
> > diff --git a/arch/arm/cpu/Kconfig b/arch/arm/cpu/Kconfig
> > index f55e862..a7a1cdb 100644
> > --- a/arch/arm/cpu/Kconfig
> > +++ b/arch/arm/cpu/Kconfig
> > @@ -94,3 +94,6 @@ config CACHE_L2X0
> > bool "Enable L2x0 PrimeCell"
> > depends on MMU && ARCH_HAS_L2X0
> >
> > +config ARM_SMP_TWD
> > + bool
> > + depends on CPU_V7
> > diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile
> > index f7ab276..c5cbdfb 100644
> > --- a/arch/arm/cpu/Makefile
> > +++ b/arch/arm/cpu/Makefile
> > @@ -18,5 +18,6 @@ pbl-$(CONFIG_CPU_32v6) += cache-armv6.o
> > obj-$(CONFIG_CPU_32v7) += cache-armv7.o
> > pbl-$(CONFIG_CPU_32v7) += cache-armv7.o
> > obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o
> > +obj-$(CONFIG_ARM_SMP_TWD) += smp_twd.o
> >
> > pbl-y += start-pbl.o
> > diff --git a/arch/arm/cpu/smp_twd.c b/arch/arm/cpu/smp_twd.c
>
> I was thinking about a drivers/clocksource directory. Maybe this would
> be a good opportunity to start it?
I was thining about it too as I've the same timer on SH and ARM and nomadik
and ux5x0
Best Regards,
J.
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-04 9:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-04 7:01 [PATCH 1/1] arm: add generic smp twd timer Jean-Christophe PLAGNIOL-VILLARD
2012-10-04 7:24 ` Sascha Hauer
2012-10-04 9:54 ` Jean-Christophe PLAGNIOL-VILLARD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox