From: Daniel Lezcano <daniel.lezcano@linaro.org> To: tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Alexandre Belloni <alexandre.belloni@bootlin.com>, Nicolas Ferre <nicolas.ferre@microchip.com>, Ludovic Desroches <ludovic.desroches@microchip.com>, linux-arm-kernel@lists.infradead.org (moderated list:ARM/Microchip (AT91) SoC support) Subject: [PATCH 06/20] clocksource/drivers/tcb_clksrc: Register delay timer Date: Mon, 26 Aug 2019 22:43:53 +0200 [thread overview] Message-ID: <20190826204407.17759-6-daniel.lezcano@linaro.org> (raw) In-Reply-To: <20190826204407.17759-1-daniel.lezcano@linaro.org> From: Alexandre Belloni <alexandre.belloni@bootlin.com> Implement and register delay timer to allow get_cycles() to work properly. Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- drivers/clocksource/Kconfig | 2 +- drivers/clocksource/timer-atmel-tcb.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 5e9317dc3d39..a642c23b2fba 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -429,7 +429,7 @@ config ATMEL_ST config ATMEL_TCB_CLKSRC bool "Atmel TC Block timer driver" if COMPILE_TEST - depends on HAS_IOMEM + depends on ARM && HAS_IOMEM select TIMER_OF if OF help Support for Timer Counter Blocks on Atmel SoCs. diff --git a/drivers/clocksource/timer-atmel-tcb.c b/drivers/clocksource/timer-atmel-tcb.c index 6ed31f9def7e..7427b07495a8 100644 --- a/drivers/clocksource/timer-atmel-tcb.c +++ b/drivers/clocksource/timer-atmel-tcb.c @@ -6,6 +6,7 @@ #include <linux/irq.h> #include <linux/clk.h> +#include <linux/delay.h> #include <linux/err.h> #include <linux/ioport.h> #include <linux/io.h> @@ -125,6 +126,18 @@ static u64 notrace tc_sched_clock_read32(void) return tc_get_cycles32(&clksrc); } +static struct delay_timer tc_delay_timer; + +static unsigned long tc_delay_timer_read(void) +{ + return tc_get_cycles(&clksrc); +} + +static unsigned long notrace tc_delay_timer_read32(void) +{ + return tc_get_cycles32(&clksrc); +} + #ifdef CONFIG_GENERIC_CLOCKEVENTS struct tc_clkevt_device { @@ -432,6 +445,7 @@ static int __init tcb_clksrc_init(struct device_node *node) /* setup ony channel 0 */ tcb_setup_single_chan(&tc, best_divisor_idx); tc_sched_clock = tc_sched_clock_read32; + tc_delay_timer.read_current_timer = tc_delay_timer_read32; } else { /* we have three clocks no matter what the * underlying platform supports. @@ -444,6 +458,7 @@ static int __init tcb_clksrc_init(struct device_node *node) /* setup both channel 0 & 1 */ tcb_setup_dual_chan(&tc, best_divisor_idx); tc_sched_clock = tc_sched_clock_read; + tc_delay_timer.read_current_timer = tc_delay_timer_read; } /* and away we go! */ @@ -458,6 +473,9 @@ static int __init tcb_clksrc_init(struct device_node *node) sched_clock_register(tc_sched_clock, 32, divided_rate); + tc_delay_timer.freq = divided_rate; + register_current_timer_delay(&tc_delay_timer); + return 0; err_unregister_clksrc: -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Lezcano <daniel.lezcano@linaro.org> To: tglx@linutronix.de Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>, Ludovic Desroches <ludovic.desroches@microchip.com>, linux-kernel@vger.kernel.org, "moderated list:ARM/Microchip AT91 SoC support" <linux-arm-kernel@lists.infradead.org> Subject: [PATCH 06/20] clocksource/drivers/tcb_clksrc: Register delay timer Date: Mon, 26 Aug 2019 22:43:53 +0200 [thread overview] Message-ID: <20190826204407.17759-6-daniel.lezcano@linaro.org> (raw) In-Reply-To: <20190826204407.17759-1-daniel.lezcano@linaro.org> From: Alexandre Belloni <alexandre.belloni@bootlin.com> Implement and register delay timer to allow get_cycles() to work properly. Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- drivers/clocksource/Kconfig | 2 +- drivers/clocksource/timer-atmel-tcb.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 5e9317dc3d39..a642c23b2fba 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -429,7 +429,7 @@ config ATMEL_ST config ATMEL_TCB_CLKSRC bool "Atmel TC Block timer driver" if COMPILE_TEST - depends on HAS_IOMEM + depends on ARM && HAS_IOMEM select TIMER_OF if OF help Support for Timer Counter Blocks on Atmel SoCs. diff --git a/drivers/clocksource/timer-atmel-tcb.c b/drivers/clocksource/timer-atmel-tcb.c index 6ed31f9def7e..7427b07495a8 100644 --- a/drivers/clocksource/timer-atmel-tcb.c +++ b/drivers/clocksource/timer-atmel-tcb.c @@ -6,6 +6,7 @@ #include <linux/irq.h> #include <linux/clk.h> +#include <linux/delay.h> #include <linux/err.h> #include <linux/ioport.h> #include <linux/io.h> @@ -125,6 +126,18 @@ static u64 notrace tc_sched_clock_read32(void) return tc_get_cycles32(&clksrc); } +static struct delay_timer tc_delay_timer; + +static unsigned long tc_delay_timer_read(void) +{ + return tc_get_cycles(&clksrc); +} + +static unsigned long notrace tc_delay_timer_read32(void) +{ + return tc_get_cycles32(&clksrc); +} + #ifdef CONFIG_GENERIC_CLOCKEVENTS struct tc_clkevt_device { @@ -432,6 +445,7 @@ static int __init tcb_clksrc_init(struct device_node *node) /* setup ony channel 0 */ tcb_setup_single_chan(&tc, best_divisor_idx); tc_sched_clock = tc_sched_clock_read32; + tc_delay_timer.read_current_timer = tc_delay_timer_read32; } else { /* we have three clocks no matter what the * underlying platform supports. @@ -444,6 +458,7 @@ static int __init tcb_clksrc_init(struct device_node *node) /* setup both channel 0 & 1 */ tcb_setup_dual_chan(&tc, best_divisor_idx); tc_sched_clock = tc_sched_clock_read; + tc_delay_timer.read_current_timer = tc_delay_timer_read; } /* and away we go! */ @@ -458,6 +473,9 @@ static int __init tcb_clksrc_init(struct device_node *node) sched_clock_register(tc_sched_clock, 32, divided_rate); + tc_delay_timer.freq = divided_rate; + register_current_timer_delay(&tc_delay_timer); + return 0; err_unregister_clksrc: -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-08-26 20:44 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-26 20:41 [GIT PULL] timers drivers v5.5 Daniel Lezcano 2019-08-26 20:43 ` [PATCH 01/20] clocksource: Remove dev_err() usage after platform_get_irq() Daniel Lezcano 2019-08-26 20:43 ` [PATCH 02/20] dt-bindings: timer: Convert Allwinner A10 Timer to a schema Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` [PATCH 03/20] dt-bindings: timer: Add missing compatibles Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` [PATCH 04/20] clocksource: sun4i: " Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` [PATCH 05/20] dt-bindings: timer: Convert Allwinner A13 HSTimer to a schema Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano [this message] 2019-08-26 20:43 ` [PATCH 06/20] clocksource/drivers/tcb_clksrc: Register delay timer Daniel Lezcano 2019-08-26 20:43 ` [PATCH 07/20] clocksource/drivers/imx-sysctr: Add internal clock divider handle Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` [PATCH 08/20] arm64: dts: imx8mm: Add system counter node Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` [PATCH 09/20] arm64: dts: imx8mq: " Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` [PATCH 10/20] clocksource/drivers/renesas-ostm: Use DIV_ROUND_CLOSEST() helper Daniel Lezcano 2019-08-26 20:43 ` Daniel Lezcano 2019-08-26 20:43 ` [PATCH 11/20] clocksource/drivers/npcm: Fix GENMASK and timer operation Daniel Lezcano 2019-08-26 20:43 ` [PATCH 12/20] clocksource/drivers/timer-of: Do not warn on deferred probe Daniel Lezcano 2019-08-26 20:44 ` [PATCH 13/20] clocksource/drivers: Do not warn on probe defer Daniel Lezcano 2019-08-26 20:44 ` [PATCH 14/20] dt-bindings: timer: renesas, cmt: Add CMT0234 to sh73a0 and r8a7740 Daniel Lezcano 2019-08-26 20:44 ` Daniel Lezcano 2019-08-26 20:44 ` [PATCH 15/20] dt-bindings: timer: renesas, cmt: Update CMT1 on " Daniel Lezcano 2019-08-26 20:44 ` Daniel Lezcano 2019-08-26 20:44 ` [PATCH 16/20] dt-bindings: timer: renesas, cmt: Add CMT0 and CMT1 to r8a7792 Daniel Lezcano 2019-08-26 20:44 ` Daniel Lezcano 2019-08-26 20:44 ` [PATCH 17/20] dt-bindings: timer: renesas, cmt: Add CMT0 and CMT1 to r8a77995 Daniel Lezcano 2019-08-26 20:44 ` Daniel Lezcano 2019-08-26 20:44 ` [PATCH 18/20] dt-bindings: timer: renesas, cmt: Update R-Car Gen3 CMT1 usage Daniel Lezcano 2019-08-26 20:44 ` Daniel Lezcano 2019-08-26 20:44 ` [PATCH 19/20] clocksource/drivers/sh_cmt: r8a7740 and sh73a0 SoC-specific match Daniel Lezcano 2019-08-26 20:44 ` [PATCH 20/20] clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated Daniel Lezcano 2019-08-26 20:59 ` [GIT PULL] timers drivers v5.5 Thomas Gleixner 2019-08-26 22:31 ` Daniel Lezcano 2019-08-26 22:38 ` [GIT PULL] timers drivers v5.4 Daniel Lezcano
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=20190826204407.17759-6-daniel.lezcano@linaro.org \ --to=daniel.lezcano@linaro.org \ --cc=alexandre.belloni@bootlin.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=ludovic.desroches@microchip.com \ --cc=nicolas.ferre@microchip.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.