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,
Michael Schmitz <schmitzmic@gmail.com>
Subject: [RFC PATCH 08/13] m68k: atari: Convert to clocksource API
Date: Mon, 12 Nov 2018 15:12:39 +1100 [thread overview]
Message-ID: <efdb35ee790bac91293d222ea66559853276b6de.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: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
arch/m68k/atari/time.c | 39 ++++++++++++++++++++++++++++++++-------
1 file changed, 32 insertions(+), 7 deletions(-)
diff --git a/arch/m68k/atari/time.c b/arch/m68k/atari/time.c
index 4765e9a58293..d066599fcc54 100644
--- a/arch/m68k/atari/time.c
+++ b/arch/m68k/atari/time.c
@@ -16,6 +16,7 @@
#include <linux/init.h>
#include <linux/rtc.h>
#include <linux/bcd.h>
+#include <linux/clocksource.h>
#include <linux/delay.h>
#include <linux/export.h>
@@ -24,6 +25,30 @@
DEFINE_SPINLOCK(rtc_lock);
EXPORT_SYMBOL_GPL(rtc_lock);
+static u64 atari_read_clk(struct clocksource *cs);
+
+static struct clocksource atari_clk = {
+ .name = "mfp",
+ .rating = 250,
+ .read = atari_read_clk,
+ .mask = CLOCKSOURCE_MASK(32),
+ .flags = CLOCK_SOURCE_IS_CONTINUOUS,
+};
+
+static u32 clk_total;
+
+static irqreturn_t mfp_timer_handler(int irq, void *data)
+{
+ irq_handler_t func = data;
+ unsigned long flags;
+
+ local_irq_save(flags);
+ clk_total += INT_TICKS;
+ local_irq_restore(flags);
+
+ return func(irq, data);
+}
+
void __init
atari_sched_init(irq_handler_t timer_routine)
{
@@ -32,15 +57,16 @@ atari_sched_init(irq_handler_t timer_routine)
/* start timer C, div = 1:100 */
st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 15) | 0x60;
/* install interrupt service routine for MFP Timer C */
- if (request_irq(IRQ_MFP_TIMC, timer_routine, 0, "timer", timer_routine))
+ if (request_irq(IRQ_MFP_TIMC, mfp_timer_handler, IRQF_TIMER, "timer",
+ timer_routine))
pr_err("Couldn't register timer interrupt\n");
+
+ clocksource_register_hz(&atari_clk, INT_CLK);
}
/* ++andreas: gettimeoffset fixed to check for pending interrupt */
-#define TICK_SIZE 10000
-
-u32 atari_gettimeoffset(void)
+static u64 atari_read_clk(struct clocksource *cs)
{
unsigned long flags;
u32 ticks, offset = 0;
@@ -53,14 +79,13 @@ u32 atari_gettimeoffset(void)
if (ticks > INT_TICKS - INT_TICKS / 50)
/* Check for pending timer interrupt */
if (st_mfp.int_pn_b & (1 << 5))
- offset = TICK_SIZE;
+ offset = INT_TICKS;
local_irq_restore(flags);
ticks = INT_TICKS - ticks;
- ticks = ticks * 10000L / INT_TICKS;
- return (ticks + offset) * 1000;
+ return clk_total + ticks + offset;
}
--
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 ` Finn Thain [this message]
2018-11-12 4:12 ` [RFC PATCH 04/13] m68k: mac: Clean up unused timer definitions Finn Thain
2018-11-12 4:12 ` [RFC PATCH 10/13] m68k: hp300: Convert to clocksource API Finn Thain
2018-11-12 4:12 ` [RFC PATCH 11/13] m68k: mac: " 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=efdb35ee790bac91293d222ea66559853276b6de.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=schivers@csc.com.au \
--cc=schmitzmic@gmail.com \
--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).