Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

[PATCH] clocksource: timer-sun5i: Switch to sched_clock_register()

3 views
Skip to first unread message

Stephen Boyd

unread,
Jan 16, 2014, 8:40:03 PM1/16/14
to
The 32 bit sched_clock interface supports 64 bits since 3.13-rc1.
Upgrade to the 64 bit function to allow us to remove the 32 bit
registration interface.

Cc: Maxime Ripard <maxime...@free-electrons.com>
Signed-off-by: Stephen Boyd <sb...@codeaurora.org>
---

Cc'in Ingo because this is simple enough to probably just apply to timers/core

drivers/clocksource/timer-sun5i.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
index bddc52233d2a..deebcd6469fc 100644
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
@@ -136,7 +136,7 @@ static struct irqaction sun5i_timer_irq = {
.dev_id = &sun5i_clockevent,
};

-static u32 sun5i_timer_sched_read(void)
+static u64 sun5i_timer_sched_read(void)
{
return ~readl(timer_base + TIMER_CNTVAL_LO_REG(1));
}
@@ -166,7 +166,7 @@ static void __init sun5i_timer_init(struct device_node *node)
writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD,
timer_base + TIMER_CTL_REG(1));

- setup_sched_clock(sun5i_timer_sched_read, 32, rate);
+ sched_clock_register(sun5i_timer_sched_read, 32, rate);
clocksource_mmio_init(timer_base + TIMER_CNTVAL_LO_REG(1), node->name,
rate, 340, 32, clocksource_mmio_readl_down);

--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Daniel Lezcano

unread,
Jan 17, 2014, 5:10:02 AM1/17/14
to
On 01/17/2014 02:38 AM, Stephen Boyd wrote:
> The 32 bit sched_clock interface supports 64 bits since 3.13-rc1.
> Upgrade to the 64 bit function to allow us to remove the 32 bit
> registration interface.
>
> Cc: Maxime Ripard <maxime...@free-electrons.com>
> Signed-off-by: Stephen Boyd <sb...@codeaurora.org>
> ---
>
> Cc'in Ingo because this is simple enough to probably just apply to timers/core

Hi Stephen,

I applied your patch in my tree for 3.15.

Thanks
-- Daniel

> drivers/clocksource/timer-sun5i.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
> index bddc52233d2a..deebcd6469fc 100644
> --- a/drivers/clocksource/timer-sun5i.c
> +++ b/drivers/clocksource/timer-sun5i.c
> @@ -136,7 +136,7 @@ static struct irqaction sun5i_timer_irq = {
> .dev_id = &sun5i_clockevent,
> };
>
> -static u32 sun5i_timer_sched_read(void)
> +static u64 sun5i_timer_sched_read(void)
> {
> return ~readl(timer_base + TIMER_CNTVAL_LO_REG(1));
> }
> @@ -166,7 +166,7 @@ static void __init sun5i_timer_init(struct device_node *node)
> writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD,
> timer_base + TIMER_CTL_REG(1));
>
> - setup_sched_clock(sun5i_timer_sched_read, 32, rate);
> + sched_clock_register(sun5i_timer_sched_read, 32, rate);
> clocksource_mmio_init(timer_base + TIMER_CNTVAL_LO_REG(1), node->name,
> rate, 340, 32, clocksource_mmio_readl_down);
>
>


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

Stephen Boyd

unread,
Jan 17, 2014, 1:00:02 PM1/17/14
to
On 01/17/14 02:05, Daniel Lezcano wrote:
> On 01/17/2014 02:38 AM, Stephen Boyd wrote:
>> The 32 bit sched_clock interface supports 64 bits since 3.13-rc1.
>> Upgrade to the 64 bit function to allow us to remove the 32 bit
>> registration interface.
>>
>> Cc: Maxime Ripard <maxime...@free-electrons.com>
>> Signed-off-by: Stephen Boyd <sb...@codeaurora.org>
>> ---
>>
>> Cc'in Ingo because this is simple enough to probably just apply to
>> timers/core
>
> Hi Stephen,
>
> I applied your patch in my tree for 3.15.
>

I was hoping we could remove setup_sched_clock() in 3.14-rc1 timeline,
but if we delay this until 3.15 we'll have to wait another 3 months. Is
there any chance we can get this in for 3.14?

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation

Daniel Lezcano

unread,
Jan 17, 2014, 1:10:01 PM1/17/14
to
On 01/17/2014 06:56 PM, Stephen Boyd wrote:
> On 01/17/14 02:05, Daniel Lezcano wrote:
>> On 01/17/2014 02:38 AM, Stephen Boyd wrote:
>>> The 32 bit sched_clock interface supports 64 bits since 3.13-rc1.
>>> Upgrade to the 64 bit function to allow us to remove the 32 bit
>>> registration interface.
>>>
>>> Cc: Maxime Ripard <maxime...@free-electrons.com>
>>> Signed-off-by: Stephen Boyd <sb...@codeaurora.org>
>>> ---
>>>
>>> Cc'in Ingo because this is simple enough to probably just apply to
>>> timers/core
>>
>> Hi Stephen,
>>
>> I applied your patch in my tree for 3.15.
>>
>
> I was hoping we could remove setup_sched_clock() in 3.14-rc1 timeline,
> but if we delay this until 3.15 we'll have to wait another 3 months. Is
> there any chance we can get this in for 3.14?

I am ok with that. It is up to Ingo.


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

Ingo Molnar

unread,
Jan 19, 2014, 7:30:02 AM1/19/14
to

* Daniel Lezcano <daniel....@linaro.org> wrote:

> On 01/17/2014 06:56 PM, Stephen Boyd wrote:
> >On 01/17/14 02:05, Daniel Lezcano wrote:
> >>On 01/17/2014 02:38 AM, Stephen Boyd wrote:
> >>>The 32 bit sched_clock interface supports 64 bits since 3.13-rc1.
> >>>Upgrade to the 64 bit function to allow us to remove the 32 bit
> >>>registration interface.
> >>>
> >>>Cc: Maxime Ripard <maxime...@free-electrons.com>
> >>>Signed-off-by: Stephen Boyd <sb...@codeaurora.org>
> >>>---
> >>>
> >>>Cc'in Ingo because this is simple enough to probably just apply to
> >>>timers/core
> >>
> >> Hi Stephen,
> >>
> >> I applied your patch in my tree for 3.15.
> >>
> >
> > I was hoping we could remove setup_sched_clock() in 3.14-rc1
> > timeline, but if we delay this until 3.15 we'll have to wait
> > another 3 months. Is there any chance we can get this in for 3.14?
>
> I am ok with that. It is up to Ingo.

Such simple patches are generally not a problem, I've applied it to
timers/core with your Acked-by.

Thanks,

Ingo

tip-bot for Stephen Boyd

unread,
Jan 19, 2014, 7:30:02 AM1/19/14
to
Commit-ID: 00e2bcd6d35f59fce7fa0e76e24d08f74c6a8506
Gitweb: http://git.kernel.org/tip/00e2bcd6d35f59fce7fa0e76e24d08f74c6a8506
Author: Stephen Boyd <sb...@codeaurora.org>
AuthorDate: Thu, 16 Jan 2014 17:38:06 -0800
Committer: Ingo Molnar <mi...@kernel.org>
CommitDate: Sun, 19 Jan 2014 13:23:23 +0100

clocksource: Timer-sun5i: Switch to sched_clock_register()

The 32-bit sched_clock() interface supports 64 bits since
3.13-rc1. Upgrade to the 64-bit function to allow us to remove
the 32-bit registration interface.

Signed-off-by: Stephen Boyd <sb...@codeaurora.org>
Acked-by: Daniel Lezcano <daniel....@linaro.org>
Cc: Maxime Ripard <maxime...@free-electrons.com>
Cc: linux-ar...@lists.infradead.org
Link: http://lkml.kernel.org/r/1389922686-6249-1-g...@codeaurora.org
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
drivers/clocksource/timer-sun5i.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
index bddc522..deebcd6 100644
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
@@ -136,7 +136,7 @@ static struct irqaction sun5i_timer_irq = {
.dev_id = &sun5i_clockevent,
};

-static u32 sun5i_timer_sched_read(void)
+static u64 sun5i_timer_sched_read(void)
{
return ~readl(timer_base + TIMER_CNTVAL_LO_REG(1));
}
@@ -166,7 +166,7 @@ static void __init sun5i_timer_init(struct device_node *node)
writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD,
timer_base + TIMER_CTL_REG(1));

- setup_sched_clock(sun5i_timer_sched_read, 32, rate);
+ sched_clock_register(sun5i_timer_sched_read, 32, rate);
clocksource_mmio_init(timer_base + TIMER_CNTVAL_LO_REG(1), node->name,
rate, 340, 32, clocksource_mmio_readl_down);

--
0 new messages