From: Finn Thain <fthain@telegraphics.com.au>
To: Geert Uytterhoeven <geert@linux-m68k.org>,
Philip Blundell <philb@gnu.org>
Cc: Andreas Schwab <schwab@linux-m68k.org>,
Arnd Bergmann <arnd@arndb.de>,
Stephen N Chivers <schivers@csc.com.au>,
Thomas Gleixner <tglx@linutronix.de>,
Kars de Jong <jongk@linux-m68k.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Michael Schmitz <schmitzmic@gmail.com>,
John Stultz <john.stultz@linaro.org>,
Linus Walleij <linus.walleij@linaro.org>,
linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH v3 08/14] m68k: hp300: Convert to clocksource API
Date: Sat, 24 Nov 2018 14:09:03 +1100 [thread overview]
Message-ID: <f425c999a5aa10984a7a3daee84b41719c5a8ac1.1543028943.git.fthain@telegraphics.com.au> (raw)
In-Reply-To: <cover.1543028943.git.fthain@telegraphics.com.au>
Add a platform clocksource by adapting the existing arch_gettimeoffset
implementation.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
Changed since v1:
- Moved clk_total access to within the irq lock.
- Use type u32 for tick counter.
---
arch/m68k/hp300/time.c | 37 ++++++++++++++++++++++++++++++-------
1 file changed, 30 insertions(+), 7 deletions(-)
diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c
index d30b03ea93a2..90982803a629 100644
--- a/arch/m68k/hp300/time.c
+++ b/arch/m68k/hp300/time.c
@@ -8,6 +8,7 @@
*/
#include <asm/ptrace.h>
+#include <linux/clocksource.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/sched.h>
@@ -19,6 +20,18 @@
#include <asm/traps.h>
#include <asm/blinken.h>
+static u64 hp300_read_clk(struct clocksource *cs);
+
+static struct clocksource hp300_clk = {
+ .name = "timer",
+ .rating = 250,
+ .read = hp300_read_clk,
+ .mask = CLOCKSOURCE_MASK(32),
+ .flags = CLOCK_SOURCE_IS_CONTINUOUS,
+};
+
+static u32 clk_total;
+
/* Clock hardware definitions */
#define CLOCKBASE 0xf05f8000
@@ -32,9 +45,10 @@
#define CLKMSB3 0xD
/* This is for machines which generate the exact clock. */
-#define USECS_PER_JIFFY (1000000/HZ)
-#define INTVAL ((10000 / 4) - 1)
+#define HP300_TIMER_CLOCK_FREQ 250000
+#define HP300_TIMER_CYCLES (HP300_TIMER_CLOCK_FREQ / HZ)
+#define INTVAL (HP300_TIMER_CYCLES - 1)
static irqreturn_t hp300_tick(int irq, void *dev_id)
{
@@ -45,6 +59,7 @@ static irqreturn_t hp300_tick(int irq, void *dev_id)
local_irq_save(flags);
in_8(CLOCKBASE + CLKSR);
asm volatile ("movpw %1@(5),%0" : "=d" (tmp) : "a" (CLOCKBASE));
+ clk_total += INTVAL;
timer_routine(0, NULL);
local_irq_restore(flags);
@@ -53,20 +68,26 @@ static irqreturn_t hp300_tick(int irq, void *dev_id)
return IRQ_HANDLED;
}
-u32 hp300_gettimeoffset(void)
+static u64 hp300_read_clk(struct clocksource *cs)
{
- /* Read current timer 1 value */
+ unsigned long flags;
unsigned char lsb, msb1, msb2;
- unsigned short ticks;
+ u32 ticks;
+ local_irq_save(flags);
+ /* Read current timer 1 value */
msb1 = in_8(CLOCKBASE + 5);
lsb = in_8(CLOCKBASE + 7);
msb2 = in_8(CLOCKBASE + 5);
if (msb1 != msb2)
/* A carry happened while we were reading. Read it again */
lsb = in_8(CLOCKBASE + 7);
+
ticks = INTVAL - ((msb2 << 8) | lsb);
- return ((USECS_PER_JIFFY * ticks) / INTVAL) * 1000;
+ ticks += clk_total;
+ local_irq_restore(flags);
+
+ return ticks;
}
void __init hp300_sched_init(irq_handler_t vector)
@@ -76,9 +97,11 @@ void __init hp300_sched_init(irq_handler_t vector)
asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));
- if (request_irq(IRQ_AUTO_6, hp300_tick, 0, "timer tick", vector))
+ if (request_irq(IRQ_AUTO_6, hp300_tick, IRQF_TIMER, "timer tick", vector))
pr_err("Couldn't register timer interrupt\n");
out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */
out_8(CLOCKBASE + CLKCR1, 0x40); /* enable irq */
+
+ clocksource_register_hz(&hp300_clk, HP300_TIMER_CLOCK_FREQ);
}
--
2.18.1
next prev parent reply other threads:[~2018-11-24 3:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-24 3:09 [RFC PATCH v3 00/14] m68k: Drop arch_gettimeoffset and adopt clocksource API Finn Thain
2018-11-24 3:09 ` [RFC PATCH v3 11/14] m68k: mvme147: Convert to " Finn Thain
2018-11-24 3:09 ` [RFC PATCH v3 04/14] m68k: Drop ARCH_USES_GETTIMEOFFSET Finn Thain
2018-11-24 3:09 ` [RFC PATCH v3 07/14] m68k: bvme6000: Convert to clocksource API Finn Thain
2018-11-24 3:09 ` [RFC PATCH v3 14/14] m68k: mvme16x: Handle timer counter overflow Finn Thain
2018-11-24 3:09 ` [RFC PATCH v3 02/14] m68k: mac: Fix VIA timer counter accesses Finn Thain
2018-11-24 3:09 ` [RFC PATCH v3 05/14] m68k: amiga: Convert to clocksource API Finn Thain
2018-11-24 3:09 ` [RFC PATCH v3 03/14] m68k: apollo, q40, sun3, sun3x: Remove arch_gettimeoffset implementations Finn Thain
2018-11-24 3:09 ` [RFC PATCH v3 12/14] m68k: mvme147: Handle timer counter overflow Finn Thain
2018-11-24 3:09 ` Finn Thain [this message]
2018-11-24 3:09 ` [RFC PATCH v3 06/14] m68k: atari: Convert to clocksource API Finn Thain
2018-11-24 3:09 ` [RFC PATCH v3 01/14] m68k: Call timer_interrupt() with interrupts disabled Finn Thain
2018-11-24 3:09 ` [RFC PATCH v3 10/14] m68k: mac: Convert to clocksource API Finn Thain
2018-11-24 3:09 ` [RFC PATCH v3 13/14] m68k: mvme16x: " Finn Thain
2018-11-24 3:09 ` [RFC PATCH v3 09/14] m68k: hp300: Handle timer counter overflow Finn Thain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f425c999a5aa10984a7a3daee84b41719c5a8ac1.1543028943.git.fthain@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=arnd@arndb.de \
--cc=daniel.lezcano@linaro.org \
--cc=geert@linux-m68k.org \
--cc=john.stultz@linaro.org \
--cc=jongk@linux-m68k.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=philb@gnu.org \
--cc=schivers@csc.com.au \
--cc=schmitzmic@gmail.com \
--cc=schwab@linux-m68k.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).