From: Maxime Ripard <maxime.ripard@free-electrons.com> To: John Stultz <john.stultz@linaro.org>, Thomas Gleixner <tglx@linutronix.de> Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Emilio Lopez <emilio@elopez.com.ar>, kevin@allwinnertech.com, sunny@allwinnertech.com, shuge@allwinnertech.com, linux-sunxi@googlegroups.com, Maxime Ripard <maxime.ripard@free-electrons.com> Subject: [PATCHv2 8/8] clocksource: sun4i: Fix bug when switching from periodic to oneshot modes Date: Fri, 28 Jun 2013 21:56:26 +0200 [thread overview] Message-ID: <1372449386-1334-9-git-send-email-maxime.ripard@free-electrons.com> (raw) In-Reply-To: <1372449386-1334-1-git-send-email-maxime.ripard@free-electrons.com> The interval was firing at was set up at probe time, and only changed in the set_next_event, and never changed back, which is not really what is expected. When enabling the periodic mode, now set an interval to tick every jiffy. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/clocksource/sun4i_timer.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c index a77fa29..a2a9088 100644 --- a/drivers/clocksource/sun4i_timer.c +++ b/drivers/clocksource/sun4i_timer.c @@ -39,6 +39,7 @@ #define TIMER_CNTVAL_REG(val) (0x10 * val + 0x18) static void __iomem *timer_base; +static u32 ticks_per_jiffy; static void sun4i_clkevt_time_stop(u8 timer) { @@ -61,7 +62,8 @@ static void sun4i_clkevt_time_start(u8 timer, bool periodic) else val |= TIMER_CTL_ONESHOT; - writel(val | TIMER_CTL_ENABLE, timer_base + TIMER_CTL_REG(timer)); + writel(val | TIMER_CTL_ENABLE | TIMER_CTL_AUTORELOAD, + timer_base + TIMER_CTL_REG(timer)); } static void sun4i_clkevt_mode(enum clock_event_mode mode, @@ -70,6 +72,7 @@ static void sun4i_clkevt_mode(enum clock_event_mode mode, switch (mode) { case CLOCK_EVT_MODE_PERIODIC: sun4i_clkevt_time_stop(0); + sun4i_clkevt_time_setup(0, ticks_per_jiffy); sun4i_clkevt_time_start(0, true); break; case CLOCK_EVT_MODE_ONESHOT: @@ -144,10 +147,10 @@ static void __init sun4i_timer_init(struct device_node *node) panic("Can't get timer clock"); clk_prepare_enable(clk); - writel(clk_get_rate(clk) / HZ, - timer_base + TIMER_INTVAL_REG(0)); - writel(TIMER_CTL_CLK_SRC(TIMER_CTL_CLK_SRC_OSC24M) | TIMER_CTL_AUTORELOAD, + ticks_per_jiffy = DIV_ROUND_UP(clk_get_rate(clk), HZ); + + writel(TIMER_CTL_CLK_SRC(TIMER_CTL_CLK_SRC_OSC24M), timer_base + TIMER_CTL_REG(0)); ret = setup_irq(irq, &sun4i_timer_irq); -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: maxime.ripard@free-electrons.com (Maxime Ripard) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv2 8/8] clocksource: sun4i: Fix bug when switching from periodic to oneshot modes Date: Fri, 28 Jun 2013 21:56:26 +0200 [thread overview] Message-ID: <1372449386-1334-9-git-send-email-maxime.ripard@free-electrons.com> (raw) In-Reply-To: <1372449386-1334-1-git-send-email-maxime.ripard@free-electrons.com> The interval was firing at was set up at probe time, and only changed in the set_next_event, and never changed back, which is not really what is expected. When enabling the periodic mode, now set an interval to tick every jiffy. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/clocksource/sun4i_timer.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c index a77fa29..a2a9088 100644 --- a/drivers/clocksource/sun4i_timer.c +++ b/drivers/clocksource/sun4i_timer.c @@ -39,6 +39,7 @@ #define TIMER_CNTVAL_REG(val) (0x10 * val + 0x18) static void __iomem *timer_base; +static u32 ticks_per_jiffy; static void sun4i_clkevt_time_stop(u8 timer) { @@ -61,7 +62,8 @@ static void sun4i_clkevt_time_start(u8 timer, bool periodic) else val |= TIMER_CTL_ONESHOT; - writel(val | TIMER_CTL_ENABLE, timer_base + TIMER_CTL_REG(timer)); + writel(val | TIMER_CTL_ENABLE | TIMER_CTL_AUTORELOAD, + timer_base + TIMER_CTL_REG(timer)); } static void sun4i_clkevt_mode(enum clock_event_mode mode, @@ -70,6 +72,7 @@ static void sun4i_clkevt_mode(enum clock_event_mode mode, switch (mode) { case CLOCK_EVT_MODE_PERIODIC: sun4i_clkevt_time_stop(0); + sun4i_clkevt_time_setup(0, ticks_per_jiffy); sun4i_clkevt_time_start(0, true); break; case CLOCK_EVT_MODE_ONESHOT: @@ -144,10 +147,10 @@ static void __init sun4i_timer_init(struct device_node *node) panic("Can't get timer clock"); clk_prepare_enable(clk); - writel(clk_get_rate(clk) / HZ, - timer_base + TIMER_INTVAL_REG(0)); - writel(TIMER_CTL_CLK_SRC(TIMER_CTL_CLK_SRC_OSC24M) | TIMER_CTL_AUTORELOAD, + ticks_per_jiffy = DIV_ROUND_UP(clk_get_rate(clk), HZ); + + writel(TIMER_CTL_CLK_SRC(TIMER_CTL_CLK_SRC_OSC24M), timer_base + TIMER_CTL_REG(0)); ret = setup_irq(irq, &sun4i_timer_irq); -- 1.8.3.1
next prev parent reply other threads:[~2013-06-28 19:58 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-06-28 19:56 [PATCHv2 0/8] clocksource: sunxi: Timer fixes and cleanup Maxime Ripard 2013-06-28 19:56 ` Maxime Ripard 2013-06-28 19:56 ` [PATCHv2 1/8] clocksource: sun4i: Use the BIT macros where possible Maxime Ripard 2013-06-28 19:56 ` Maxime Ripard 2013-06-28 19:56 ` [PATCHv2 2/8] clocksource: sun4i: Add clocksource and sched clock drivers Maxime Ripard 2013-06-28 19:56 ` Maxime Ripard 2013-06-28 19:56 ` [PATCHv2 3/8] clocksource: sun4i: Don't forget to enable the clock we use Maxime Ripard 2013-06-28 19:56 ` Maxime Ripard 2013-06-28 19:56 ` [PATCHv2 4/8] clocksource: sun4i: Fix the next event code Maxime Ripard 2013-06-28 19:56 ` Maxime Ripard 2013-06-28 20:13 ` Thomas Gleixner 2013-06-28 20:13 ` Thomas Gleixner 2013-06-28 20:35 ` Tomasz Figa 2013-06-28 20:35 ` Tomasz Figa 2013-06-28 21:20 ` Maxime Ripard 2013-06-28 21:20 ` Maxime Ripard 2013-06-28 21:08 ` Maxime Ripard 2013-06-28 21:08 ` Maxime Ripard 2013-06-28 21:27 ` Thomas Gleixner 2013-06-28 21:27 ` Thomas Gleixner 2013-06-29 6:48 ` Maxime Ripard 2013-06-29 6:48 ` Maxime Ripard 2013-07-01 8:15 ` Thomas Gleixner 2013-07-01 8:15 ` Thomas Gleixner 2013-06-28 19:56 ` [PATCHv2 5/8] clocksource: sun4i: Factor out some timer code Maxime Ripard 2013-06-28 19:56 ` Maxime Ripard 2013-06-28 19:56 ` [PATCHv2 6/8] clocksource: sun4i: Remove TIMER_SCAL variable Maxime Ripard 2013-06-28 19:56 ` Maxime Ripard 2013-06-28 19:56 ` [PATCHv2 7/8] clocksource: sun4i: Cleanup parent clock setup Maxime Ripard 2013-06-28 19:56 ` Maxime Ripard 2013-06-28 19:56 ` Maxime Ripard [this message] 2013-06-28 19:56 ` [PATCHv2 8/8] clocksource: sun4i: Fix bug when switching from periodic to oneshot modes Maxime Ripard
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=1372449386-1334-9-git-send-email-maxime.ripard@free-electrons.com \ --to=maxime.ripard@free-electrons.com \ --cc=emilio@elopez.com.ar \ --cc=john.stultz@linaro.org \ --cc=kevin@allwinnertech.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sunxi@googlegroups.com \ --cc=shuge@allwinnertech.com \ --cc=sunny@allwinnertech.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.