Patchwork [GIT,PULL] Remove ARM local timer API

login
register
mail settings
Submitter Stephen Boyd
Date June 25, 2013, 8:02 p.m.
Message ID <20130625200211.GA11625@codeaurora.org>
Download mbox
Permalink /patch/254314/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/remove-local-timers

Comments

Stephen Boyd - June 25, 2013, 8:02 p.m.
Olof/Arnd,

These patches remove the ARM local timer API. The ARM architected
timers have already moved away from this API so this series
migrates the rest of the users allowing us to remove the API
entirely. Thomas has been kind enough to take the first two
patches into timers/core in the tip tree (thanks Thomas!) so I've
merged that into v3.10-rc1 and then applied the rest of the
patches on top. Let me know if this is acceptable.

These patches have been through multiple rounds and tested by
multiple people since before the 3.10 merge window closed. Only
Barry's ack is missing (Cced).

Since I don't have a tree on kernel.org, David Brown has been
kind enough to push my tag out to his repo. Please pull.

The following changes since commit 42cba6e27c4cddc4df701c597dbfa666e1c013c8:

  Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into remove-local-timers (2013-06-24 17:45:02 -0700)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/remove-local-timers

for you to fetch changes up to 060fd3043e5e3488504b9e70182e188dd9113aea:

  ARM: smp: Remove local timer API (2013-06-24 17:47:34 -0700)

----------------------------------------------------------------
Now that we have a generic arch hook for broadcast we can remove the local
timer API entirely. Doing so will reduce code in ARM core, reduce the
architecture dependencies of our timer drivers, and simplify the code because
we no longer go through an architecture layer that is essentially a hotplug
notifier.

----------------------------------------------------------------
Stephen Boyd (9):
      ARM: smp: Remove duplicate dummy timer implementation
      ARM: smp_twd: Divorce smp_twd from local timer API
      ARM: OMAP2+: Divorce from local timer API
      ARM: EXYNOS4: Divorce mct from local timer API
      ARM: PRIMA2: Divorce timer-marco from local timer API
      ARM: msm: Divorce msm_timer from local timer API
      clocksource: time-armada-370-xp: Fix sparse warning
      clocksource: time-armada-370-xp: Divorce from local timer API
      ARM: smp: Remove local timer API

 arch/arm/Kconfig                         |  12 +--
 arch/arm/include/asm/localtimer.h        |  34 ---------
 arch/arm/kernel/smp.c                    |  87 ---------------------
 arch/arm/kernel/smp_twd.c                |  64 ++++++++++------
 arch/arm/mach-highbank/Kconfig           |   2 +-
 arch/arm/mach-imx/Kconfig                |   2 +-
 arch/arm/mach-msm/timer.c                | 126 +++++++++++++++++--------------
 arch/arm/mach-omap2/Kconfig              |   3 +-
 arch/arm/mach-omap2/timer.c              |   7 --
 arch/arm/mach-realview/Kconfig           |   8 +-
 arch/arm/mach-spear/Kconfig              |   2 +-
 arch/arm/mach-tegra/Kconfig              |   2 +-
 arch/arm/mach-ux500/Kconfig              |   2 +-
 arch/arm/mach-vexpress/Kconfig           |   2 +-
 arch/arm/mach-zynq/Kconfig               |   2 +-
 drivers/clocksource/exynos_mct.c         |  60 ++++++++++-----
 drivers/clocksource/time-armada-370-xp.c |  92 +++++++++++-----------
 drivers/clocksource/timer-marco.c        | 100 +++++++++++++-----------
 include/linux/time-armada-370-xp.h       |   4 +-
 19 files changed, 267 insertions(+), 344 deletions(-)
 delete mode 100644 arch/arm/include/asm/localtimer.h
Barry Song - June 26, 2013, 1:06 a.m.
2013/6/26 Stephen Boyd <sboyd@codeaurora.org>:
> Olof/Arnd,
>
> These patches remove the ARM local timer API. The ARM architected
> timers have already moved away from this API so this series
> migrates the rest of the users allowing us to remove the API
> entirely. Thomas has been kind enough to take the first two
> patches into timers/core in the tip tree (thanks Thomas!) so I've
> merged that into v3.10-rc1 and then applied the rest of the
> patches on top. Let me know if this is acceptable.
>
> These patches have been through multiple rounds and tested by
> multiple people since before the 3.10 merge window closed. Only
> Barry's ack is missing (Cced).

sorry for delayed reply. pls don't wait for my ack. as we are dropping
the marco SoC project this driver supports and moving to a new SoC.
that is why i didn't verify and ack this.
whether this driver is still usable will depend on whether the timer
IP will be re-used in the new chip. so maybe i will delete this driver
once timer IP is decided in the new SoC, or i will repeat to maintain
and verify it if the new SoC uses the same IP.

>
> Since I don't have a tree on kernel.org, David Brown has been
> kind enough to push my tag out to his repo. Please pull.
>
> The following changes since commit 42cba6e27c4cddc4df701c597dbfa666e1c013c8:
>
>   Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into remove-local-timers (2013-06-24 17:45:02 -0700)
>
> are available in the git repository at:
>
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/remove-local-timers
>
> for you to fetch changes up to 060fd3043e5e3488504b9e70182e188dd9113aea:
>
>   ARM: smp: Remove local timer API (2013-06-24 17:47:34 -0700)
>
> ----------------------------------------------------------------
> Now that we have a generic arch hook for broadcast we can remove the local
> timer API entirely. Doing so will reduce code in ARM core, reduce the
> architecture dependencies of our timer drivers, and simplify the code because
> we no longer go through an architecture layer that is essentially a hotplug
> notifier.
>
> ----------------------------------------------------------------
> Stephen Boyd (9):
>       ARM: smp: Remove duplicate dummy timer implementation
>       ARM: smp_twd: Divorce smp_twd from local timer API
>       ARM: OMAP2+: Divorce from local timer API
>       ARM: EXYNOS4: Divorce mct from local timer API
>       ARM: PRIMA2: Divorce timer-marco from local timer API
>       ARM: msm: Divorce msm_timer from local timer API
>       clocksource: time-armada-370-xp: Fix sparse warning
>       clocksource: time-armada-370-xp: Divorce from local timer API
>       ARM: smp: Remove local timer API
>
>  arch/arm/Kconfig                         |  12 +--
>  arch/arm/include/asm/localtimer.h        |  34 ---------
>  arch/arm/kernel/smp.c                    |  87 ---------------------
>  arch/arm/kernel/smp_twd.c                |  64 ++++++++++------
>  arch/arm/mach-highbank/Kconfig           |   2 +-
>  arch/arm/mach-imx/Kconfig                |   2 +-
>  arch/arm/mach-msm/timer.c                | 126 +++++++++++++++++--------------
>  arch/arm/mach-omap2/Kconfig              |   3 +-
>  arch/arm/mach-omap2/timer.c              |   7 --
>  arch/arm/mach-realview/Kconfig           |   8 +-
>  arch/arm/mach-spear/Kconfig              |   2 +-
>  arch/arm/mach-tegra/Kconfig              |   2 +-
>  arch/arm/mach-ux500/Kconfig              |   2 +-
>  arch/arm/mach-vexpress/Kconfig           |   2 +-
>  arch/arm/mach-zynq/Kconfig               |   2 +-
>  drivers/clocksource/exynos_mct.c         |  60 ++++++++++-----
>  drivers/clocksource/time-armada-370-xp.c |  92 +++++++++++-----------
>  drivers/clocksource/timer-marco.c        | 100 +++++++++++++-----------
>  include/linux/time-armada-370-xp.h       |   4 +-
>  19 files changed, 267 insertions(+), 344 deletions(-)
>  delete mode 100644 arch/arm/include/asm/localtimer.h
>
> --
> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
> hosted by The Linux Foundation

-barry
Olof Johansson - June 28, 2013, 12:08 a.m.
On Tue, Jun 25, 2013 at 01:02:12PM -0700, Stephen Boyd wrote:
> Olof/Arnd,
> 
> These patches remove the ARM local timer API. The ARM architected
> timers have already moved away from this API so this series
> migrates the rest of the users allowing us to remove the API
> entirely. Thomas has been kind enough to take the first two
> patches into timers/core in the tip tree (thanks Thomas!) so I've
> merged that into v3.10-rc1 and then applied the rest of the
> patches on top. Let me know if this is acceptable.

We need guarantees from Thomas that the branch is stable and will never be
rebased before it hit Linus tree, or we'll be in a world of pain for
dependencies like these.

Thomas, is this branch stable or do you anticipate a rebase?


-Olof
Stephen Boyd - July 8, 2013, 3:35 p.m.
On 06/27, Olof Johansson wrote:
> On Tue, Jun 25, 2013 at 01:02:12PM -0700, Stephen Boyd wrote:
> > Olof/Arnd,
> > 
> > These patches remove the ARM local timer API. The ARM architected
> > timers have already moved away from this API so this series
> > migrates the rest of the users allowing us to remove the API
> > entirely. Thomas has been kind enough to take the first two
> > patches into timers/core in the tip tree (thanks Thomas!) so I've
> > merged that into v3.10-rc1 and then applied the rest of the
> > patches on top. Let me know if this is acceptable.
> 
> We need guarantees from Thomas that the branch is stable and will never be
> rebased before it hit Linus tree, or we'll be in a world of pain for
> dependencies like these.
> 
> Thomas, is this branch stable or do you anticipate a rebase?
> 

This branch has merged into Linus' tree. Can this go through the
arm-soc tree now?
Stephen Boyd - July 17, 2013, 9:52 p.m.
On 07/08/13 08:35, Stephen Boyd wrote:
> On 06/27, Olof Johansson wrote:
>> On Tue, Jun 25, 2013 at 01:02:12PM -0700, Stephen Boyd wrote:
>>> Olof/Arnd,
>>>
>>> These patches remove the ARM local timer API. The ARM architected
>>> timers have already moved away from this API so this series
>>> migrates the rest of the users allowing us to remove the API
>>> entirely. Thomas has been kind enough to take the first two
>>> patches into timers/core in the tip tree (thanks Thomas!) so I've
>>> merged that into v3.10-rc1 and then applied the rest of the
>>> patches on top. Let me know if this is acceptable.
>> We need guarantees from Thomas that the branch is stable and will never be
>> rebased before it hit Linus tree, or we'll be in a world of pain for
>> dependencies like these.
>>
>> Thomas, is this branch stable or do you anticipate a rebase?
>>
> This branch has merged into Linus' tree. Can this go through the
> arm-soc tree now?
>

The merge window is over now. Can this be merged for 3.12?
Olof Johansson - July 19, 2013, 7:24 a.m.
Stephen Boyd <sboyd@codeaurora.org> wrote:

>On 07/08/13 08:35, Stephen Boyd wrote:
>> On 06/27, Olof Johansson wrote:
>>> On Tue, Jun 25, 2013 at 01:02:12PM -0700, Stephen Boyd wrote:
>>>> Olof/Arnd,
>>>>
>>>> These patches remove the ARM local timer API. The ARM architected
>>>> timers have already moved away from this API so this series
>>>> migrates the rest of the users allowing us to remove the API
>>>> entirely. Thomas has been kind enough to take the first two
>>>> patches into timers/core in the tip tree (thanks Thomas!) so I've
>>>> merged that into v3.10-rc1 and then applied the rest of the
>>>> patches on top. Let me know if this is acceptable.
>>> We need guarantees from Thomas that the branch is stable and will
>never be
>>> rebased before it hit Linus tree, or we'll be in a world of pain for
>>> dependencies like these.
>>>
>>> Thomas, is this branch stable or do you anticipate a rebase?
>>>
>> This branch has merged into Linus' tree. Can this go through the
>> arm-soc tree now?
>>
>
>The merge window is over now. Can this be merged for 3.12?

Yes, I am still traveling and haven't done any merges for 3.12 yet. This is first in the queue, I should get to it over the weekend or early next week.


-Olof
Olof Johansson - July 23, 2013, 10:10 p.m.
On Tue, Jun 25, 2013 at 1:02 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> Olof/Arnd,
>
> These patches remove the ARM local timer API. The ARM architected
> timers have already moved away from this API so this series
> migrates the rest of the users allowing us to remove the API
> entirely. Thomas has been kind enough to take the first two
> patches into timers/core in the tip tree (thanks Thomas!) so I've
> merged that into v3.10-rc1 and then applied the rest of the
> patches on top. Let me know if this is acceptable.
>
> These patches have been through multiple rounds and tested by
> multiple people since before the 3.10 merge window closed. Only
> Barry's ack is missing (Cced).
>
> Since I don't have a tree on kernel.org, David Brown has been
> kind enough to push my tag out to his repo. Please pull.
>
> The following changes since commit 42cba6e27c4cddc4df701c597dbfa666e1c013c8:
>
>   Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into remove-local-timers (2013-06-24 17:45:02 -0700)
>
> are available in the git repository at:
>
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/remove-local-timers
>
> for you to fetch changes up to 060fd3043e5e3488504b9e70182e188dd9113aea:
>
>   ARM: smp: Remove local timer API (2013-06-24 17:47:34 -0700)
>
> ----------------------------------------------------------------
> Now that we have a generic arch hook for broadcast we can remove the local
> timer API entirely. Doing so will reduce code in ARM core, reduce the
> architecture dependencies of our timer drivers, and simplify the code because
> we no longer go through an architecture layer that is essentially a hotplug
> notifier.

Hi,

Merged in as localtimer/removal into next/cleanup.

I had quite a few merge conflicts due to the __cpuinit removal, so
please double-check my resolutions.


-Olof
Stephen Boyd - July 23, 2013, 11:40 p.m.
On 07/23, Olof Johansson wrote:
> On Tue, Jun 25, 2013 at 1:02 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> > Olof/Arnd,
> >
> > These patches remove the ARM local timer API. The ARM architected
> > timers have already moved away from this API so this series
> > migrates the rest of the users allowing us to remove the API
> > entirely. Thomas has been kind enough to take the first two
> > patches into timers/core in the tip tree (thanks Thomas!) so I've
> > merged that into v3.10-rc1 and then applied the rest of the
> > patches on top. Let me know if this is acceptable.
> >
> > These patches have been through multiple rounds and tested by
> > multiple people since before the 3.10 merge window closed. Only
> > Barry's ack is missing (Cced).
> >
> > Since I don't have a tree on kernel.org, David Brown has been
> > kind enough to push my tag out to his repo. Please pull.
> >
> > The following changes since commit 42cba6e27c4cddc4df701c597dbfa666e1c013c8:
> >
> >   Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into remove-local-timers (2013-06-24 17:45:02 -0700)
> >
> > are available in the git repository at:
> >
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/remove-local-timers
> >
> > for you to fetch changes up to 060fd3043e5e3488504b9e70182e188dd9113aea:
> >
> >   ARM: smp: Remove local timer API (2013-06-24 17:47:34 -0700)
> >
> > ----------------------------------------------------------------
> > Now that we have a generic arch hook for broadcast we can remove the local
> > timer API entirely. Doing so will reduce code in ARM core, reduce the
> > architecture dependencies of our timer drivers, and simplify the code because
> > we no longer go through an architecture layer that is essentially a hotplug
> > notifier.
> 
> Hi,
> 
> Merged in as localtimer/removal into next/cleanup.
> 
> I had quite a few merge conflicts due to the __cpuinit removal, so
> please double-check my resolutions.
> 

A __cpuinit is leftover in smp_twd.c. Hopefully you can just
redo the merge?
Olof Johansson - July 23, 2013, 11:56 p.m.
On Tue, Jul 23, 2013 at 4:40 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> On 07/23, Olof Johansson wrote:

>> Merged in as localtimer/removal into next/cleanup.
>>
>> I had quite a few merge conflicts due to the __cpuinit removal, so
>> please double-check my resolutions.
>>
>
> A __cpuinit is leftover in smp_twd.c. Hopefully you can just
> redo the merge?

Done, thanks for catching it. I thought I grepped for them but I
somehow missed that one. Fixed now.


-Olof