LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>,
	Boris Brezillon <boris.brezillon@free-electrons.com>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Lee Jones <lee.jones@linaro.org>,
	Wim Van Sebroeck <wim@iguana.be>,
	Guenter Roeck <linux@roeck-us.net>,
	Sebastian Reichel <sre@kernel.org>,
	Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-watchdog@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH v4 8/9] clocksource: atmel-st: use syscon/regmap
Date: Mon, 09 Mar 2015 12:13:54 +0100	[thread overview]
Message-ID: <54FD8072.5010803@linaro.org> (raw)
In-Reply-To: <20150306084727.GH3989@piout.net>

On 03/06/2015 09:47 AM, Alexandre Belloni wrote:
> On 06/03/2015 at 09:43:02 +0100, Daniel Lezcano wrote :
>> On 03/05/2015 04:49 PM, Alexandre Belloni wrote:
>>> The register range from the system timer is also used by the watchdog driver.
>>> Use a regmap to handle concurrent accesses.
>>>
>>> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>>> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
>>> ---
>>>   drivers/clocksource/timer-atmel-st.c | 99 ++++++++++++++----------------------
>>>   1 file changed, 37 insertions(+), 62 deletions(-)
>>>
>>> diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c
>>> index 7d062ab32674..c4a52e32675e 100644
>>> --- a/drivers/clocksource/timer-atmel-st.c
>>> +++ b/drivers/clocksource/timer-atmel-st.c
>>> @@ -24,19 +24,19 @@
>>>   #include <linux/irq.h>
>>>   #include <linux/clockchips.h>
>>>   #include <linux/export.h>
>>> -#include <linux/of.h>
>>> -#include <linux/of_address.h>
>>> +#include <linux/mfd/syscon.h>
>>> +#include <linux/mfd/syscon/atmel-st.h>
>>>   #include <linux/of_irq.h>
>>> +#include <linux/regmap.h>
>>>
>>>   #include <asm/mach/time.h>
>>>
>>> -#include <mach/at91_st.h>
>>> -#include <mach/hardware.h>
>>> -
>>>   static unsigned long last_crtr;
>>>   static u32 irqmask;
>>>   static struct clock_event_device clkevt;
>>> +static struct regmap *regmap_st;
>>>
>>> +#define AT91_SLOW_CLOCK		32768
>>>   #define RM9200_TIMER_LATCH	((AT91_SLOW_CLOCK + HZ/2) / HZ)
>>>
>>>   /*
>>> @@ -46,11 +46,11 @@ static struct clock_event_device clkevt;
>>>    */
>>>   static inline unsigned long read_CRTR(void)
>>>   {
>>> -	unsigned long x1, x2;
>>> +	unsigned int x1, x2;
>>>
>>> -	x1 = at91_st_read(AT91_ST_CRTR);
>>> +	regmap_read(regmap_st, AT91_ST_CRTR, &x1);
>>>   	do {
>>> -		x2 = at91_st_read(AT91_ST_CRTR);
>>> +		regmap_read(regmap_st, AT91_ST_CRTR, &x2);
>>>   		if (x1 == x2)
>>>   			break;
>>>   		x1 = x2;
>>> @@ -63,7 +63,10 @@ static inline unsigned long read_CRTR(void)
>>>    */
>>>   static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id)
>>>   {
>>> -	u32	sr = at91_st_read(AT91_ST_SR) & irqmask;
>>> +	u32 sr;
>>> +
>>> +	regmap_read(regmap_st, AT91_ST_SR, &sr);
>>> +	sr &= irqmask;
>>>
>>>   	/*
>>>   	 * irqs should be disabled here, but as the irq is shared they are only
>>> @@ -96,7 +99,7 @@ static struct irqaction at91rm9200_timer_irq = {
>>>   	.name		= "at91_tick",
>>>   	.flags		= IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
>>>   	.handler	= at91rm9200_timer_interrupt,
>>> -	.irq		= NR_IRQS_LEGACY + AT91_ID_SYS,
>>> +	.irq		= 0,
>>
>> Is this change related to regmap ?
>>
>
> It is related to the removing of hardware.h. I can do that in a separate
> patch if you prefer.

Yeah, because it is not obvious to see a connection between the removal 
of hardware.h and the syscon/regmap changes.

I would suggest you create a patch to replace setup_irq with 
register_irq so that will remove this structure and the irq 
initialization to zero.

>> By the way, perhaps take the opportunity to replace setup_irq by request_irq
>> (and check the return value) ?
>>
>
> I tried and it fails, I didn't investigate yet.

It shouldn't be a big deal, register_irq is more or less a wrapper to 
setup_irq.


-- 
  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog


  reply	other threads:[~2015-03-09 11:14 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-05 15:49 [PATCH v4 0/9] Atmel System Timer cleanups Alexandre Belloni
2015-03-05 15:49 ` [PATCH v4 1/9] ARM: at91/dt: declare atmel,at91rm9200-st as a syscon Alexandre Belloni
2015-03-05 15:49 ` [PATCH v4 2/9] mfd: syscon: Add atmel system timer registers definition Alexandre Belloni
2015-03-06 10:58   ` Lee Jones
2015-03-05 15:49 ` [PATCH v4 3/9] watchdog: at91rm9200: use the system timer syscon Alexandre Belloni
2015-03-09 15:33   ` [v4,3/9] " Guenter Roeck
2015-03-05 15:49 ` [PATCH v4 4/9] power: reset: Add AT91RM9200 reset driver Alexandre Belloni
2015-03-05 19:49   ` Paul Bolle
2015-03-05 20:34     ` Alexandre Belloni
2015-03-05 15:49 ` [PATCH v4 5/9] ARM: at91: at91rm9200: remove deprecated arm_pm_restart Alexandre Belloni
2015-03-05 15:49 ` [PATCH v4 6/9] ARM: at91: time: move the system timer driver to drivers/clocksource Alexandre Belloni
2015-03-05 19:41   ` Paul Bolle
2015-03-05 19:47     ` Alexandre Belloni
2015-03-06  8:36   ` Daniel Lezcano
2015-03-05 15:49 ` [PATCH v4 7/9] clocksource: atmel-st: properly initialize driver Alexandre Belloni
2015-03-06  8:38   ` Daniel Lezcano
2015-03-05 15:49 ` [PATCH v4 8/9] clocksource: atmel-st: use syscon/regmap Alexandre Belloni
2015-03-06  8:43   ` Daniel Lezcano
2015-03-06  8:47     ` Alexandre Belloni
2015-03-09 11:13       ` Daniel Lezcano [this message]
2015-03-05 15:49 ` [PATCH v4 9/9] ARM: at91: remove useless include Alexandre Belloni

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=54FD8072.5010803@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=boris.brezillon@free-electrons.com \
    --cc=dbaryshkov@gmail.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.com \
    --cc=sre@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=wim@iguana.be \
    --subject='Re: [PATCH v4 8/9] clocksource: atmel-st: use syscon/regmap' \
    /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

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).