From: nicolas.ferre@atmel•com (Nicolas Ferre)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM AT91: clocksource tcb_clksrc.c: make tc_mode interrupt safe
Date: Thu, 22 May 2014 18:33:40 +0200 [thread overview]
Message-ID: <537E26E4.9050602@atmel.com> (raw)
In-Reply-To: <20140522133241.GO3582@piout.net>
On 22/05/2014 15:32, Alexandre Belloni :
> On 08/05/2014 at 12:06:25 +0200, David Jander wrote :
>> tc_mode() can be called from interrupt context and thus must not call
>> clk_*prepare*() functions.
>>
>> Signed-off-by: David Jander <david@protonic•nl>
>
> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons•com>
Ok, indeed. We keep the clocks prepared for the system lifetime.
Acked-by: Nicolas Ferre <nicolas.ferre@atmel•com>
Daniel, can you please take this fix (do you want me to re-send it)?
Bye,
>> ---
>> drivers/clocksource/tcb_clksrc.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
>> index 00fdd11..a8d7ea1 100644
>> --- a/drivers/clocksource/tcb_clksrc.c
>> +++ b/drivers/clocksource/tcb_clksrc.c
>> @@ -100,7 +100,7 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d)
>> || tcd->clkevt.mode == CLOCK_EVT_MODE_ONESHOT) {
>> __raw_writel(0xff, regs + ATMEL_TC_REG(2, IDR));
>> __raw_writel(ATMEL_TC_CLKDIS, regs + ATMEL_TC_REG(2, CCR));
>> - clk_disable_unprepare(tcd->clk);
>> + clk_disable(tcd->clk);
>> }
>>
>> switch (m) {
>> @@ -109,7 +109,7 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d)
>> * of oneshot, we get lower overhead and improved accuracy.
>> */
>> case CLOCK_EVT_MODE_PERIODIC:
>> - clk_prepare_enable(tcd->clk);
>> + clk_enable(tcd->clk);
>>
>> /* slow clock, count up to RC, then irq and restart */
>> __raw_writel(timer_clock
>> @@ -126,7 +126,7 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d)
>> break;
>>
>> case CLOCK_EVT_MODE_ONESHOT:
>> - clk_prepare_enable(tcd->clk);
>> + clk_enable(tcd->clk);
>>
>> /* slow clock, count up to RC, then irq and stop */
>> __raw_writel(timer_clock | ATMEL_TC_CPCSTOP
>> @@ -194,7 +194,7 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
>> ret = clk_prepare_enable(t2_clk);
>> if (ret)
>> return ret;
>> - clk_disable_unprepare(t2_clk);
>> + clk_disable(t2_clk);
>>
>> clkevt.regs = tc->regs;
>> clkevt.clk = t2_clk;
>> --
>> 1.9.1
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Nicolas Ferre
next prev parent reply other threads:[~2014-05-22 16:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-08 10:06 [PATCH] ARM AT91: clocksource tcb_clksrc.c: make tc_mode interrupt safe David Jander
2014-05-22 13:32 ` Alexandre Belloni
2014-05-22 16:33 ` Nicolas Ferre [this message]
2014-05-22 16:56 ` 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=537E26E4.9050602@atmel.com \
--to=nicolas.ferre@atmel$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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