From: Finn Thain <fthain@telegraphics.com.au>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Stephen N Chivers <schivers@csc.com.au>,
Thomas Gleixner <tglx@linutronix.de>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
John Stultz <john.stultz@linaro.org>,
linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org,
Philip Blundell <philb@gnu.org>
Subject: [RFC PATCH 10/13] m68k: hp300: Convert to clocksource API
Date: Mon, 12 Nov 2018 15:12:39 +1100 [thread overview]
Message-ID: <6fd1919c60b88c0383be6d3555190a6411ebe2d4.1541995959.git.fthain@telegraphics.com.au> (raw)
In-Reply-To: <cover.1541995959.git.fthain@telegraphics.com.au>
Add a platform clocksource by adapting the existing arch_gettimeoffset
implementation.
Cc: Philip Blundell <philb@gnu.org>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
arch/m68k/hp300/time.c | 33 ++++++++++++++++++++++++++++-----
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c
index 5cf711fd0858..ff2fc65bc5e7 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,22 +45,29 @@
#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)
{
+ unsigned long flags;
unsigned long tmp;
irq_handler_t vector = dev_id;
+
+ local_irq_save(flags);
in_8(CLOCKBASE + CLKSR);
asm volatile ("movpw %1@(5),%0" : "=d" (tmp) : "a" (CLOCKBASE));
+ clk_total += INTVAL;
+ local_irq_restore(flags);
+
/* Turn off the network and SCSI leds */
blinken_leds(0, 0xe0);
return vector(irq, NULL);
}
-u32 hp300_gettimeoffset(void)
+static u64 hp300_read_clk(struct clocksource *cs)
{
unsigned long flags;
unsigned char lsb, msb1, msb2;
@@ -66,7 +86,8 @@ u32 hp300_gettimeoffset(void)
local_irq_restore(flags);
ticks = INTVAL - ((msb2 << 8) | lsb);
- return ((USECS_PER_JIFFY * ticks) / INTVAL) * 1000;
+
+ return clk_total + 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-12 4:47 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-12 4:12 [RFC PATCH 00/13] m68k: Drop arch_gettimeoffset and adopt clocksource API Finn Thain
2018-11-12 4:12 ` [RFC PATCH 08/13] m68k: atari: Convert to " Finn Thain
2018-11-12 4:12 ` [RFC PATCH 04/13] m68k: mac: Clean up unused timer definitions Finn Thain
2018-11-12 4:12 ` Finn Thain [this message]
2018-11-12 4:12 ` [RFC PATCH 11/13] m68k: mac: Convert to clocksource API Finn Thain
2018-11-12 4:12 ` [RFC PATCH 01/13] arm: Fix mutual exclusion in arch_gettimeoffset Finn Thain
2018-11-12 8:34 ` Christoph Hellwig
2018-11-13 3:39 ` Finn Thain
2018-11-13 9:20 ` Russell King - ARM Linux
2018-11-13 21:55 ` Finn Thain
2018-11-13 23:43 ` Russell King - ARM Linux
2018-11-14 1:35 ` Michael Schmitz
2018-11-14 7:58 ` Russell King - ARM Linux
2018-11-15 1:34 ` Michael Schmitz
2018-11-14 3:17 ` Finn Thain
2018-11-14 14:16 ` Russell King - ARM Linux
2018-11-14 14:58 ` Geert Uytterhoeven
2018-11-14 18:11 ` Russell King - ARM Linux
2018-11-15 4:12 ` Finn Thain
2018-11-16 17:47 ` Russell King - ARM Linux
2018-11-16 22:49 ` Finn Thain
2018-11-17 3:00 ` Michael Schmitz
2018-11-14 12:05 ` Russell King - ARM Linux
2018-11-12 4:12 ` [RFC PATCH 02/13] m68k: " Finn Thain
2018-11-12 4:12 ` [RFC PATCH 07/13] m68k: amiga: Convert to clocksource API Finn Thain
2018-11-12 9:02 ` Geert Uytterhoeven
2018-11-12 9:21 ` Finn Thain
2018-11-12 4:12 ` [RFC PATCH 09/13] m68k: bvme6000: " Finn Thain
2018-11-12 4:12 ` [RFC PATCH 06/13] m68k: Drop ARCH_USES_GETTIMEOFFSET Finn Thain
2018-11-12 9:00 ` Geert Uytterhoeven
2018-11-12 9:06 ` Finn Thain
2018-11-13 2:29 ` Michael Schmitz
2018-11-13 3:14 ` Finn Thain
2018-11-13 4:50 ` Michael Schmitz
2018-11-13 6:15 ` Finn Thain
2018-11-13 8:24 ` Michael Schmitz
2018-11-13 22:11 ` Finn Thain
2018-11-14 1:08 ` Michael Schmitz
2018-11-14 2:58 ` Michael Schmitz
2018-11-14 23:54 ` Michael Schmitz
2018-11-15 4:37 ` Finn Thain
2018-11-15 6:35 ` Michael Schmitz
2018-11-16 0:04 ` Finn Thain
2018-11-12 4:12 ` [RFC PATCH 13/13] m68k: mvme16x: Convert to clocksource API Finn Thain
2018-11-12 18:37 ` Thomas Gleixner
2018-11-13 0:11 ` Finn Thain
2018-11-13 22:04 ` Finn Thain
2018-11-13 22:10 ` [RFC PATCH 13/13] m68k: mvme16x: Convert to clocksource APIy Thomas Gleixner
2018-11-13 22:33 ` Finn Thain
2018-11-18 17:12 ` Thomas Gleixner
2018-11-12 4:12 ` [RFC PATCH 03/13] m68k: mac: Fix VIA timer counter accesses Finn Thain
2018-11-12 4:12 ` [RFC PATCH 12/13] m68k: mvme147: Convert to clocksource API Finn Thain
2018-11-12 4:12 ` [RFC PATCH 05/13] m68k: apollo, q40, sun3, sun3x: Remove arch_gettimeoffset implementations 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=6fd1919c60b88c0383be6d3555190a6411ebe2d4.1541995959.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=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=philb@gnu.org \
--cc=schivers@csc.com.au \
--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).