[v8,4/6] clocksource: stm32: only use 32 bits timers

Message ID 1510649563-22975-5-git-send-email-benjamin.gaignard@linaro.org
State New
Headers show
Series
  • stm32 clocksource driver rework
Related show

Commit Message

Benjamin Gaignard Nov. 14, 2017, 8:52 a.m.
The clock driving counters is at 90MHz so the maximum period
for 16 bis counters is around 750 ms which is a short period
for a clocksource. For 32 bits counters this period is close
47 secondes which is more acceptable.

This patch remove 16 bits counters support and makes sure that
they won't be probed anymore.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

---
 drivers/clocksource/timer-stm32.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Daniel Lezcano Dec. 7, 2017, 3:27 p.m. | #1
On 14/11/2017 09:52, Benjamin Gaignard wrote:
> The clock driving counters is at 90MHz so the maximum period

> for 16 bis counters is around 750 ms which is a short period

> for a clocksource.


Isn't it 728us ?

> For 32 bits counters this period is close

> 47 secondes which is more acceptable.

> 

> This patch remove 16 bits counters support and makes sure that

> they won't be probed anymore.

> 

> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

> ---

>  drivers/clocksource/timer-stm32.c | 26 ++++++++++++--------------

>  1 file changed, 12 insertions(+), 14 deletions(-)

> 

> diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c

> index ae41a19..8173bcf 100644

> --- a/drivers/clocksource/timer-stm32.c

> +++ b/drivers/clocksource/timer-stm32.c

> @@ -83,9 +83,9 @@ static irqreturn_t stm32_clock_event_handler(int irq, void *dev_id)

>  static int __init stm32_clockevent_init(struct device_node *node)

>  {

>  	struct reset_control *rstc;

> -	unsigned long max_delta;

> -	int ret, bits, prescaler = 1;

> +	unsigned long max_arr;

>  	struct timer_of *to;

> +	int ret;

>  

>  	to = kzalloc(sizeof(*to), GFP_KERNEL);

>  	if (!to)

> @@ -115,29 +115,27 @@ static int __init stm32_clockevent_init(struct device_node *node)

>  

>  	/* Detect whether the timer is 16 or 32 bits */

>  	writel_relaxed(~0U, timer_of_base(to) + TIM_ARR);

> -	max_delta = readl_relaxed(timer_of_base(to) + TIM_ARR);

> -	if (max_delta == ~0U) {

> -		prescaler = 1;

> -		bits = 32;

> -	} else {

> -		prescaler = 1024;

> -		bits = 16;

> +	max_arr = readl_relaxed(timer_of_base(to) + TIM_ARR);

> +	if (max_arr != ~0U) {

> +		pr_err("32 bits timer is needed\n");

> +		ret = -EINVAL;

> +		goto deinit;

>  	}

> +

>  	writel_relaxed(0, timer_of_base(to) + TIM_ARR);

>  

> -	writel_relaxed(prescaler - 1, timer_of_base(to) + TIM_PSC);

> +	writel_relaxed(0, timer_of_base(to) + TIM_PSC);

>  	writel_relaxed(TIM_EGR_UG, timer_of_base(to) + TIM_EGR);

>  	writel_relaxed(TIM_DIER_UIE, timer_of_base(to) + TIM_DIER);

>  	writel_relaxed(0, timer_of_base(to) + TIM_SR);

>  

>  	clockevents_config_and_register(&to->clkevt,

> -					timer_of_period(to), MIN_DELTA, max_delta);

> -

> -	pr_info("%pOF: STM32 clockevent driver initialized (%d bits)\n",

> -			node, bits);

> +					timer_of_period(to), MIN_DELTA, ~0U);

>  

>  	return 0;

>  

> +deinit:

> +	timer_of_exit(to);

>  err:

>  	kfree(to);

>  	return ret;

> 



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

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Daniel Lezcano Dec. 8, 2017, 7:52 a.m. | #2
On 07/12/2017 21:36, Benjamin Gaignard wrote:
> 2017-12-07 17:49 GMT+01:00 Daniel Lezcano <daniel.lezcano@linaro.org>:

>> On 07/12/2017 17:33, Benjamin Gaignard wrote:

>>> 2017-12-07 16:27 GMT+01:00 Daniel Lezcano <daniel.lezcano@linaro.org>:

>>>> On 14/11/2017 09:52, Benjamin Gaignard wrote:

>>>>> The clock driving counters is at 90MHz so the maximum period

>>>>> for 16 bis counters is around 750 ms which is a short period

>>>>> for a clocksource.

>>>>

>>>> Isn't it 728us ?

>>>

>>> yes it is: 2^16 / 90.000.000 => 728us

>>

>> Ok, now I can do the connection with the previous patch.

>>

>> So, the real issue of all this is the 16bits clocksource is wrapping up

>> every 728us, hence the clockevent periodically expires every ~728us to

>> keep the timekeeping consistent. Unfortunately, the kernel has a too

>> high overhead for this as the system is consistently processing this

>> timer leading to a CPU time resource starvation.

>>

>> Is that correct ?

> 

> Yes that is correct


Oh man. That was unclear since the beginning, we are not talking about
inaccurate clocksource or whatever but just these 16bits timers can't
work on Linux.


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

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Daniel Lezcano Dec. 8, 2017, 8:34 a.m. | #3
On 14/11/2017 09:52, Benjamin Gaignard wrote:
> The clock driving counters is at 90MHz so the maximum period

> for 16 bis counters is around 750 ms


728 us

> which is a short period for a clocksource.


Which clocksource are you talking about ?

> For 32 bits counters this period is close

> 47 secondes which is more acceptable.

> 

> This patch remove 16 bits counters support and makes sure that

> they won't be probed anymore.


Are we talking about clockevent or clocksource?

Is this issue present today ? Or is it if we add the clocksource support
? We are talking about clocksource but we change the clockevent code.

All this is very confusing.

I have a rough idea of what is happening, but it is not up to me to
decode and infer from the changes, you need to describe *clearly* the
situation.

 - What happens if we use a 16bits timer as a clockevent ?
 - What happens if we use a 16bits timer as a clocksource ?
 - Why is it preferable to remove the support of the 16bits timers
instead of downgrading them with the rating ?

> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>


> ---

>  drivers/clocksource/timer-stm32.c | 26 ++++++++++++--------------

>  1 file changed, 12 insertions(+), 14 deletions(-)

> 

> diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c

> index ae41a19..8173bcf 100644

> --- a/drivers/clocksource/timer-stm32.c

> +++ b/drivers/clocksource/timer-stm32.c

> @@ -83,9 +83,9 @@ static irqreturn_t stm32_clock_event_handler(int irq, void *dev_id)

>  static int __init stm32_clockevent_init(struct device_node *node)

>  {

>  	struct reset_control *rstc;

> -	unsigned long max_delta;

> -	int ret, bits, prescaler = 1;

> +	unsigned long max_arr;

>  	struct timer_of *to;

> +	int ret;

>  

>  	to = kzalloc(sizeof(*to), GFP_KERNEL);

>  	if (!to)

> @@ -115,29 +115,27 @@ static int __init stm32_clockevent_init(struct device_node *node)

>  

>  	/* Detect whether the timer is 16 or 32 bits */

>  	writel_relaxed(~0U, timer_of_base(to) + TIM_ARR);

> -	max_delta = readl_relaxed(timer_of_base(to) + TIM_ARR);

> -	if (max_delta == ~0U) {

> -		prescaler = 1;

> -		bits = 32;

> -	} else {

> -		prescaler = 1024;

> -		bits = 16;

> +	max_arr = readl_relaxed(timer_of_base(to) + TIM_ARR);

> +	if (max_arr != ~0U) {

> +		pr_err("32 bits timer is needed\n");

> +		ret = -EINVAL;

> +		goto deinit;

>  	}


Wrap this in a function:

static bool stm32_timer_is_32bits(struct timer_of *to)
{
	return readl_relaxed(timer_of_base(to) + TIM_ARR) == ~0UL;
}

Then clearly inform the user.

if (!stm32_timer_is_32bits(to)) {
	pr_warn("Timer %pOF is a 16 bits timer\n", node);
	/* abort the registration or downgrade the timer's rating */
}

> +

>  	writel_relaxed(0, timer_of_base(to) + TIM_ARR);

>  

> -	writel_relaxed(prescaler - 1, timer_of_base(to) + TIM_PSC);

> +	writel_relaxed(0, timer_of_base(to) + TIM_PSC);

>  	writel_relaxed(TIM_EGR_UG, timer_of_base(to) + TIM_EGR);

>  	writel_relaxed(TIM_DIER_UIE, timer_of_base(to) + TIM_DIER);

>  	writel_relaxed(0, timer_of_base(to) + TIM_SR);

>  

>  	clockevents_config_and_register(&to->clkevt,

> -					timer_of_period(to), MIN_DELTA, max_delta);

> -

> -	pr_info("%pOF: STM32 clockevent driver initialized (%d bits)\n",

> -			node, bits);

> +					timer_of_period(to), MIN_DELTA, ~0U);

>  

>  	return 0;

>  

> +deinit:

> +	timer_of_exit(to);


Fix this please (timer_of_cleanup).

In the future, make sure the patches are git-bisect safe.



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

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Benjamin Gaignard Dec. 8, 2017, 9:25 a.m. | #4
2017-12-08 9:34 GMT+01:00 Daniel Lezcano <daniel.lezcano@linaro.org>:
> On 14/11/2017 09:52, Benjamin Gaignard wrote:

>> The clock driving counters is at 90MHz so the maximum period

>> for 16 bis counters is around 750 ms

>

> 728 us

>

>> which is a short period for a clocksource.

>

> Which clocksource are you talking about ?

>

>> For 32 bits counters this period is close

>> 47 secondes which is more acceptable.

>>

>> This patch remove 16 bits counters support and makes sure that

>> they won't be probed anymore.

>

> Are we talking about clockevent or clocksource?

>

> Is this issue present today ? Or is it if we add the clocksource support

> ? We are talking about clocksource but we change the clockevent code.

>

> All this is very confusing.

>

> I have a rough idea of what is happening, but it is not up to me to

> decode and infer from the changes, you need to describe *clearly* the

> situation.

>

>  - What happens if we use a 16bits timer as a clockevent ?

>  - What happens if we use a 16bits timer as a clocksource ?

>  - Why is it preferable to remove the support of the 16bits timers

> instead of downgrading them with the rating ?


Up to this patch it is only about clockevent, clocksource code is
introduced in patch 5.
For the both cases 16bits counter have a a too short period (728us)
and can't be used
so downgrading the rating is not a solution.

I will change the wording in v9

>

>> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

>

>> ---

>>  drivers/clocksource/timer-stm32.c | 26 ++++++++++++--------------

>>  1 file changed, 12 insertions(+), 14 deletions(-)

>>

>> diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c

>> index ae41a19..8173bcf 100644

>> --- a/drivers/clocksource/timer-stm32.c

>> +++ b/drivers/clocksource/timer-stm32.c

>> @@ -83,9 +83,9 @@ static irqreturn_t stm32_clock_event_handler(int irq, void *dev_id)

>>  static int __init stm32_clockevent_init(struct device_node *node)

>>  {

>>       struct reset_control *rstc;

>> -     unsigned long max_delta;

>> -     int ret, bits, prescaler = 1;

>> +     unsigned long max_arr;

>>       struct timer_of *to;

>> +     int ret;

>>

>>       to = kzalloc(sizeof(*to), GFP_KERNEL);

>>       if (!to)

>> @@ -115,29 +115,27 @@ static int __init stm32_clockevent_init(struct device_node *node)

>>

>>       /* Detect whether the timer is 16 or 32 bits */

>>       writel_relaxed(~0U, timer_of_base(to) + TIM_ARR);

>> -     max_delta = readl_relaxed(timer_of_base(to) + TIM_ARR);

>> -     if (max_delta == ~0U) {

>> -             prescaler = 1;

>> -             bits = 32;

>> -     } else {

>> -             prescaler = 1024;

>> -             bits = 16;

>> +     max_arr = readl_relaxed(timer_of_base(to) + TIM_ARR);

>> +     if (max_arr != ~0U) {

>> +             pr_err("32 bits timer is needed\n");

>> +             ret = -EINVAL;

>> +             goto deinit;

>>       }

>

> Wrap this in a function:

>

> static bool stm32_timer_is_32bits(struct timer_of *to)

> {

>         return readl_relaxed(timer_of_base(to) + TIM_ARR) == ~0UL;

> }

>

> Then clearly inform the user.

>

> if (!stm32_timer_is_32bits(to)) {

>         pr_warn("Timer %pOF is a 16 bits timer\n", node);

>         /* abort the registration or downgrade the timer's rating */

> }


Ok I will change that in v9

>

>> +

>>       writel_relaxed(0, timer_of_base(to) + TIM_ARR);

>>

>> -     writel_relaxed(prescaler - 1, timer_of_base(to) + TIM_PSC);

>> +     writel_relaxed(0, timer_of_base(to) + TIM_PSC);

>>       writel_relaxed(TIM_EGR_UG, timer_of_base(to) + TIM_EGR);

>>       writel_relaxed(TIM_DIER_UIE, timer_of_base(to) + TIM_DIER);

>>       writel_relaxed(0, timer_of_base(to) + TIM_SR);

>>

>>       clockevents_config_and_register(&to->clkevt,

>> -                                     timer_of_period(to), MIN_DELTA, max_delta);

>> -

>> -     pr_info("%pOF: STM32 clockevent driver initialized (%d bits)\n",

>> -                     node, bits);

>> +                                     timer_of_period(to), MIN_DELTA, ~0U);

>>

>>       return 0;

>>

>> +deinit:

>> +     timer_of_exit(to);

>

> Fix this please (timer_of_cleanup).

>

> In the future, make sure the patches are git-bisect safe.

>

>

>

> --

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

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Daniel Lezcano Dec. 8, 2017, 9:29 a.m. | #5
On 08/12/2017 10:25, Benjamin Gaignard wrote:
> 2017-12-08 9:34 GMT+01:00 Daniel Lezcano <daniel.lezcano@linaro.org>:

>> On 14/11/2017 09:52, Benjamin Gaignard wrote:

>>> The clock driving counters is at 90MHz so the maximum period

>>> for 16 bis counters is around 750 ms

>>

>> 728 us

>>

>>> which is a short period for a clocksource.

>>

>> Which clocksource are you talking about ?

>>

>>> For 32 bits counters this period is close

>>> 47 secondes which is more acceptable.

>>>

>>> This patch remove 16 bits counters support and makes sure that

>>> they won't be probed anymore.

>>

>> Are we talking about clockevent or clocksource?

>>

>> Is this issue present today ? Or is it if we add the clocksource support

>> ? We are talking about clocksource but we change the clockevent code.

>>

>> All this is very confusing.

>>

>> I have a rough idea of what is happening, but it is not up to me to

>> decode and infer from the changes, you need to describe *clearly* the

>> situation.

>>

>>  - What happens if we use a 16bits timer as a clockevent ?

>>  - What happens if we use a 16bits timer as a clocksource ?

>>  - Why is it preferable to remove the support of the 16bits timers

>> instead of downgrading them with the rating ?

> 

> Up to this patch it is only about clockevent, clocksource code is

> introduced in patch 5.

> For the both cases 16bits counter have a a too short period (728us)

> and can't be used

> so downgrading the rating is not a solution.


You have to explain why it is a too short period. I will be happy to see
an example of the issues the user is facing.



> I will change the wording in v9

> 

>>

>>> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

>>

>>> ---

>>>  drivers/clocksource/timer-stm32.c | 26 ++++++++++++--------------

>>>  1 file changed, 12 insertions(+), 14 deletions(-)

>>>

>>> diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c

>>> index ae41a19..8173bcf 100644

>>> --- a/drivers/clocksource/timer-stm32.c

>>> +++ b/drivers/clocksource/timer-stm32.c

>>> @@ -83,9 +83,9 @@ static irqreturn_t stm32_clock_event_handler(int irq, void *dev_id)

>>>  static int __init stm32_clockevent_init(struct device_node *node)

>>>  {

>>>       struct reset_control *rstc;

>>> -     unsigned long max_delta;

>>> -     int ret, bits, prescaler = 1;

>>> +     unsigned long max_arr;

>>>       struct timer_of *to;

>>> +     int ret;

>>>

>>>       to = kzalloc(sizeof(*to), GFP_KERNEL);

>>>       if (!to)

>>> @@ -115,29 +115,27 @@ static int __init stm32_clockevent_init(struct device_node *node)

>>>

>>>       /* Detect whether the timer is 16 or 32 bits */

>>>       writel_relaxed(~0U, timer_of_base(to) + TIM_ARR);

>>> -     max_delta = readl_relaxed(timer_of_base(to) + TIM_ARR);

>>> -     if (max_delta == ~0U) {

>>> -             prescaler = 1;

>>> -             bits = 32;

>>> -     } else {

>>> -             prescaler = 1024;

>>> -             bits = 16;

>>> +     max_arr = readl_relaxed(timer_of_base(to) + TIM_ARR);

>>> +     if (max_arr != ~0U) {

>>> +             pr_err("32 bits timer is needed\n");

>>> +             ret = -EINVAL;

>>> +             goto deinit;

>>>       }

>>

>> Wrap this in a function:

>>

>> static bool stm32_timer_is_32bits(struct timer_of *to)

>> {

>>         return readl_relaxed(timer_of_base(to) + TIM_ARR) == ~0UL;

>> }

>>

>> Then clearly inform the user.

>>

>> if (!stm32_timer_is_32bits(to)) {

>>         pr_warn("Timer %pOF is a 16 bits timer\n", node);

>>         /* abort the registration or downgrade the timer's rating */

>> }

> 

> Ok I will change that in v9

> 

>>

>>> +

>>>       writel_relaxed(0, timer_of_base(to) + TIM_ARR);

>>>

>>> -     writel_relaxed(prescaler - 1, timer_of_base(to) + TIM_PSC);

>>> +     writel_relaxed(0, timer_of_base(to) + TIM_PSC);

>>>       writel_relaxed(TIM_EGR_UG, timer_of_base(to) + TIM_EGR);

>>>       writel_relaxed(TIM_DIER_UIE, timer_of_base(to) + TIM_DIER);

>>>       writel_relaxed(0, timer_of_base(to) + TIM_SR);

>>>

>>>       clockevents_config_and_register(&to->clkevt,

>>> -                                     timer_of_period(to), MIN_DELTA, max_delta);

>>> -

>>> -     pr_info("%pOF: STM32 clockevent driver initialized (%d bits)\n",

>>> -                     node, bits);

>>> +                                     timer_of_period(to), MIN_DELTA, ~0U);

>>>

>>>       return 0;

>>>

>>> +deinit:

>>> +     timer_of_exit(to);

>>

>> Fix this please (timer_of_cleanup).

>>

>> In the future, make sure the patches are git-bisect safe.

>>

>>

>>

>> --

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



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

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Benjamin Gaignard Dec. 8, 2017, 9:31 a.m. | #6
2017-12-08 10:29 GMT+01:00 Daniel Lezcano <daniel.lezcano@linaro.org>:
> On 08/12/2017 10:25, Benjamin Gaignard wrote:

>> 2017-12-08 9:34 GMT+01:00 Daniel Lezcano <daniel.lezcano@linaro.org>:

>>> On 14/11/2017 09:52, Benjamin Gaignard wrote:

>>>> The clock driving counters is at 90MHz so the maximum period

>>>> for 16 bis counters is around 750 ms

>>>

>>> 728 us

>>>

>>>> which is a short period for a clocksource.

>>>

>>> Which clocksource are you talking about ?

>>>

>>>> For 32 bits counters this period is close

>>>> 47 secondes which is more acceptable.

>>>>

>>>> This patch remove 16 bits counters support and makes sure that

>>>> they won't be probed anymore.

>>>

>>> Are we talking about clockevent or clocksource?

>>>

>>> Is this issue present today ? Or is it if we add the clocksource support

>>> ? We are talking about clocksource but we change the clockevent code.

>>>

>>> All this is very confusing.

>>>

>>> I have a rough idea of what is happening, but it is not up to me to

>>> decode and infer from the changes, you need to describe *clearly* the

>>> situation.

>>>

>>>  - What happens if we use a 16bits timer as a clockevent ?

>>>  - What happens if we use a 16bits timer as a clocksource ?

>>>  - Why is it preferable to remove the support of the 16bits timers

>>> instead of downgrading them with the rating ?

>>

>> Up to this patch it is only about clockevent, clocksource code is

>> introduced in patch 5.

>> For the both cases 16bits counter have a a too short period (728us)

>> and can't be used

>> so downgrading the rating is not a solution.

>

> You have to explain why it is a too short period. I will be happy to see

> an example of the issues the user is facing.


This a very basic issue, the kernel doesn't boot at all...

>

>

>

>> I will change the wording in v9

>>

>>>

>>>> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

>>>

>>>> ---

>>>>  drivers/clocksource/timer-stm32.c | 26 ++++++++++++--------------

>>>>  1 file changed, 12 insertions(+), 14 deletions(-)

>>>>

>>>> diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c

>>>> index ae41a19..8173bcf 100644

>>>> --- a/drivers/clocksource/timer-stm32.c

>>>> +++ b/drivers/clocksource/timer-stm32.c

>>>> @@ -83,9 +83,9 @@ static irqreturn_t stm32_clock_event_handler(int irq, void *dev_id)

>>>>  static int __init stm32_clockevent_init(struct device_node *node)

>>>>  {

>>>>       struct reset_control *rstc;

>>>> -     unsigned long max_delta;

>>>> -     int ret, bits, prescaler = 1;

>>>> +     unsigned long max_arr;

>>>>       struct timer_of *to;

>>>> +     int ret;

>>>>

>>>>       to = kzalloc(sizeof(*to), GFP_KERNEL);

>>>>       if (!to)

>>>> @@ -115,29 +115,27 @@ static int __init stm32_clockevent_init(struct device_node *node)

>>>>

>>>>       /* Detect whether the timer is 16 or 32 bits */

>>>>       writel_relaxed(~0U, timer_of_base(to) + TIM_ARR);

>>>> -     max_delta = readl_relaxed(timer_of_base(to) + TIM_ARR);

>>>> -     if (max_delta == ~0U) {

>>>> -             prescaler = 1;

>>>> -             bits = 32;

>>>> -     } else {

>>>> -             prescaler = 1024;

>>>> -             bits = 16;

>>>> +     max_arr = readl_relaxed(timer_of_base(to) + TIM_ARR);

>>>> +     if (max_arr != ~0U) {

>>>> +             pr_err("32 bits timer is needed\n");

>>>> +             ret = -EINVAL;

>>>> +             goto deinit;

>>>>       }

>>>

>>> Wrap this in a function:

>>>

>>> static bool stm32_timer_is_32bits(struct timer_of *to)

>>> {

>>>         return readl_relaxed(timer_of_base(to) + TIM_ARR) == ~0UL;

>>> }

>>>

>>> Then clearly inform the user.

>>>

>>> if (!stm32_timer_is_32bits(to)) {

>>>         pr_warn("Timer %pOF is a 16 bits timer\n", node);

>>>         /* abort the registration or downgrade the timer's rating */

>>> }

>>

>> Ok I will change that in v9

>>

>>>

>>>> +

>>>>       writel_relaxed(0, timer_of_base(to) + TIM_ARR);

>>>>

>>>> -     writel_relaxed(prescaler - 1, timer_of_base(to) + TIM_PSC);

>>>> +     writel_relaxed(0, timer_of_base(to) + TIM_PSC);

>>>>       writel_relaxed(TIM_EGR_UG, timer_of_base(to) + TIM_EGR);

>>>>       writel_relaxed(TIM_DIER_UIE, timer_of_base(to) + TIM_DIER);

>>>>       writel_relaxed(0, timer_of_base(to) + TIM_SR);

>>>>

>>>>       clockevents_config_and_register(&to->clkevt,

>>>> -                                     timer_of_period(to), MIN_DELTA, max_delta);

>>>> -

>>>> -     pr_info("%pOF: STM32 clockevent driver initialized (%d bits)\n",

>>>> -                     node, bits);

>>>> +                                     timer_of_period(to), MIN_DELTA, ~0U);

>>>>

>>>>       return 0;

>>>>

>>>> +deinit:

>>>> +     timer_of_exit(to);

>>>

>>> Fix this please (timer_of_cleanup).

>>>

>>> In the future, make sure the patches are git-bisect safe.

>>>

>>>

>>>

>>> --

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

>

>

> --

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

>




-- 
Benjamin Gaignard

Graphic Study Group

Linaro.org │ Open source software for ARM SoCs

Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c
index ae41a19..8173bcf 100644
--- a/drivers/clocksource/timer-stm32.c
+++ b/drivers/clocksource/timer-stm32.c
@@ -83,9 +83,9 @@  static irqreturn_t stm32_clock_event_handler(int irq, void *dev_id)
 static int __init stm32_clockevent_init(struct device_node *node)
 {
 	struct reset_control *rstc;
-	unsigned long max_delta;
-	int ret, bits, prescaler = 1;
+	unsigned long max_arr;
 	struct timer_of *to;
+	int ret;
 
 	to = kzalloc(sizeof(*to), GFP_KERNEL);
 	if (!to)
@@ -115,29 +115,27 @@  static int __init stm32_clockevent_init(struct device_node *node)
 
 	/* Detect whether the timer is 16 or 32 bits */
 	writel_relaxed(~0U, timer_of_base(to) + TIM_ARR);
-	max_delta = readl_relaxed(timer_of_base(to) + TIM_ARR);
-	if (max_delta == ~0U) {
-		prescaler = 1;
-		bits = 32;
-	} else {
-		prescaler = 1024;
-		bits = 16;
+	max_arr = readl_relaxed(timer_of_base(to) + TIM_ARR);
+	if (max_arr != ~0U) {
+		pr_err("32 bits timer is needed\n");
+		ret = -EINVAL;
+		goto deinit;
 	}
+
 	writel_relaxed(0, timer_of_base(to) + TIM_ARR);
 
-	writel_relaxed(prescaler - 1, timer_of_base(to) + TIM_PSC);
+	writel_relaxed(0, timer_of_base(to) + TIM_PSC);
 	writel_relaxed(TIM_EGR_UG, timer_of_base(to) + TIM_EGR);
 	writel_relaxed(TIM_DIER_UIE, timer_of_base(to) + TIM_DIER);
 	writel_relaxed(0, timer_of_base(to) + TIM_SR);
 
 	clockevents_config_and_register(&to->clkevt,
-					timer_of_period(to), MIN_DELTA, max_delta);
-
-	pr_info("%pOF: STM32 clockevent driver initialized (%d bits)\n",
-			node, bits);
+					timer_of_period(to), MIN_DELTA, ~0U);
 
 	return 0;
 
+deinit:
+	timer_of_exit(to);
 err:
 	kfree(to);
 	return ret;