From: Finn Thain <fthain@telegraphics.com.au>
To: Geert Uytterhoeven <geert@linux-m68k.org>,
Joshua Thompson <funaho@jurai.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: [PATCH v4 10/14] m68k: mac: Convert to clocksource API
Date: Sat, 01 Dec 2018 11:53:10 +1100 [thread overview]
Message-ID: <204f589d89d7eabe0799003b0378142795afec99.1543625590.git.fthain@telegraphics.com.au> (raw)
In-Reply-To: <cover.1543625590.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>
Tested-by: Stan Johnson <userm57@yahoo.com>
---
Changed since v3:
- Use clk_offset variable to track the offset when the irq check is skipped.
Changed since v2:
- Drop 'clk_offset' variable.
Changed since v1:
- Moved clk_total access to within the irq lock.
- Use type u32 for tick counter.
---
arch/m68k/mac/via.c | 45 ++++++++++++++++++++++++++++++++++++---------
1 file changed, 36 insertions(+), 9 deletions(-)
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index 65aca12a8694..31cccc79cb7a 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -23,6 +23,7 @@
*
*/
+#include <linux/clocksource.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@ -573,16 +574,39 @@ EXPORT_SYMBOL(via2_scsi_drq_pending);
/* timer and clock source */
#define VIA_CLOCK_FREQ 783360 /* VIA "phase 2" clock in Hz */
-#define VIA_TIMER_INTERVAL (1000000 / HZ) /* microseconds per jiffy */
#define VIA_TIMER_CYCLES (VIA_CLOCK_FREQ / HZ) /* clock cycles per jiffy */
#define VIA_TC (VIA_TIMER_CYCLES - 2) /* including 0 and -1 */
#define VIA_TC_LOW (VIA_TC & 0xFF)
#define VIA_TC_HIGH (VIA_TC >> 8)
+static u64 mac_read_clk(struct clocksource *cs);
+
+static struct clocksource mac_clk = {
+ .name = "via1",
+ .rating = 250,
+ .read = mac_read_clk,
+ .mask = CLOCKSOURCE_MASK(32),
+ .flags = CLOCK_SOURCE_IS_CONTINUOUS,
+};
+
+static u32 clk_total, clk_offset;
+
+static irqreturn_t via_timer_handler(int irq, void *dev_id)
+{
+ irq_handler_t timer_routine = dev_id;
+
+ clk_total += VIA_TIMER_CYCLES;
+ clk_offset = 0;
+ timer_routine(0, NULL);
+
+ return IRQ_HANDLED;
+}
+
void __init via_init_clock(irq_handler_t timer_routine)
{
- if (request_irq(IRQ_MAC_TIMER_1, timer_routine, 0, "timer", NULL)) {
+ if (request_irq(IRQ_MAC_TIMER_1, via_timer_handler, IRQF_TIMER, "timer",
+ timer_routine)) {
pr_err("Couldn't register %s interrupt\n", "timer");
return;
}
@@ -592,13 +616,16 @@ void __init via_init_clock(irq_handler_t timer_routine)
via1[vT1CL] = VIA_TC_LOW;
via1[vT1CH] = VIA_TC_HIGH;
via1[vACR] |= 0x40;
+
+ clocksource_register_hz(&mac_clk, VIA_CLOCK_FREQ);
}
-u32 mac_gettimeoffset(void)
+static u64 mac_read_clk(struct clocksource *cs)
{
unsigned long flags;
u8 count_high;
- u16 count, offset = 0;
+ u16 count;
+ u32 ticks;
/*
* Timer counter wrap-around is detected with the timer interrupt flag
@@ -614,11 +641,11 @@ u32 mac_gettimeoffset(void)
if (count_high == 0xFF)
count_high = 0;
if (count_high > 0 && (via1[vIFR] & VIA_TIMER_1_INT))
- offset = VIA_TIMER_CYCLES;
- local_irq_restore(flags);
-
+ clk_offset = VIA_TIMER_CYCLES;
count = count_high << 8;
- count = VIA_TIMER_CYCLES - count + offset;
+ ticks = VIA_TIMER_CYCLES - count;
+ ticks += clk_offset + clk_total;
+ local_irq_restore(flags);
- return ((count * VIA_TIMER_INTERVAL) / VIA_TIMER_CYCLES) * 1000;
+ return ticks;
}
--
2.18.1
next prev parent reply other threads:[~2018-12-01 1:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-01 0:53 [PATCH v4 00/14] m68k: Drop arch_gettimeoffset and adopt clocksource API Finn Thain
2018-12-01 0:53 ` [PATCH v4 05/14] m68k: amiga: Convert to " Finn Thain
2018-12-01 0:53 ` [PATCH v4 02/14] m68k: mac: Fix VIA timer counter accesses Finn Thain
2018-12-01 0:53 ` [PATCH v4 01/14] m68k: Call timer_interrupt() with interrupts disabled Finn Thain
2018-12-01 0:53 ` [PATCH v4 09/14] m68k: hp300: Handle timer counter overflow Finn Thain
2018-12-01 0:53 ` [PATCH v4 03/14] m68k: apollo, q40, sun3, sun3x: Remove arch_gettimeoffset implementations Finn Thain
2018-12-01 0:53 ` [PATCH v4 12/14] m68k: mvme147: Handle timer counter overflow Finn Thain
2018-12-01 0:53 ` [PATCH v4 13/14] m68k: mvme16x: Convert to clocksource API Finn Thain
2018-12-01 0:53 ` Finn Thain [this message]
2018-12-01 0:53 ` [PATCH v4 04/14] m68k: Drop ARCH_USES_GETTIMEOFFSET Finn Thain
2018-12-01 0:53 ` [PATCH v4 07/14] m68k: bvme6000: Convert to clocksource API Finn Thain
2018-12-01 0:53 ` [PATCH v4 14/14] m68k: mvme16x: Handle timer counter overflow Finn Thain
2018-12-01 0:53 ` [PATCH v4 08/14] m68k: hp300: Convert to clocksource API Finn Thain
2018-12-01 0:53 ` [PATCH v4 06/14] m68k: atari: " Finn Thain
2018-12-01 0:53 ` [PATCH v4 11/14] m68k: mvme147: " Finn Thain
2019-03-05 6:13 ` [PATCH v4 00/14] m68k: Drop arch_gettimeoffset and adopt " Finn Thain
2019-03-05 7:50 ` Geert Uytterhoeven
2019-03-05 9:55 ` Finn Thain
2019-03-05 12:01 ` Linus Walleij
2019-03-25 9:25 ` Geert Uytterhoeven
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=204f589d89d7eabe0799003b0378142795afec99.1543625590.git.fthain@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=arnd@arndb.de \
--cc=daniel.lezcano@linaro.org \
--cc=funaho@jurai.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=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).