Skip to content

timers: clean up ARCH_GETTIMEOFFSET, LEGACY_TIMER_TICK

Arnd Bergmann linux-arm-kernel linux-ia64 linux-m68k linux-parisc lkml oe-kbuild-all 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v2 Latest15 patches 10 repliesIn review

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/15ARM: remove ebsa110 platformMAINTAINERS arch/arm/Kconfig arch/arm/Kconfig.debug +16 more+7 -12290 replies
2/15net: remove am79c961a driverdrivers/net/ethernet/amd/Kconfig drivers/net/ethernet/amd/Makefile drivers/net/ethernet/amd/am79c961a.c +1 more+1 -9160 replies
3/15timekeeping: remove arch_gettimeoffsetDocumentation/features/time/modern-timekeeping/arch-support.txt drivers/Makefile drivers/clocksource/Kconfig +5 more+2 -920 replies
4/15timekeeping: add CONFIG_LEGACY_TIMER_TICKinclude/linux/timekeeping.h kernel/time/Kconfig kernel/time/Makefile +1 more+28 -00 replies
5/15ia64: convert to legacy_timer_tickarch/ia64/Kconfig arch/ia64/kernel/time.c+14 -234 replies
6/15ARM: rpc: use legacy_timer_tickarch/arm/Kconfig arch/arm/include/asm/mach/time.h arch/arm/kernel/time.c +1 more+2 -170 replies
7/15parisc: use legacy_timer_tickDocumentation/features/time/clockevents/arch-support.txt arch/parisc/Kconfig arch/parisc/kernel/time.c+5 -84 replies
8/15m68k: coldfire: use legacy_timer_tick()arch/m68k/Kconfig.cpu arch/m68k/coldfire/Makefile arch/m68k/coldfire/sltimers.c +1 more+51 -280 replies
9/15m68k: split heartbeat out of timer functionarch/m68k/amiga/config.c arch/m68k/apollo/config.c arch/m68k/atari/time.c +4 more+19 -20 replies
10/15m68k: sun3/sun3c: use legacy_timer_tickarch/m68k/Kconfig.machine arch/m68k/sun3/sun3ints.c arch/m68k/sun3x/time.c+4 -40 replies
11/15m68k: m68328: use legacy_timer_tick()arch/m68k/68000/timers.c arch/m68k/Kconfig.cpu+5 -30 replies
12/15m68k: change remaining timers to legacy_timer_tickarch/m68k/Kconfig.machine arch/m68k/amiga/config.c arch/m68k/apollo/config.c +7 more+27 -310 replies
13/15m68k: remove timer_interrupt() functionarch/m68k/68000/timers.c arch/m68k/amiga/config.c arch/m68k/apollo/config.c +21 more+33 -470 replies
14/15timekeeping: remove xtime_updateinclude/linux/timekeeping.h kernel/time/tick-legacy.c kernel/time/timekeeping.c +1 more+21 -200 replies
15/15timekeeping: default GENERIC_CLOCKEVENTS to enabledDocumentation/features/time/clockevents/arch-support.txt arch/alpha/Kconfig arch/arc/Kconfig +22 more+4 -380 replies

Reviews trailers per patch

All 15 patches have a Reviewed-by or Acked-by.

PatchRussell KingJakub KicinskiThomas GleixnerLinus WalleijGeert UytterhoevenGreg Ungerer
1/15A-b
2/15A-b A-b
3/15A-b R-b
4/15R-b R-b
5/15R-b
6/15R-b
7/15R-b
8/15R-b T-b
9/15R-b R-b A-b T-b
10/15R-b R-b A-b
11/15R-b R-b
12/15R-b R-b A-b T-b
13/15R-b R-b A-b T-b
14/15R-b R-b T-b
15/15R-b R-b A-b T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 6 reviewers.

Read the v2 thread

Cover letter [PATCH v2 00/15] timers: clean up ARCH_GETTIMEOFFSET, LEGACY_TIMER_TICK

From: Arnd Bergmann <[email protected]>

This is a resend of the combined cleanups for CONFIG_ARCH_GETTIMEOFFSET, which gets removed, and CONFIG_LEGACY_TIMER_TICK, which replaces CONFIG_GENERIC_CLOCKEVENTS, with the reverse meaning.

CONFIG_ARCH_GETTIMEOFFSET has been gradually phased out from all platforms, with only ARM EBSA110 recently. As this has no more known users, the first three patches remove EBSA110 along with one platform specific driver and the ARCH_GETTIMEOFFSET infrastructure.

When I created the patch removing CONFIG_ARCH_GETTIMEOFFSET, I also had a look at CONFIG_GENERIC_CLOCKEVENTS, which is selected by most, but not all, platforms today, each of the ones that lack it doing the timer tick slightly differently.

The cleanups here make the old platforms a bit more consistent, in multiple ways:

- rather than selecting GENERIC_CLOCKEVENTS on modern platforms, select LEGACY_TIMER_TICK on the old ones.

- Hide some more of the internal implementation and only provide a single common entry point for the timer tick, which also makes the behavior more consistent.

- Remove the m68k and arm specific infrastructure pieces and call the common helper directly from each timer interrupt function.

I tested the series on m68k with the qemu q800 target platform, both with the legacy_timer_tick() implementation and after converting that to a periodic clockevent driver (not included in v2).

Since the patches touch a lot of architecture specific code, I've created a branch in my asm-generic tree[1] and plan to send it for the v5.11 merge window. If any maintainer has conflicting changes or wants to build on top of my work, feel free to merge that into additional subsystem trees.

Arnd

[1] git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git \
asm-generic-timers

Arnd Bergmann (15):
ARM: remove ebsa110 platform
net: remove am79c961a driver
timekeeping: remove arch_gettimeoffset
timekeeping: add CONFIG_LEGACY_TIMER_TICK
ia64: convert to legacy_timer_tick
ARM: rpc: use legacy_timer_tick
parisc: use legacy_timer_tick
m68k: coldfire: use legacy_timer_tick()
m68k: split heartbeat out of timer function
m68k: sun3/sun3c: use legacy_timer_tick
m68k: m68328: use legacy_timer_tick()
m68k: change remaining timers to legacy_timer_tick
m68k: remove timer_interrupt() function
timekeeping: remove xtime_update
timekeeping: default GENERIC_CLOCKEVENTS to enabled

 .../time/clockevents/arch-support.txt         |   8 +-
 .../time/modern-timekeeping/arch-support.txt  |  33 -
 MAINTAINERS                                   |   8 -
 arch/alpha/Kconfig                            |   1 -
 arch/arc/Kconfig                              |   1 -
 arch/arm/Kconfig                              |  37 +-
 arch/arm/Kconfig.debug                        |   6 +-
 arch/arm/Makefile                             |   8 -
 arch/arm/configs/ebsa110_defconfig            |  74 --
 arch/arm/include/asm/mach/time.h              |   2 -
 arch/arm/kernel/Makefile                      |   6 +-
 arch/arm/kernel/time.c                        |  14 -
 arch/arm/mach-ebsa110/Makefile                |   8 -
 arch/arm/mach-ebsa110/Makefile.boot           |   5 -
 arch/arm/mach-ebsa110/core.c                  | 323 --------
 arch/arm/mach-ebsa110/core.h                  |  38 -
 .../mach-ebsa110/include/mach/entry-macro.S   |  33 -
 arch/arm/mach-ebsa110/include/mach/hardware.h |  21 -
 arch/arm/mach-ebsa110/include/mach/io.h       |  89 --
 arch/arm/mach-ebsa110/include/mach/irqs.h     |  17 -
 arch/arm/mach-ebsa110/include/mach/memory.h   |  22 -
 .../mach-ebsa110/include/mach/uncompress.h    |  41 -
 arch/arm/mach-ebsa110/io.c                    | 440 ----------
 arch/arm/mach-ebsa110/leds.c                  |  71 --
 arch/arm/mach-rpc/time.c                      |   2 +-
 arch/arm64/Kconfig                            |   1 -
 arch/arm64/Kconfig.platforms                  |   1 -
 arch/c6x/Kconfig                              |   1 -
 arch/csky/Kconfig                             |   1 -
 arch/h8300/Kconfig                            |   1 -
 arch/hexagon/Kconfig                          |   1 -
 arch/ia64/Kconfig                             |   1 +
 arch/ia64/kernel/time.c                       |  36 +-
 arch/m68k/68000/timers.c                      |   7 +-
 arch/m68k/Kconfig.cpu                         |  37 +-
 arch/m68k/Kconfig.machine                     |  11 +
 arch/m68k/amiga/config.c                      |  11 +-
 arch/m68k/apollo/config.c                     |  11 +-
 arch/m68k/atari/config.c                      |   2 +-
 arch/m68k/atari/time.c                        |   9 +-
 arch/m68k/bvme6000/config.c                   |   9 +-
 arch/m68k/coldfire/Makefile                   |  32 +-
 arch/m68k/coldfire/pit.c                      |   2 +-
 arch/m68k/coldfire/sltimers.c                 |   8 +-
 arch/m68k/coldfire/timers.c                   |   8 +-
 arch/m68k/hp300/time.c                        |   8 +-
 arch/m68k/hp300/time.h                        |   2 +-
 arch/m68k/include/asm/machdep.h               |  12 +-
 arch/m68k/kernel/setup_mm.c                   |   2 +-
 arch/m68k/kernel/setup_no.c                   |   2 +-
 arch/m68k/kernel/time.c                       |  18 +-
 arch/m68k/mac/config.c                        |   6 +-
 arch/m68k/mac/via.c                           |   8 +-
 arch/m68k/mvme147/config.c                    |   9 +-
 arch/m68k/mvme16x/config.c                    |   9 +-
 arch/m68k/q40/config.c                        |   2 +-
 arch/m68k/q40/q40ints.c                       |  10 +-
 arch/m68k/sun3/config.c                       |   4 +-
 arch/m68k/sun3/sun3ints.c                     |   3 +-
 arch/m68k/sun3x/time.c                        |   5 +-
 arch/m68k/sun3x/time.h                        |   2 +-
 arch/microblaze/Kconfig                       |   1 -
 arch/mips/Kconfig                             |   1 -
 arch/nds32/Kconfig                            |   1 -
 arch/nios2/Kconfig                            |   1 -
 arch/openrisc/Kconfig                         |   1 -
 arch/parisc/Kconfig                           |   2 +-
 arch/parisc/kernel/time.c                     |   9 +-
 arch/powerpc/Kconfig                          |   1 -
 arch/riscv/Kconfig                            |   1 -
 arch/s390/Kconfig                             |   1 -
 arch/sh/Kconfig                               |   1 -
 arch/sparc/Kconfig                            |   1 -
 arch/um/Kconfig                               |   1 -
 arch/x86/Kconfig                              |   1 -
 arch/xtensa/Kconfig                           |   1 -
 drivers/Makefile                              |   2 -
 drivers/clocksource/Kconfig                   |   2 +-
 drivers/net/ethernet/amd/Kconfig              |  10 +-
 drivers/net/ethernet/amd/Makefile             |   1 -
 drivers/net/ethernet/amd/am79c961a.c          | 763 ------------------
 drivers/net/ethernet/amd/am79c961a.h          | 143 ----
 drivers/watchdog/Kconfig                      |   2 +-
 include/linux/time.h                          |  13 -
 include/linux/timekeeping.h                   |   3 +-
 kernel/time/Kconfig                           |  18 +-
 kernel/time/Makefile                          |   1 +
 kernel/time/clocksource.c                     |   8 -
 kernel/time/tick-legacy.c                     |  37 +
 kernel/time/timekeeping.c                     |  41 +-
 kernel/time/timekeeping.h                     |   1 +
 kernel/trace/Kconfig                          |   2 -
 92 files changed, 218 insertions(+), 2453 deletions(-)
 delete mode 100644 Documentation/features/time/modern-timekeeping/arch-support.txt
 delete mode 100644 arch/arm/configs/ebsa110_defconfig
 delete mode 100644 arch/arm/mach-ebsa110/Makefile
 delete mode 100644 arch/arm/mach-ebsa110/Makefile.boot
 delete mode 100644 arch/arm/mach-ebsa110/core.c
 delete mode 100644 arch/arm/mach-ebsa110/core.h
 delete mode 100644 arch/arm/mach-ebsa110/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-ebsa110/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-ebsa110/include/mach/io.h
 delete mode 100644 arch/arm/mach-ebsa110/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-ebsa110/include/mach/memory.h
 delete mode 100644 arch/arm/mach-ebsa110/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-ebsa110/io.c
 delete mode 100644 arch/arm/mach-ebsa110/leds.c
 delete mode 100644 drivers/net/ethernet/amd/am79c961a.c
 delete mode 100644 drivers/net/ethernet/amd/am79c961a.h
 create mode 100644 kernel/time/tick-legacy.c
Cc Russell King <[email protected]>
Cc Tony Luck <[email protected]>
Cc Fenghua Yu <[email protected]>
Cc Greg Ungerer <[email protected]>
Cc Finn Thain <[email protected]>
Cc Philip Blundell <[email protected]>
Cc Joshua Thompson <[email protected]>
Cc Sam Creasey <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc Helge Deller <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc John Stultz <[email protected]>
Cc Stephen Boyd <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Parisc List <[email protected]>
Cc linux-m68k <[email protected]>
Cc Linux ARM <[email protected]>
Signature · 1 line
2.27.0