From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Finn Thain <fthain@telegraphics.com.au>
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 <linux-m68k@lists.linux-m68k.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [RFC PATCH 07/13] m68k: amiga: Convert to clocksource API
Date: Mon, 12 Nov 2018 10:02:02 +0100 [thread overview]
Message-ID: <CAMuHMdU15gaEcwG4JCFxDwsA-dm0uHzZe_EmtoSLgOV2XAgWbQ@mail.gmail.com> (raw)
In-Reply-To: <cbfa6a4e8a1a36e22969e63b703015007abe8593.1541995959.git.fthain@telegraphics.com.au>
Hi Finn,
On Mon, Nov 12, 2018 at 5:46 AM Finn Thain <fthain@telegraphics.com.au> wrote:
> Add a platform clocksource by adapting the existing arch_gettimeoffset
> implementation.
>
> Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Thanks for your patch!
> --- a/arch/m68k/amiga/config.c
> +++ b/arch/m68k/amiga/config.c
> @@ -17,6 +17,7 @@
> #include <linux/mm.h>
> #include <linux/seq_file.h>
> #include <linux/tty.h>
> +#include <linux/clocksource.h>
> #include <linux/console.h>
> #include <linux/rtc.h>
> #include <linux/init.h>
> @@ -461,7 +462,30 @@ void __init config_amiga(void)
> *(unsigned char *)ZTWO_VADDR(0xde0002) |= 0x80;
> }
>
> +static u64 amiga_read_clk(struct clocksource *cs);
> +
> +static struct clocksource amiga_clk = {
> + .name = "ciab",
> + .rating = 250,
> + .read = amiga_read_clk,
> + .mask = CLOCKSOURCE_MASK(32),
> + .flags = CLOCK_SOURCE_IS_CONTINUOUS,
> +};
> +
> static unsigned short jiffy_ticks;
> +static u32 clk_total;
Shouldn't clk_total be u64?
> +
> +static irqreturn_t ciab_timer_handler(int irq, void *data)
> +{
> + irq_handler_t timer_routine = data;
> + unsigned long flags;
> +
> + local_irq_save(flags);
> + clk_total += jiffy_ticks;
> + local_irq_restore(flags);
> +
> + return timer_routine(irq, data);
> +}
[...]
> -static u32 amiga_gettimeoffset(void)
> +static u64 amiga_read_clk(struct clocksource *cs)
> {
> unsigned long flags;
> unsigned short hi, lo, hi2;
> @@ -512,14 +537,13 @@ static u32 amiga_gettimeoffset(void)
> if (ticks > jiffy_ticks / 2)
> /* check for pending interrupt */
> if (cia_set_irq(&ciab_base, 0) & CIA_ICR_TA)
> - offset = 10000;
> + offset = jiffy_ticks;
>
> local_irq_restore(flags);
>
> ticks = jiffy_ticks - ticks;
> - ticks = (10000 * ticks) / jiffy_ticks;
>
> - return (ticks + offset) * 1000;
> + return clk_total + ticks + offset;
... to return a full 64-bit value here?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2018-11-12 9:02 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 ` [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 [this message]
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=CAMuHMdU15gaEcwG4JCFxDwsA-dm0uHzZe_EmtoSLgOV2XAgWbQ@mail.gmail.com \
--to=geert@linux-m68k.org \
--cc=arnd@arndb.de \
--cc=daniel.lezcano@linaro.org \
--cc=fthain@telegraphics.com.au \
--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).