Patchwork [GIT,PULL] clocksource: dw_apb_timer_of: Fix read_sched_clock

login
register
mail settings
Submitter dinguyen@altera.com
Date Oct. 7, 2013, 3:27 p.m.
Message ID <1381159679-6528-1-git-send-email-dinguyen@altera.com>
Download mbox
Permalink /patch/281133/
State New
Headers show

Pull-request

git://git.rocketboards.org/linux-socfpga-next.git tags/dw_apb_timer_fix_for_jstultz

Comments

dinguyen@altera.com - Oct. 7, 2013, 3:27 p.m.
From: Dinh Nguyen <dinguyen@altera.com>

Hi Thomas, John,

I am hoping you can pull in these 2 patches. These 2 patches have been floating
around for almost 2 months now. They are needed to get the Altera SOCFPGA
booting again because of a DTS binding change in 3.12.

The other change was correctly return the current clock counter.

The discussion thread can be found here:

http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198818.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198903.html

This patch does not attempt or change the behaviour of the ordering of how a
clocksource or clockevent is use. These 2 patches only enables a platform to boot.

Thanks,
Dinh

The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f:

  Linux 3.12-rc1 (2013-09-16 16:17:51 -0400)

are available in the git repository at:

  git://git.rocketboards.org/linux-socfpga-next.git tags/dw_apb_timer_fix_for_jstultz

for you to fetch changes up to c3c3e0d0fee2f4e1a9897094107dd8eae87503fb:

  clocksource: dw_apb_timer_of: Fix read_sched_clock (2013-10-07 09:57:15 -0500)

----------------------------------------------------------------
dw_apb_timer changes:
	- Move defines from dw_apb_timer.c to include/linux/dw_apb_timer.h
	- The dw_apb_timer implementation is a countdown timer. Fix the code
		to return the correct current counter.
	- Add backwards compatibilty for deprecated "snps,dw-apb-timer-osc"
		and "snps,dw-apb-timer-sp"
	- Add compatiblity for "snps,dw-apb-timer". This is the new binding
		to be used going forward.

----------------------------------------------------------------
Dinh Nguyen (2):
      clocksource: dw_apb_timer: Move timer defines to header file.
      clocksource: dw_apb_timer_of: Fix read_sched_clock

 drivers/clocksource/dw_apb_timer.c    |   19 -------------------
 drivers/clocksource/dw_apb_timer_of.c |    9 +++++----
 include/linux/dw_apb_timer.h          |   19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 23 deletions(-)
Daniel Lezcano - Oct. 7, 2013, 4:09 p.m.
On 10/07/2013 05:27 PM, dinguyen@altera.com wrote:
> From: Dinh Nguyen <dinguyen@altera.com>
>
> Hi Thomas, John,
>
> I am hoping you can pull in these 2 patches. These 2 patches have been floating
> around for almost 2 months now. They are needed to get the Altera SOCFPGA
> booting again because of a DTS binding change in 3.12.
>
> The other change was correctly return the current clock counter.
>
> The discussion thread can be found here:
>
> http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198818.html
> http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198903.html
>
> This patch does not attempt or change the behaviour of the ordering of how a
> clocksource or clockevent is use. These 2 patches only enables a platform to boot.

John,

I agree with Dinh, these patches fixes a boot issue on Altera SOCFPGA 
and should be merged.

Thanks
   -- Daniel

> The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f:
>
>    Linux 3.12-rc1 (2013-09-16 16:17:51 -0400)
>
> are available in the git repository at:
>
>    git://git.rocketboards.org/linux-socfpga-next.git tags/dw_apb_timer_fix_for_jstultz
>
> for you to fetch changes up to c3c3e0d0fee2f4e1a9897094107dd8eae87503fb:
>
>    clocksource: dw_apb_timer_of: Fix read_sched_clock (2013-10-07 09:57:15 -0500)
>
> ----------------------------------------------------------------
> dw_apb_timer changes:
> 	- Move defines from dw_apb_timer.c to include/linux/dw_apb_timer.h
> 	- The dw_apb_timer implementation is a countdown timer. Fix the code
> 		to return the correct current counter.
> 	- Add backwards compatibilty for deprecated "snps,dw-apb-timer-osc"
> 		and "snps,dw-apb-timer-sp"
> 	- Add compatiblity for "snps,dw-apb-timer". This is the new binding
> 		to be used going forward.
>
> ----------------------------------------------------------------
> Dinh Nguyen (2):
>        clocksource: dw_apb_timer: Move timer defines to header file.
>        clocksource: dw_apb_timer_of: Fix read_sched_clock
>
>   drivers/clocksource/dw_apb_timer.c    |   19 -------------------
>   drivers/clocksource/dw_apb_timer_of.c |    9 +++++----
>   include/linux/dw_apb_timer.h          |   19 +++++++++++++++++++
>   3 files changed, 24 insertions(+), 23 deletions(-)
>
John Stultz - Oct. 7, 2013, 5:10 p.m.
On 10/07/2013 09:09 AM, Daniel Lezcano wrote:
> On 10/07/2013 05:27 PM, dinguyen@altera.com wrote:
>> From: Dinh Nguyen <dinguyen@altera.com>
>>
>> Hi Thomas, John,
>>
>> I am hoping you can pull in these 2 patches. These 2 patches have
>> been floating
>> around for almost 2 months now. They are needed to get the Altera
>> SOCFPGA
>> booting again because of a DTS binding change in 3.12.
>>
>> The other change was correctly return the current clock counter.
>>
>> The discussion thread can be found here:
>>
>> http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198818.html
>>
>> http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198903.html
>>
>>
>> This patch does not attempt or change the behaviour of the ordering
>> of how a
>> clocksource or clockevent is use. These 2 patches only enables a
>> platform to boot.
>
> John,
>
> I agree with Dinh, these patches fixes a boot issue on Altera SOCFPGA
> and should be merged.
>

Hey Dinh,
    Thanks for persisting here! Sorry this has taken awhile. Just as an
FYI, Daniel is maintaining the drivers/clocksource dir these days.

So, I've not been following this closely, but if I recall we had a merge
conflict that we backed out, since it seemed that everyone involved in
this driver weren't working together. Then Thomas had some objections,
but it *looks* like that's been resolved. So I don't have any objections
at this point.

Daniel: if you want to pull these in to your tree, that's fine by me.

thanks
-john
Daniel Lezcano - Oct. 7, 2013, 7:18 p.m.
On 10/07/2013 07:10 PM, John Stultz wrote:
> On 10/07/2013 09:09 AM, Daniel Lezcano wrote:
>> On 10/07/2013 05:27 PM, dinguyen@altera.com wrote:
>>> From: Dinh Nguyen <dinguyen@altera.com>
>>>
>>> Hi Thomas, John,
>>>
>>> I am hoping you can pull in these 2 patches. These 2 patches have
>>> been floating
>>> around for almost 2 months now. They are needed to get the Altera
>>> SOCFPGA
>>> booting again because of a DTS binding change in 3.12.
>>>
>>> The other change was correctly return the current clock counter.
>>>
>>> The discussion thread can be found here:
>>>
>>> http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198818.html
>>>
>>> http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198903.html
>>>
>>>
>>> This patch does not attempt or change the behaviour of the ordering
>>> of how a
>>> clocksource or clockevent is use. These 2 patches only enables a
>>> platform to boot.
>>
>> John,
>>
>> I agree with Dinh, these patches fixes a boot issue on Altera SOCFPGA
>> and should be merged.
>>
>
> Hey Dinh,
>      Thanks for persisting here! Sorry this has taken awhile. Just as an
> FYI, Daniel is maintaining the drivers/clocksource dir these days.
>
> So, I've not been following this closely, but if I recall we had a merge
> conflict that we backed out, since it seemed that everyone involved in
> this driver weren't working together. Then Thomas had some objections,
> but it *looks* like that's been resolved. So I don't have any objections
> at this point.

Yeah, it happens the same to me :)

> Daniel: if you want to pull these in to your tree, that's fine by me.

Ok, pulled to my tree.

Thanks !
   -- Daniel
Dinh Nguyen - Nov. 24, 2013, 4:05 a.m.
Hi Daniel,

On 10/7/13 2:18 PM, Daniel Lezcano wrote:
> On 10/07/2013 07:10 PM, John Stultz wrote:
>> On 10/07/2013 09:09 AM, Daniel Lezcano wrote:
>>> On 10/07/2013 05:27 PM, dinguyen@altera.com wrote:
>>>> From: Dinh Nguyen <dinguyen@altera.com>
>>>>
>>>> Hi Thomas, John,
>>>>
>>>> I am hoping you can pull in these 2 patches. These 2 patches have
>>>> been floating
>>>> around for almost 2 months now. They are needed to get the Altera
>>>> SOCFPGA
>>>> booting again because of a DTS binding change in 3.12.
>>>>
>>>> The other change was correctly return the current clock counter.
>>>>
>>>> The discussion thread can be found here:
>>>>
>>>> http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198818.html
>>>>
>>>>
>>>> http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198903.html
>>>>
>>>>
>>>>
>>>> This patch does not attempt or change the behaviour of the ordering
>>>> of how a
>>>> clocksource or clockevent is use. These 2 patches only enables a
>>>> platform to boot.
>>>
>>> John,
>>>
>>> I agree with Dinh, these patches fixes a boot issue on Altera SOCFPGA
>>> and should be merged.
>>>
>>
>> Hey Dinh,
>>      Thanks for persisting here! Sorry this has taken awhile. Just as an
>> FYI, Daniel is maintaining the drivers/clocksource dir these days.
>>
>> So, I've not been following this closely, but if I recall we had a merge
>> conflict that we backed out, since it seemed that everyone involved in
>> this driver weren't working together. Then Thomas had some objections,
>> but it *looks* like that's been resolved. So I don't have any objections
>> at this point.
>
> Yeah, it happens the same to me :)
>
>> Daniel: if you want to pull these in to your tree, that's fine by me.
>
> Ok, pulled to my tree.
I did not see these 2 patches in 3.13-rc1. Just wondering what happened
to them?

Thanks,
Dinh
>
> Thanks !
>   -- Daniel
>
>
Daniel Lezcano - Nov. 24, 2013, 9:53 p.m.
On 11/24/2013 05:05 AM, Dinh Nguyen wrote:
> Hi Daniel,
>
> On 10/7/13 2:18 PM, Daniel Lezcano wrote:
>> On 10/07/2013 07:10 PM, John Stultz wrote:
>>> On 10/07/2013 09:09 AM, Daniel Lezcano wrote:
>>>> On 10/07/2013 05:27 PM, dinguyen@altera.com wrote:
>>>>> From: Dinh Nguyen <dinguyen@altera.com>
>>>>>
>>>>> Hi Thomas, John,
>>>>>
>>>>> I am hoping you can pull in these 2 patches. These 2 patches have
>>>>> been floating
>>>>> around for almost 2 months now. They are needed to get the Altera
>>>>> SOCFPGA
>>>>> booting again because of a DTS binding change in 3.12.
>>>>>
>>>>> The other change was correctly return the current clock counter.
>>>>>
>>>>> The discussion thread can be found here:
>>>>>
>>>>> http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198818.html
>>>>>
>>>>>
>>>>> http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198903.html
>>>>>
>>>>>
>>>>>
>>>>> This patch does not attempt or change the behaviour of the ordering
>>>>> of how a
>>>>> clocksource or clockevent is use. These 2 patches only enables a
>>>>> platform to boot.
>>>>
>>>> John,
>>>>
>>>> I agree with Dinh, these patches fixes a boot issue on Altera SOCFPGA
>>>> and should be merged.
>>>>
>>>
>>> Hey Dinh,
>>>       Thanks for persisting here! Sorry this has taken awhile. Just as an
>>> FYI, Daniel is maintaining the drivers/clocksource dir these days.
>>>
>>> So, I've not been following this closely, but if I recall we had a merge
>>> conflict that we backed out, since it seemed that everyone involved in
>>> this driver weren't working together. Then Thomas had some objections,
>>> but it *looks* like that's been resolved. So I don't have any objections
>>> at this point.
>>
>> Yeah, it happens the same to me :)
>>
>>> Daniel: if you want to pull these in to your tree, that's fine by me.
>>
>> Ok, pulled to my tree.
> I did not see these 2 patches in 3.13-rc1. Just wondering what happened
> to them?

Me too :/

I will take them for 3.13 fixes.