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,
Joshua Thompson <funaho@jurai.org>
Subject: [RFC PATCH 11/13] m68k: mac: Convert to clocksource API
Date: Mon, 12 Nov 2018 15:12:39 +1100 [thread overview]
Message-ID: <075df60595c7b84cd5de197fb2e7cc83efa44b59.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: Joshua Thompson <funaho@jurai.org>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
arch/m68k/mac/via.c | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index 7130abec0b77..c4c304470fae 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>
@@ -556,13 +557,23 @@ 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;
static bool lost_timer_intr;
static irqreturn_t via_timer_handler(int irq, void *data)
@@ -573,16 +584,18 @@ static irqreturn_t via_timer_handler(int irq, void *data)
local_irq_save(flags);
if (lost_timer_intr) {
lost_timer_intr = false;
- local_irq_restore(flags);
- func(irq, data);
- } else
- local_irq_restore(flags);
+ clk_total += VIA_TIMER_CYCLES;
+ }
+ clk_total += VIA_TIMER_CYCLES;
+ local_irq_restore(flags);
+
return func(irq, data);
}
void __init via_init_clock(irq_handler_t func)
{
- if (request_irq(IRQ_MAC_TIMER_1, via_timer_handler, 0, "timer", func)) {
+ if (request_irq(IRQ_MAC_TIMER_1, via_timer_handler, IRQF_TIMER,
+ "timer", func)) {
pr_err("Couldn't register %s interrupt\n", "timer");
return;
}
@@ -592,11 +605,13 @@ void __init via_init_clock(irq_handler_t func)
via1[vT1CL] = VIA_TC_LOW;
via1[vT1CH] = VIA_TC_HIGH;
via1[vACR] |= 0x40;
+
+ clocksource_register_hz(&mac_clk, VIA_CLOCK_FREQ);
}
#define VIA_T1_INT_FLAG BIT(6)
-u32 mac_gettimeoffset(void)
+static u64 mac_read_clk(struct clocksource *cs)
{
unsigned long flags;
u8 count_high, count_high_new, count_low;
@@ -631,5 +646,5 @@ u32 mac_gettimeoffset(void)
count = ((count_high << 8) | count_low) + 1;
count = VIA_TIMER_CYCLES - count + offset;
- return ((count * VIA_TIMER_INTERVAL) / VIA_TIMER_CYCLES) * 1000;
+ return clk_total + count;
}
--
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 ` [RFC PATCH 10/13] m68k: hp300: Convert to clocksource API Finn Thain
2018-11-12 4:12 ` Finn Thain [this message]
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=075df60595c7b84cd5de197fb2e7cc83efa44b59.1541995959.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=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.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).