From: viresh.kumar@linaro.org (Viresh Kumar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/18] ARM/imx/epit: Migrate to new 'set-state' interface
Date: Mon, 6 Jul 2015 16:24:13 +0530 [thread overview]
Message-ID: <4c6c9bae16987a2f2b29af153d6db98f3cfa1b63.1436178990.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1436178990.git.viresh.kumar@linaro.org>
Migrate imx driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
Also drop 'clockevent_mode': It was caching the last state of the
clockevent device. The same behavior can be achieved by using
clockevents state helpers. These helpers are only required for oneshot
mode as shutdown/resume wouldn't be done twice by the core.
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
arch/arm/mach-imx/epit.c | 67 +++++++++++++++++++++++++-----------------------
1 file changed, 35 insertions(+), 32 deletions(-)
diff --git a/arch/arm/mach-imx/epit.c b/arch/arm/mach-imx/epit.c
index 074b1a81ba76..08ce20771bb3 100644
--- a/arch/arm/mach-imx/epit.c
+++ b/arch/arm/mach-imx/epit.c
@@ -57,7 +57,6 @@
#include "hardware.h"
static struct clock_event_device clockevent_epit;
-static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED;
static void __iomem *timer_base;
@@ -106,8 +105,8 @@ static int epit_set_next_event(unsigned long evt,
return 0;
}
-static void epit_set_mode(enum clock_event_mode mode,
- struct clock_event_device *evt)
+/* Left event sources disabled, no more interrupts appear */
+static int epit_shutdown(struct clock_event_device *evt)
{
unsigned long flags;
@@ -120,39 +119,41 @@ static void epit_set_mode(enum clock_event_mode mode,
/* Disable interrupt in GPT module */
epit_irq_disable();
- if (mode != clockevent_mode) {
- /* Set event time into far-far future */
-
- /* Clear pending interrupt */
- epit_irq_acknowledge();
- }
+ /* Clear pending interrupt */
+ epit_irq_acknowledge();
- /* Remember timer mode */
- clockevent_mode = mode;
local_irq_restore(flags);
- switch (mode) {
- case CLOCK_EVT_MODE_PERIODIC:
- printk(KERN_ERR "epit_set_mode: Periodic mode is not "
- "supported for i.MX EPIT\n");
- break;
- case CLOCK_EVT_MODE_ONESHOT:
+ return 0;
+}
+
+static int epit_set_oneshot(struct clock_event_device *evt)
+{
+ unsigned long flags;
+
+ /*
+ * The timer interrupt generation is disabled at least
+ * for enough time to call epit_set_next_event()
+ */
+ local_irq_save(flags);
+
+ /* Disable interrupt in GPT module */
+ epit_irq_disable();
+
+ /* Clear pending interrupt, only while switching mode */
+ if (!clockevent_state_oneshot(evt))
+ epit_irq_acknowledge();
+
/*
* Do not put overhead of interrupt enable/disable into
* epit_set_next_event(), the core has about 4 minutes
* to call epit_set_next_event() or shutdown clock after
* mode switching
*/
- local_irq_save(flags);
- epit_irq_enable();
- local_irq_restore(flags);
- break;
- case CLOCK_EVT_MODE_SHUTDOWN:
- case CLOCK_EVT_MODE_UNUSED:
- case CLOCK_EVT_MODE_RESUME:
- /* Left event sources disabled, no more interrupts appear */
- break;
- }
+ epit_irq_enable();
+ local_irq_restore(flags);
+
+ return 0;
}
/*
@@ -176,11 +177,13 @@ static struct irqaction epit_timer_irq = {
};
static struct clock_event_device clockevent_epit = {
- .name = "epit",
- .features = CLOCK_EVT_FEAT_ONESHOT,
- .set_mode = epit_set_mode,
- .set_next_event = epit_set_next_event,
- .rating = 200,
+ .name = "epit",
+ .features = CLOCK_EVT_FEAT_ONESHOT,
+ .set_state_shutdown = epit_shutdown,
+ .tick_resume = epit_shutdown,
+ .set_state_oneshot = epit_set_oneshot,
+ .set_next_event = epit_set_next_event,
+ .rating = 200,
};
static int __init epit_clockevent_init(struct clk *timer_clk)
--
2.4.0
next prev parent reply other threads:[~2015-07-06 10:54 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-06 10:54 [PATCH 00/18] ARM: Migrate clockevent drivers to 'set-state' Viresh Kumar
2015-07-06 10:54 ` [PATCH 01/18] ARM/smp_twd: Migrate to new 'set-state' interface Viresh Kumar
2015-07-06 10:54 ` [PATCH 02/18] ARM/cns3xxx/timer: " Viresh Kumar
2015-07-14 6:03 ` Krzysztof Hałasa
2015-07-06 10:54 ` [PATCH 03/18] ARM/davinci/time: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 04/18] ARM/dc21285-timer: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 05/18] ARM/gemini/time: " Viresh Kumar
2015-07-06 19:36 ` Hans Ulli Kroll
2015-07-06 10:54 ` Viresh Kumar [this message]
2015-07-06 10:54 ` [PATCH 07/18] ARM/ixp4xx/timer: " Viresh Kumar
2015-07-14 6:04 ` Krzysztof Hałasa
2015-07-06 10:54 ` [PATCH 08/18] ARM/ks8695/time: " Viresh Kumar
2015-07-07 12:22 ` Greg Ungerer
2015-07-06 10:54 ` [PATCH 09/18] ARM/lpc32xx/timer: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 10/18] ARM/mmp/time: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 11/18] ARM/netx/time: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 12/18] ARM/omap1/time: " Viresh Kumar
2015-07-06 15:20 ` santosh shilimkar
2015-07-09 9:48 ` Tony Lindgren
2015-07-06 10:54 ` [PATCH 13/18] ARM/omap1/timer32: " Viresh Kumar
2015-07-06 15:21 ` santosh shilimkar
2015-07-09 9:49 ` Tony Lindgren
2015-07-06 10:54 ` [PATCH 14/18] ARM/omap2/timer: " Viresh Kumar
2015-07-06 15:20 ` santosh shilimkar
2015-07-09 9:50 ` Tony Lindgren
2015-07-06 10:54 ` [PATCH 15/18] ARM/SPEAr/time: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 16/18] ARM/w90x900/time: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 17/18] ARM/iop/time: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 18/18] ARM/orion/time: " Viresh Kumar
2015-07-06 17:26 ` [PATCH 00/18] ARM: Migrate clockevent drivers to 'set-state' Thomas Gleixner
2015-07-07 8:11 ` [PULL] clockevents: last minute patch for 4.2-rc2 Daniel Lezcano
2015-07-07 8:14 ` [PATCH] clockevents: Allow set-state callbacks to be optional Daniel Lezcano
2015-07-07 8:49 ` [tip:timers/urgent] " tip-bot for Viresh Kumar
2015-07-13 2:52 ` [PATCH 00/18] ARM: Migrate clockevent drivers to 'set-state' Viresh Kumar
-- strict thread matches above, loose matches on Subject: below --
2015-07-17 5:10 [PULL] ARM: clockevents: Migrate to 'set-state' callbacks Viresh Kumar
2015-07-17 5:11 ` [PATCH 06/18] ARM/imx/epit: Migrate to new 'set-state' interface Viresh Kumar
2015-07-17 5:11 ` Viresh Kumar
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=4c6c9bae16987a2f2b29af153d6db98f3cfa1b63.1436178990.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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 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.