timers: clean up ARCH_GETTIMEOFFSET, LEGACY_TIMER_TICK
Subsystems (34)
v2 cover 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
Signature · 1 line
2.27.0
PATCH v2 1/15 ARM: remove ebsa110 platform
From: Arnd Bergmann <[email protected]>
Russell said that he is no longer using this machine, and it seems that nobody else has in a long time, so it's time to say goodbye to it.
As this is the last platform using CONFIG_ARCH_USES_GETTIMEOFFSET, there are some follow-up patches to remove that as well.
--- MAINTAINERS | 8 - arch/arm/Kconfig | 24 +- arch/arm/Kconfig.debug | 6 +- arch/arm/Makefile | 8 - arch/arm/configs/ebsa110_defconfig | 74 --- arch/arm/kernel/Makefile | 6 +- 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 --- drivers/watchdog/Kconfig | 2 +- 19 files changed, 7 insertions(+), 1229 deletions(-) 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
MAINTAINERS +0 -8
@@ -1789,14 +1789,6 @@ F: drivers/firmware/turris-mox-rwtm.c F: drivers/gpio/gpio-moxtet.c F: include/linux/moxtet.h -ARM/EBSA110 MACHINE SUPPORT -M: Russell King <[email protected]> -L: [email protected] (moderated for non-subscribers) -S: Maintained -W: http://www.armlinux.org.uk/ -F: arch/arm/mach-ebsa110/ -F: drivers/net/ethernet/amd/am79c961a.* - ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT M: Uwe Kleine-König <[email protected]> R: Pengutronix Kernel Team <[email protected]>
arch/arm/Kconfig +3 -21
@@ -267,8 +267,7 @@ config PHYS_OFFSET hex "Physical address of main memory" if MMU depends on !ARM_PATCH_PHYS_VIRT default DRAM_BASE if !MMU - default 0x00000000 if ARCH_EBSA110 || \ - ARCH_FOOTBRIDGE + default 0x00000000 ARCH_FOOTBRIDGE default 0x10000000 if ARCH_OMAP1 || ARCH_RPC default 0x20000000 if ARCH_S5PV210 default 0xc0000000 if ARCH_SA1100
@@ -342,20 +341,6 @@ config ARM_SINGLE_ARMV7M select SPARSE_IRQ select USE_OF -config ARCH_EBSA110 - bool "EBSA-110" - select ARCH_USES_GETTIMEOFFSET - select CPU_SA110 - select ISA - select NEED_MACH_IO_H - select NEED_MACH_MEMORY_H - select NO_IOPORT_MAP - help - This is an evaluation board for the StrongARM processor available - from Digital. It has limited hardware on-board, including an - Ethernet interface, two PCMCIA sockets, two serial ports and a - parallel port. - config ARCH_EP93XX bool "EP93xx-based" select ARCH_SPARSEMEM_ENABLE
@@ -1371,7 +1356,6 @@ config ARCH_NR_GPIO config HZ_FIXED int - default 200 if ARCH_EBSA110 default 128 if SOC_AT91RM9200 default 0
@@ -1587,9 +1571,7 @@ config FORCE_MAX_ZONEORDER a value of 11 means that the largest free memory block is 2^10 pages. config ALIGNMENT_TRAP - bool - depends on CPU_CP15_MMU - default y if !ARCH_EBSA110 + def_bool CPU_CP15_MMU select HAVE_PROC_CPU if PROC_FS help ARM processors cannot fetch/store information which is not
@@ -1784,7 +1766,7 @@ config CMDLINE string "Default kernel command string" default "" help - On some architectures (EBSA110 and CATS), there is currently no way + On some architectures (e.g. CATS), there is currently no way for the boot loader to pass arguments to the kernel. For these architectures, you should supply some command-line options at build time by entering them here. As a minimum, you should specify the
arch/arm/Kconfig.debug +2 -4
@@ -1567,7 +1567,7 @@ config DEBUG_SIRFSOC_UART config DEBUG_UART_FLOW_CONTROL bool "Enable flow control (CTS) for the debug UART" depends on DEBUG_LL - default y if ARCH_EBSA110 || DEBUG_FOOTBRIDGE_COM1 || DEBUG_GEMINI || ARCH_RPC + default y if DEBUG_FOOTBRIDGE_COM1 || DEBUG_GEMINI || ARCH_RPC help Some UART ports are connected to terminals that will use modem control signals to indicate whether they are ready to receive text.
@@ -1639,7 +1639,7 @@ config DEBUG_UART_PL01X # Compatibility options for 8250 config DEBUG_UART_8250 - def_bool ARCH_EBSA110 || ARCH_IOP32X || ARCH_IXP4XX || ARCH_RPC + def_bool ARCH_IOP32X || ARCH_IXP4XX || ARCH_RPC config DEBUG_UART_PHYS hex "Physical base address of debug UART"
@@ -1743,7 +1743,6 @@ config DEBUG_UART_PHYS default 0xe8008000 if DEBUG_R7S72100_SCIF2 || DEBUG_R7S9210_SCIF2 default 0xe8009000 if DEBUG_R7S9210_SCIF4 default 0xf0000000 if DEBUG_DIGICOLOR_UA0 - default 0xf0000be0 if ARCH_EBSA110 default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE default 0xf7fc9000 if DEBUG_BERLIN_UART
@@ -1790,7 +1789,6 @@ config DEBUG_UART_VIRT default 0xc8821000 if DEBUG_RV1108_UART1 default 0xc8912000 if DEBUG_RV1108_UART0 default 0xe0010fe0 if ARCH_RPC - default 0xf0000be0 if ARCH_EBSA110 default 0xf0010000 if DEBUG_ASM9260_UART default 0xf0100000 if DEBUG_DIGICOLOR_UA0 default 0xf01fb000 if DEBUG_NOMADIK_UART
arch/arm/Makefile +0 -8
@@ -172,7 +172,6 @@ machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx machine-$(CONFIG_ARCH_DAVINCI) += davinci machine-$(CONFIG_ARCH_DIGICOLOR) += digicolor machine-$(CONFIG_ARCH_DOVE) += dove -machine-$(CONFIG_ARCH_EBSA110) += ebsa110 machine-$(CONFIG_ARCH_EFM32) += efm32 machine-$(CONFIG_ARCH_EP93XX) += ep93xx machine-$(CONFIG_ARCH_EXYNOS) += exynos
@@ -239,13 +238,6 @@ plat-$(CONFIG_PLAT_ORION) += orion plat-$(CONFIG_PLAT_PXA) += pxa plat-$(CONFIG_PLAT_VERSATILE) += versatile -ifeq ($(CONFIG_ARCH_EBSA110),y) -# This is what happens if you forget the IOCS16 line. -# PCMCIA cards stop working. -CFLAGS_3c589_cs.o :=-DISA_SIXTEEN_BIT_PERIPHERAL -export CFLAGS_3c589_cs.o -endif - # The byte offset of the kernel image in RAM from the start of RAM. TEXT_OFFSET := $(textofs-y)
arch/arm/configs/ebsa110_defconfig deleted +0 -74
74 lines not on this page · raw message
arch/arm/kernel/Makefile +1 -5
@@ -17,7 +17,7 @@ CFLAGS_REMOVE_return_address.o = -pg # Object file lists. obj-y := elf.o entry-common.o irq.o opcodes.o \ - process.o ptrace.o reboot.o \ + process.o ptrace.o reboot.o io.o \ setup.o signal.o sigreturn_codes.o \ stacktrace.o sys_arm.o time.o traps.o
@@ -83,10 +83,6 @@ AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o obj-$(CONFIG_VDSO) += vdso.o obj-$(CONFIG_EFI) += efi.o - -ifneq ($(CONFIG_ARCH_EBSA110),y) - obj-y += io.o -endif obj-$(CONFIG_PARAVIRT) += paravirt.o head-y := head$(MMUEXT).o
arch/arm/mach-ebsa110/Makefile deleted +0 -8
@@ -1,8 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# -# Makefile for the linux kernel. -# - -# Object file lists. - -obj-y := core.o io.o leds.o
arch/arm/mach-ebsa110/Makefile.boot deleted +0 -5
@@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - zreladdr-y += 0x00008000 -params_phys-y := 0x00000400 -initrd_phys-y := 0x00800000 -
arch/arm/mach-ebsa110/core.c deleted +0 -323
323 lines not on this page · raw message
arch/arm/mach-ebsa110/core.h deleted +0 -38
@@ -1,38 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright (C) 1996-2000 Russell King. -* -* This file contains the core hardware definitions of the EBSA-110. -*/ -#ifndef CORE_H -#define CORE_H - -/* Physical addresses/sizes */ -#define ISAMEM_PHYS 0xe0000000 -#define ISAMEM_SIZE 0x10000000 - -#define ISAIO_PHYS 0xf0000000 -#define ISAIO_SIZE PGDIR_SIZE - -#define TRICK0_PHYS 0xf2000000 -#define TRICK0_SIZE PGDIR_SIZE -#define TRICK1_PHYS 0xf2400000 -#define TRICK1_SIZE PGDIR_SIZE -#define TRICK2_PHYS 0xf2800000 -#define TRICK3_PHYS 0xf2c00000 -#define TRICK3_SIZE PGDIR_SIZE -#define TRICK4_PHYS 0xf3000000 -#define TRICK4_SIZE PGDIR_SIZE -#define TRICK5_PHYS 0xf3400000 -#define TRICK6_PHYS 0xf3800000 -#define TRICK7_PHYS 0xf3c00000 - -/* Virtual addresses */ -#define PIT_BASE IOMEM(0xfc000000)/* trick 0 */ -#define SOFT_BASE IOMEM(0xfd000000)/* trick 1 */ -#define IRQ_MASK IOMEM(0xfe000000)/* trick 3 - read */ -#define IRQ_MSET IOMEM(0xfe000000)/* trick 3 - write */ -#define IRQ_STAT IOMEM(0xff000000)/* trick 4 - read */ -#define IRQ_MCLR IOMEM(0xff000000)/* trick 4 - write */ - -#endif
arch/arm/mach-ebsa110/include/mach/entry-macro.S deleted +0 -33
@@ -1,33 +0,0 @@ -/* - * arch/arm/mach-ebsa110/include/mach/entry-macro.S - * - * Low-level IRQ helper macros for ebsa110 platform. - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - - - -#define IRQ_STAT 0xff000000 /* read */ - - .macro get_irqnr_preamble, base, tmp - mov \base, #IRQ_STAT - .endm - - .macro get_irqnr_and_base, irqnr, stat, base, tmp - ldrb \stat, [\base] @ get interrupts - mov \irqnr, #0 - tst \stat, #15 - addeq \irqnr, \irqnr, #4 - moveq \stat, \stat, lsr #4 - tst \stat, #3 - addeq \irqnr, \irqnr, #2 - moveq \stat, \stat, lsr #2 - tst \stat, #1 - addeq \irqnr, \irqnr, #1 - moveq \stat, \stat, lsr #1 - tst \stat, #1 @ bit 0 should be set - .endm -
arch/arm/mach-ebsa110/include/mach/hardware.h deleted +0 -21
@@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* arch/arm/mach-ebsa110/include/mach/hardware.h -* -* Copyright (C) 1996-2000 Russell King. -* -* This file contains the hardware definitions of the EBSA-110. -*/ -#ifndef __ASM_ARCH_HARDWARE_H -#define __ASM_ARCH_HARDWARE_H - -#define ISAMEM_BASE 0xe0000000 -#define ISAIO_BASE 0xf0000000 - -/* -* RAM definitions -*/ -#define UNCACHEABLE_ADDR 0xff000000/* IRQ_STAT */ - -#endif -
arch/arm/mach-ebsa110/include/mach/io.h deleted +0 -89
89 lines not on this page · raw message
arch/arm/mach-ebsa110/include/mach/irqs.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* arch/arm/mach-ebsa110/include/mach/irqs.h -* -* Copyright (C) 1996 Russell King -*/ - -#define NR_IRQS 8 - -#define IRQ_EBSA110_PRINTER 0 -#define IRQ_EBSA110_COM1 1 -#define IRQ_EBSA110_COM2 2 -#define IRQ_EBSA110_ETHERNET 3 -#define IRQ_EBSA110_TIMER0 4 -#define IRQ_EBSA110_TIMER1 5 -#define IRQ_EBSA110_PCMCIA 6 -#define IRQ_EBSA110_IMMEDIATE 7
arch/arm/mach-ebsa110/include/mach/memory.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* arch/arm/mach-ebsa110/include/mach/memory.h -* -* Copyright (C) 1996-1999 Russell King. -* -* Changelog: -* 20-Oct-1996 RMK Created -* 31-Dec-1997 RMK Fixed definitions to reduce warnings -* 21-Mar-1999 RMK Renamed to memory.h -* RMK Moved TASK_SIZE and PAGE_OFFSET here -*/ -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H - -/* -* Cache flushing area - SRAM -*/ -#define FLUSH_BASE_PHYS 0x40000000 -#define FLUSH_BASE 0xdf000000 - -#endif
arch/arm/mach-ebsa110/include/mach/uncompress.h deleted +0 -40
@@ -1,41 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* arch/arm/mach-ebsa110/include/mach/uncompress.h -* -* Copyright (C) 1996,1997,1998 Russell King -*/ - -#include <linux/serial_reg.h> - -#define SERIAL_BASE ((unsigned char *)0xf0000be0) - -/* -* This does not append a newline -*/ -static inline void putc (int c) -{ -unsigned char v, *base =SERIAL_BASE ; - -do { - v = base[UART_LSR <<2 ]; -barrier (); - }while (!(v &UART_LSR_THRE )); - - base[UART_TX <<2 ] = c; -} - -static inline void flush (void ) -{ -unsigned char v, *base =SERIAL_BASE ; - -do { - v = base[UART_LSR <<2 ]; -barrier (); - } while ((v & (UART_LSR_TEMT|UART_LSR_THRE)) !- (UART_LSR_TEMT|UART_LSR_THRE)); -} - -/* -* nothing to do -*/ -#define arch_decomp_setup ()
arch/arm/mach-ebsa110/io.c deleted +0 -440
440 lines not on this page · raw message
arch/arm/mach-ebsa110/leds.c deleted +0 -71
71 lines not on this page · raw message
drivers/watchdog/Kconfig +1 -1
@@ -599,7 +599,7 @@ config K3_RTI_WATCHDOG config ORION_WATCHDOG tristate "Orion watchdog" - depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU || (COMPILE_TEST && !ARCH_EBSA110) + depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU || COMPILE_TEST depends on ARM select WATCHDOG_CORE help
Signature · 1 line
2.27.0
kernel test robot
build botRe: [PATCH v2 01/15] ARM: remove ebsa110 platform
I love your patch! Yet something to improve:
Hi Arnd,
I love your patch! Yet something to improve:
[auto build test ERROR on arm/for-next]
[also build test ERROR on m68knommu/for-next linus/master v5.10-rc1 next-20201030] [cannot apply to m68k/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Arnd-Bergmann/timers-clean-up-ARCH_GETTIMEOFFSET-LEGACY_TIMER_TICK/20201031-222238 base: git://git.armlinux.org.uk/~rmk/linux-arm.git for-next config: arm-h3600_defconfig compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/932488e866e4dfed64c8d2876d2f8881cfbcde6c
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Arnd-Bergmann/timers-clean-up-ARCH_GETTIMEOFFSET-LEGACY_TIMER_TICK/20201031-222238 git checkout 932488e866e4dfed64c8d2876d2f8881cfbcde6c
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm h3600_defconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> arch/arm/Kconfig:272: syntax error
arch/arm/Kconfig:271: invalid statement arch/arm/Kconfig:272: invalid statement arch/arm/Kconfig:273: invalid statement arch/arm/Kconfig:274: invalid statement arch/arm/Kconfig:275: invalid statement arch/arm/Kconfig:276: unknown statement "Please" arch/arm/Kconfig:277:warning: ignoring unsupported character '.' arch/arm/Kconfig:277: unknown statement "location" make[2]: *** [scripts/kconfig/Makefile:88: h3600_defconfig] Error 1 make[1]: *** [Makefile:604: h3600_defconfig] Error 2
make: *** [Makefile:185: __sub-make] Error 2
make: Target 'h3600_defconfig' not remade because of errors.
--
>> arch/arm/Kconfig:272: syntax error
arch/arm/Kconfig:271: invalid statement arch/arm/Kconfig:272: invalid statement arch/arm/Kconfig:273: invalid statement arch/arm/Kconfig:274: invalid statement arch/arm/Kconfig:275: invalid statement arch/arm/Kconfig:276: unknown statement "Please" arch/arm/Kconfig:277:warning: ignoring unsupported character '.' arch/arm/Kconfig:277: unknown statement "location" make[2]: *** [scripts/kconfig/Makefile:71: oldconfig] Error 1 make[1]: *** [Makefile:604: oldconfig] Error 2
make: *** [Makefile:185: __sub-make] Error 2
make: Target 'oldconfig' not remade because of errors.
--
>> arch/arm/Kconfig:272: syntax error
arch/arm/Kconfig:271: invalid statement arch/arm/Kconfig:272: invalid statement arch/arm/Kconfig:273: invalid statement arch/arm/Kconfig:274: invalid statement arch/arm/Kconfig:275: invalid statement arch/arm/Kconfig:276: unknown statement "Please" arch/arm/Kconfig:277:warning: ignoring unsupported character '.' arch/arm/Kconfig:277: unknown statement "location" make[2]: *** [scripts/kconfig/Makefile:71: olddefconfig] Error 1 make[1]: *** [Makefile:604: olddefconfig] Error 2
make: *** [Makefile:185: __sub-make] Error 2
make: Target 'olddefconfig' not remade because of errors.
vim +272 arch/arm/Kconfig
60460abffc7152 Seung-Woo Kim 2013-02-06 164 75e7153abd220f Ralf Baechle 2007-02-09 165 config SYS_SUPPORTS_APM_EMULATION 75e7153abd220f Ralf Baechle 2007-02-09 166 bool 75e7153abd220f Ralf Baechle 2007-02-09 167 bc581770cfdd8c Linus Walleij 2009-09-15 168 config HAVE_TCM bc581770cfdd8c Linus Walleij 2009-09-15 169 bool bc581770cfdd8c Linus Walleij 2009-09-15 170 select GENERIC_ALLOCATOR bc581770cfdd8c Linus Walleij 2009-09-15 171 e119bfff1f102f Russell King 2010-01-10 172 config HAVE_PROC_CPU e119bfff1f102f Russell King 2010-01-10 173 bool e119bfff1f102f Russell King 2010-01-10 174 ce816fa88cca08 Uwe Kleine-König 2014-04-07 175 config NO_IOPORT_MAP 5ea81769940034 Al Viro 2007-02-11 176 bool 5ea81769940034 Al Viro 2007-02-11 177 ^1da177e4c3f41 Linus Torvalds 2005-04-16 178 config SBUS ^1da177e4c3f41 Linus Torvalds 2005-04-16 179 bool ^1da177e4c3f41 Linus Torvalds 2005-04-16 180 f16fb1ecc5a1cb Russell King 2007-04-28 181 config STACKTRACE_SUPPORT f16fb1ecc5a1cb Russell King 2007-04-28 182 bool f16fb1ecc5a1cb Russell King 2007-04-28 183 default y f16fb1ecc5a1cb Russell King 2007-04-28 184 f16fb1ecc5a1cb Russell King 2007-04-28 185 config LOCKDEP_SUPPORT f16fb1ecc5a1cb Russell King 2007-04-28 186 bool f16fb1ecc5a1cb Russell King 2007-04-28 187 default y f16fb1ecc5a1cb Russell King 2007-04-28 188 7ad1bcb25c5623 Russell King 2006-08-27 189 config TRACE_IRQFLAGS_SUPPORT 7ad1bcb25c5623 Russell King 2006-08-27 190 bool cb1293e2f59455 Arnd Bergmann 2015-05-26 191 default !CPU_V7M 7ad1bcb25c5623 Russell King 2006-08-27 192 f0d1b0b30d250a David Howells 2006-12-08 193 config ARCH_HAS_ILOG2_U32 f0d1b0b30d250a David Howells 2006-12-08 194 bool f0d1b0b30d250a David Howells 2006-12-08 195 f0d1b0b30d250a David Howells 2006-12-08 196 config ARCH_HAS_ILOG2_U64 f0d1b0b30d250a David Howells 2006-12-08 197 bool f0d1b0b30d250a David Howells 2006-12-08 198 4a1b573346ee0d Eduardo Valentin 2013-06-13 199 config ARCH_HAS_BANDGAP 4a1b573346ee0d Eduardo Valentin 2013-06-13 200 bool 4a1b573346ee0d Eduardo Valentin 2013-06-13 201 a5f4c561b3b19a Stefan Agner 2015-08-13 202 config FIX_EARLYCON_MEM a5f4c561b3b19a Stefan Agner 2015-08-13 203 def_bool y if MMU a5f4c561b3b19a Stefan Agner 2015-08-13 204 b89c3b165fbec6 Akinobu Mita 2006-03-26 205 config GENERIC_HWEIGHT b89c3b165fbec6 Akinobu Mita 2006-03-26 206 bool b89c3b165fbec6 Akinobu Mita 2006-03-26 207 default y b89c3b165fbec6 Akinobu Mita 2006-03-26 208 ^1da177e4c3f41 Linus Torvalds 2005-04-16 209 config GENERIC_CALIBRATE_DELAY ^1da177e4c3f41 Linus Torvalds 2005-04-16 210 bool ^1da177e4c3f41 Linus Torvalds 2005-04-16 211 default y ^1da177e4c3f41 Linus Torvalds 2005-04-16 212 a08b6b7968e7a6 Al Viro 2005-09-06 213 config ARCH_MAY_HAVE_PC_FDC a08b6b7968e7a6 Al Viro 2005-09-06 214 bool a08b6b7968e7a6 Al Viro 2005-09-06 215 5ac6da669e2476 Christoph Lameter 2007-02-10 216 config ZONE_DMA 5ac6da669e2476 Christoph Lameter 2007-02-10 217 bool 5ac6da669e2476 Christoph Lameter 2007-02-10 218 c7edc9e326d53c David A. Long 2014-03-07 219 config ARCH_SUPPORTS_UPROBES c7edc9e326d53c David A. Long 2014-03-07 220 def_bool y c7edc9e326d53c David A. Long 2014-03-07 221 58af4a244fa9f7 Rob Herring 2012-03-20 222 config ARCH_HAS_DMA_SET_COHERENT_MASK 58af4a244fa9f7 Rob Herring 2012-03-20 223 bool 58af4a244fa9f7 Rob Herring 2012-03-20 224 ^1da177e4c3f41 Linus Torvalds 2005-04-16 225 config GENERIC_ISA_DMA ^1da177e4c3f41 Linus Torvalds 2005-04-16 226 bool ^1da177e4c3f41 Linus Torvalds 2005-04-16 227 ^1da177e4c3f41 Linus Torvalds 2005-04-16 228 config FIQ ^1da177e4c3f41 Linus Torvalds 2005-04-16 229 bool ^1da177e4c3f41 Linus Torvalds 2005-04-16 230 13a5045d4ee5a2 Rob Herring 2012-02-07 231 config NEED_RET_TO_USER 13a5045d4ee5a2 Rob Herring 2012-02-07 232 bool 13a5045d4ee5a2 Rob Herring 2012-02-07 233 034d2f5af1b976 Al Viro 2005-12-19 234 config ARCH_MTD_XIP 034d2f5af1b976 Al Viro 2005-12-19 235 bool 034d2f5af1b976 Al Viro 2005-12-19 236 dc21af99fadcfa Russell King 2011-01-04 237 config ARM_PATCH_PHYS_VIRT c1becedc887164 Russell King 2011-08-10 238 bool "Patch physical to virtual translations at runtime" if EMBEDDED c1becedc887164 Russell King 2011-08-10 239 default y b511d75d615089 Nicolas Pitre 2011-02-21 240 depends on !XIP_KERNEL && MMU dc21af99fadcfa Russell King 2011-01-04 241 help 111e9a5ce66e64 Russell King 2011-05-12 242 Patch phys-to-virt and virt-to-phys translation functions at 111e9a5ce66e64 Russell King 2011-05-12 243 boot and module load time according to the position of the 111e9a5ce66e64 Russell King 2011-05-12 244 kernel in system memory. dc21af99fadcfa Russell King 2011-01-04 245 111e9a5ce66e64 Russell King 2011-05-12 246 This can only be used with non-XIP MMU kernels where the base daece59689e76e Nicolas Pitre 2011-08-12 247 of physical memory is at a 16MB boundary. dc21af99fadcfa Russell King 2011-01-04 248 c1becedc887164 Russell King 2011-08-10 249 Only disable this option if you know that you do not require c1becedc887164 Russell King 2011-08-10 250 this feature (eg, building a kernel for a single machine) and c1becedc887164 Russell King 2011-08-10 251 you need to shrink the kernel to the minimal size. dc21af99fadcfa Russell King 2011-01-04 252 c334bc150524f8 Rob Herring 2012-03-04 253 config NEED_MACH_IO_H c334bc150524f8 Rob Herring 2012-03-04 254 bool c334bc150524f8 Rob Herring 2012-03-04 255 help c334bc150524f8 Rob Herring 2012-03-04 256 Select this when mach/io.h is required to provide special c334bc150524f8 Rob Herring 2012-03-04 257 definitions for this platform. The need for mach/io.h should c334bc150524f8 Rob Herring 2012-03-04 258 be avoided when possible. c334bc150524f8 Rob Herring 2012-03-04 259 0cdc8b921d6881 Nicolas Pitre 2011-09-02 260 config NEED_MACH_MEMORY_H 1b9f95f8ade9ef Nicolas Pitre 2011-07-05 261 bool 1b9f95f8ade9ef Nicolas Pitre 2011-07-05 262 help 0cdc8b921d6881 Nicolas Pitre 2011-09-02 263 Select this when mach/memory.h is required to provide special 0cdc8b921d6881 Nicolas Pitre 2011-09-02 264 definitions for this platform. The need for mach/memory.h should 0cdc8b921d6881 Nicolas Pitre 2011-09-02 265 be avoided when possible. 1b9f95f8ade9ef Nicolas Pitre 2011-07-05 266 1b9f95f8ade9ef Nicolas Pitre 2011-07-05 267 config PHYS_OFFSET 974c07249b06d9 Nicolas Pitre 2011-12-02 268 hex "Physical address of main memory" if MMU c6f54a9b396260 Uwe Kleine-König 2014-07-23 269 depends on !ARM_PATCH_PHYS_VIRT 974c07249b06d9 Nicolas Pitre 2011-12-02 270 default DRAM_BASE if !MMU 932488e866e4df Arnd Bergmann 2020-10-30 271 default 0x00000000 ARCH_FOOTBRIDGE c6f54a9b396260 Uwe Kleine-König 2014-07-23 @272 default 0x10000000 if ARCH_OMAP1 || ARCH_RPC c6f54a9b396260 Uwe Kleine-König 2014-07-23 273 default 0x20000000 if ARCH_S5PV210 b8824c9a54bb38 H Hartley Sweeten 2015-06-15 274 default 0xc0000000 if ARCH_SA1100 111e9a5ce66e64 Russell King 2011-05-12 275 help 1b9f95f8ade9ef Nicolas Pitre 2011-07-05 276 Please provide the physical address corresponding to the 1b9f95f8ade9ef Nicolas Pitre 2011-07-05 277 location of main memory in your system. cada3c0841e1de Russell King 2011-01-04 278
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v2 2/15 net: remove am79c961a driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
This driver was only used on the EBSA110 platform, which is now getting removed, so the driver is no longer needed either.
--- 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 ----- 4 files changed, 1 insertion(+), 916 deletions(-) delete mode 100644 drivers/net/ethernet/amd/am79c961a.c delete mode 100644 drivers/net/ethernet/amd/am79c961a.h
drivers/net/ethernet/amd/Kconfig +1 -9
@@ -8,7 +8,7 @@ config NET_VENDOR_AMD default y depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \ SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \ - (ARM && ARCH_EBSA110) || ISA || EISA || PCMCIA || ARM64 + ISA || EISA || PCMCIA || ARM64 help If you have a network (Ethernet) chipset belonging to this class, say Y.
@@ -75,14 +75,6 @@ config ARIADNE To compile this driver as a module, choose M here: the module will be called ariadne. -config ARM_AM79C961A - bool "ARM EBSA110 AM79C961A support" - depends on ARM && ARCH_EBSA110 - select CRC32 - help - If you wish to compile a kernel for the EBSA-110, then you should - always answer Y to this. - config ATARILANCE tristate "Atari LANCE support" depends on ATARI
drivers/net/ethernet/amd/Makefile +0 -1
@@ -5,7 +5,6 @@ obj-$(CONFIG_A2065) += a2065.o obj-$(CONFIG_AMD8111_ETH) += amd8111e.o -obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o obj-$(CONFIG_ARIADNE) += ariadne.o obj-$(CONFIG_ATARILANCE) += atarilance.o obj-$(CONFIG_DECLANCE) += declance.o
drivers/net/ethernet/amd/am79c961a.c deleted +0 -762
762 lines not on this page · raw message
drivers/net/ethernet/amd/am79c961a.h deleted +0 -143
143 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v2 3/15 timekeeping: remove arch_gettimeoffset
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
With Arm EBSA110 gone, nothing uses it any more, so the corresponding code and the Kconfig option can be removed.
--- .../time/modern-timekeeping/arch-support.txt | 33 ------------------- drivers/Makefile | 2 -- drivers/clocksource/Kconfig | 2 +- include/linux/time.h | 13 -------- kernel/time/Kconfig | 9 ----- kernel/time/clocksource.c | 8 ----- kernel/time/timekeeping.c | 25 +------------- kernel/trace/Kconfig | 2 -- 8 files changed, 2 insertions(+), 92 deletions(-) delete mode 100644 Documentation/features/time/modern-timekeeping/arch-support.txt
Documentation/features/time/modern-timekeeping/arch-support.txt deleted +0 -33
@@ -1,33 +0,0 @@ -# -# Feature name: modern-timekeeping -# Kconfig: !ARCH_USES_GETTIMEOFFSET -# description: arch does not use arch_gettimeoffset() anymore -# - ----------------------- - | arch |status| - ----------------------- - | alpha: | ok | - | arc: | ok | - | arm: | TODO | - | arm64: | ok | - | c6x: | ok | - | csky: | ok | - | h8300: | ok | - | hexagon: | ok | - | ia64: | ok | - | m68k: | ok | - | microblaze: | ok | - | mips: | ok | - | nds32: | ok | - | nios2: | ok | - | openrisc: | ok | - | parisc: | ok | - | powerpc: | ok | - | riscv: | ok | - | s390: | ok | - | sh: | ok | - | sparc: | ok | - | um: | ok | - | x86: | ok | - | xtensa: | ok | - -----------------------
drivers/Makefile +0 -2
@@ -135,9 +135,7 @@ obj-$(CONFIG_INFINIBAND) += infiniband/ obj-y += firmware/ obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_SUPERH) += sh/ -ifndef CONFIG_ARCH_USES_GETTIMEOFFSET obj-y += clocksource/ -endif obj-$(CONFIG_DCA) += dca/ obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_PPC_PS3) += ps3/
drivers/clocksource/Kconfig +1 -1
@@ -563,7 +563,7 @@ config CLKSRC_QCOM config CLKSRC_VERSATILE bool "ARM Versatile (Express) reference platforms clock source" if COMPILE_TEST - depends on GENERIC_SCHED_CLOCK && !ARCH_USES_GETTIMEOFFSET + depends on GENERIC_SCHED_CLOCK select TIMER_OF default y if (ARCH_VEXPRESS || ARCH_VERSATILE) && ARM help
include/linux/time.h +0 -13
@@ -21,19 +21,6 @@ extern time64_t mktime64(const unsigned int year, const unsigned int mon, const unsigned int day, const unsigned int hour, const unsigned int min, const unsigned int sec); -/* Some architectures do not supply their own clocksource. -* This is mainly the case in architectures that get their -* inter-tick times by reading the counter on their interval -* timer. Since these timers wrap every tick, they're not really -* useful as clocksources. Wrapping them to act like one is possible -* but not very efficient. So we provide a callout these arches -* can implement for use with the jiffies clocksource to provide -* finer then tick granular time. -*/ -#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET -extern u32 (*arch_gettimeoffset)(void ); -#endif -#ifdef CONFIG_POSIX_TIMERS extern void clear_itimer (void );#else
kernel/time/Kconfig +0 -9
@@ -26,10 +26,6 @@ config CLOCKSOURCE_VALIDATE_LAST_CYCLE config GENERIC_TIME_VSYSCALL bool -# Old style timekeeping -config ARCH_USES_GETTIMEOFFSET - bool - # The generic clock events infrastructure config GENERIC_CLOCKEVENTS bool
@@ -72,7 +68,6 @@ config TICK_ONESHOT config NO_HZ_COMMON bool - depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS select TICK_ONESHOT choice
@@ -87,7 +82,6 @@ config HZ_PERIODIC config NO_HZ_IDLE bool "Idle dynticks system (tickless idle)" - depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS select NO_HZ_COMMON help This option enables a tickless idle system: timer interrupts
@@ -99,7 +93,6 @@ config NO_HZ_IDLE config NO_HZ_FULL bool "Full dynticks system (tickless)" # NO_HZ_COMMON dependency - depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS # We need at least one periodic CPU for timekeeping depends on SMP depends on HAVE_CONTEXT_TRACKING
@@ -158,7 +151,6 @@ config CONTEXT_TRACKING_FORCE config NO_HZ bool "Old Idle dynticks config" - depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS help This is the old config entry that enables dynticks idle. We keep it around for a little while to enforce backward
@@ -166,7 +158,6 @@ config NO_HZ config HIGH_RES_TIMERS bool "High Resolution Timer Support" - depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS select TICK_ONESHOT help This option enables high resolution timer support. If your
kernel/time/clocksource.c +0 -8
@@ -705,8 +705,6 @@ static inline void clocksource_update_max_deferment(struct clocksource *cs) &cs->max_cycles); } -#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET -static struct clocksource *clocksource_find_best (bool oneshot,bool skipcur) {struct clocksource *cs;
@@ -798,12 +796,6 @@ static void clocksource_select_fallback(void)__clocksource_select (true); } -#else /* !CONFIG_ARCH_USES_GETTIMEOFFSET */ -static inline void clocksource_select (void ) { } -static inline void clocksource_select_fallback (void ) { } - -#endif -/* * clocksource_done_booting - Called near the end of core bootup *
kernel/time/timekeeping.c +1 -24
@@ -369,13 +369,6 @@ static void tk_setup_internals(struct timekeeper *tk, struct clocksource *clock)/* Timekeeper helper functions. */ -#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET -static u32 default_arch_gettimeoffset (void ) {return 0 ; } -u32 (*arch_gettimeoffset)(void) = default_arch_gettimeoffset; -#else -static inline u32 arch_gettimeoffset (void ) {return 0 ; } -#endif -static inline u64 timekeeping_delta_to_ns (const struct tk_read_base *tkr,u64 delta) {u64 nsec;
@@ -383,8 +376,7 @@ static inline u64 timekeeping_delta_to_ns(const struct tk_read_base *tkr, u64 de nsec = delta * tkr->mult + tkr->xtime_nsec; nsec >>= tkr->shift; -/* If arch requires, add in get_arch_timeoffset() */ -return nsec +arch_gettimeoffset (); +return nsec; }static inline u64 timekeeping_get_ns (const struct tk_read_base *tkr)
@@ -778,16 +770,8 @@ static void timekeeping_forward_now(struct timekeeper *tk) tk->tkr_raw.cycle_last = cycle_now; tk->tkr_mono.xtime_nsec += delta * tk->tkr_mono.mult; - -/* If arch requires, add in get_arch_timeoffset() */ - tk->tkr_mono.xtime_nsec += (u64 )arch_gettimeoffset () << tk->tkr_mono.shift; - - tk->tkr_raw.xtime_nsec += delta * tk->tkr_raw.mult; -/* If arch requires, add in get_arch_timeoffset() */ - tk->tkr_raw.xtime_nsec += (u64 )arch_gettimeoffset () << tk->tkr_raw.shift; -tk_normalize_xtime (tk); }
@@ -2133,19 +2117,12 @@ static void timekeeping_advance(enum timekeeping_adv_mode mode)if (unlikely (timekeeping_suspended)) goto out; -#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET - offset = real_tk->cycle_interval; - -if (mode !=TK_ADV_TICK ) - goto out; -#else offset =clocksource_delta (tk_clock_read (&tk->tkr_mono), tk->tkr_mono.cycle_last, tk->tkr_mono.mask);/* Check if there's really nothing to do */ if (offset < real_tk->cycle_interval && mode =TK_ADV_TICK ) goto out; -#endif /* Do some additional sanity checking */ timekeeping_check_update (tk, offset);
kernel/trace/Kconfig +0 -2
@@ -253,7 +253,6 @@ config IRQSOFF_TRACER bool "Interrupts-off Latency Tracer" default n depends on TRACE_IRQFLAGS_SUPPORT - depends on !ARCH_USES_GETTIMEOFFSET select TRACE_IRQFLAGS select GENERIC_TRACER select TRACER_MAX_TRACE
@@ -277,7 +276,6 @@ config IRQSOFF_TRACER config PREEMPT_TRACER bool "Preemption-off Latency Tracer" default n - depends on !ARCH_USES_GETTIMEOFFSET depends on PREEMPTION select GENERIC_TRACER select TRACER_MAX_TRACE
Signature · 1 line
2.27.0
PATCH v2 4/15 timekeeping: add CONFIG_LEGACY_TIMER_TICK
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
All platforms that currently do not use generic clockevents roughly call the same set of functions in their timer interrupts: xtime_update(), update_process_times() and profile_tick(), sometimes in a different sequence.
Add a helper function that performs all three of them, to make the callers more uniform and simplify the interface.
--- include/linux/timekeeping.h | 1 + kernel/time/Kconfig | 7 +++++++ kernel/time/Makefile | 1 + kernel/time/tick-legacy.c | 19 +++++++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 kernel/time/tick-legacy.c
include/linux/timekeeping.h +1 -0
@@ -12,6 +12,7 @@ extern int timekeeping_suspended;/* Architecture timer tick functions: */ extern void update_process_times (int user);extern void xtime_update (unsigned long ticks); +extern void legacy_timer_tick (unsigned long ticks);/* * Get and set timeofday
kernel/time/Kconfig +7 -0
@@ -57,6 +57,13 @@ config POSIX_CPU_TIMERS_TASK_WORK bool default y if POSIX_TIMERS && HAVE_POSIX_CPU_TIMERS_TASK_WORK +config LEGACY_TIMER_TICK + bool + help + The legacy timer tick helper is used by platforms that + lack support for the generic clockevent framework. + New platforms should use generic clockevents instead. + if GENERIC_CLOCKEVENTS menu "Timers subsystem"
kernel/time/Makefile +1 -0
@@ -16,6 +16,7 @@ ifeq ($(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST),y) endif obj-$(CONFIG_GENERIC_SCHED_CLOCK) += sched_clock.o obj-$(CONFIG_TICK_ONESHOT) += tick-oneshot.o tick-sched.o +obj-$(CONFIG_LEGACY_TIMER_TICK) += tick-legacy.o obj-$(CONFIG_HAVE_GENERIC_VDSO) += vsyscall.o obj-$(CONFIG_DEBUG_FS) += timekeeping_debug.o obj-$(CONFIG_TEST_UDELAY) += test_udelay.o
kernel/time/tick-legacy.c new file +19 -0
@@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Timer tick function for architectures that lack generic clockevents, +* consolidated here from m68k/ia64/parisc/arm. +*/ + +#include <linux/irq.h> +#include <linux/profile.h> +#include <linux/timekeeper_internal.h> + +#include "tick-internal.h" + +void legacy_timer_tick (unsigned long ticks) +{ +if (ticks) +xtime_update (ticks); +update_process_times (user_mode (get_irq_regs ())); +profile_tick (CPU_PROFILING ); +}
Signature · 1 line
2.27.0
PATCH v2 5/15 ia64: convert to legacy_timer_tick
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
ia64 is the only architecture that calls xtime_update() in a loop, once for each jiffie that has passed since the last event.
Before commit 3171a0305d62 ("[PATCH] simplify update_times (avoid jiffies/jiffies_64 aliasing problem)") in 2006, it could not actually do this any differently, but now it seems simpler to just pass the number of jiffies that passed in the meantime.
While this loses the ability process interrupts in the middle of the timer tick by calling local_irq_enable(), doing so is fairly peculiar anyway and it seems better to just do what everyone else does here.
--- arch/ia64/Kconfig | 1 + arch/ia64/kernel/time.c | 36 +++++++++++++----------------------- 2 files changed, 14 insertions(+), 23 deletions(-)
arch/ia64/Kconfig +1 -0
@@ -46,6 +46,7 @@ config IA64 select ARCH_THREAD_STACK_ALLOCATOR select ARCH_CLOCKSOURCE_DATA select GENERIC_TIME_VSYSCALL + select LEGACY_TIMER_TICK select SWIOTLB select SYSCTL_ARCH_UNALIGN_NO_WARN select HAVE_MOD_ARCH_SPECIFIC
arch/ia64/kernel/time.c +13 -23
@@ -161,39 +161,29 @@ void vtime_account_idle(struct task_struct *tsk)static irqreturn_t timer_interrupt (int irq,void *dev_id) { -unsigned long new_itm; +unsigned long cur_itm, new_itm, ticks;if (cpu_is_offline (smp_processor_id ())) {return IRQ_HANDLED ; } new_itm = local_cpu_data->itm_next; + cur_itm =ia64_get_itc (); -if (!time_after (ia64_get_itc (), new_itm)) +if (!time_after (cur_itm, new_itm)) {printk (KERN_ERR "Oops: timer tick before it's due (itc=%lx,itm=%lx)\n" , -ia64_get_itc (), new_itm); - -profile_tick (CPU_PROFILING ); - -while (1 ) { -update_process_times (user_mode (get_irq_regs ())); - - new_itm += local_cpu_data->itm_delta; - -if (smp_processor_id () = time_keeper_id) -xtime_update (1 ); - - local_cpu_data->itm_next = new_itm; + cur_itm, new_itm); + ticks =1 ; + }else { + ticks =DIV_ROUND_UP (cur_itm - new_itm, + local_cpu_data->itm_delta); + new_itm += ticks * local_cpu_data->itm_delta; + } -if (time_after (new_itm,ia64_get_itc ())) -break ; +if (smp_processor_id () != time_keeper_id) + ticks =0 ; -/* -* Allow IPIs to interrupt the timer loop. -*/ -local_irq_enable (); -local_irq_disable (); - } +legacy_timer_tick (ticks); do { /*
Signature · 1 line
2.27.0
John Paul Adrian Glaubitz
maintainerRe: [PATCH v2 05/15] ia64: convert to legacy_timer_tick
Hi Arnd!
Quoted 8 lines · Arnd Bergmann
ia64 is the only architecture that calls
xtime_update()in a loop, once for each jiffie that has passed since the last event.Before commit
3171a0305d62("[PATCH] simplifyupdate_times(avoid jiffies/jiffies_64 aliasing problem)") in 2006, it could not actually do this any differently, but now it seems simpler to just pass the number of jiffies that passed in the meantime.
Quoted 4 lines
While this loses the ability process interrupts in the middle of the timer tick by calling
local_irq_enable(), doing so is fairly peculiar anyway and it seems better to just do what everyone else does here.
This broke the hpsa block device driver on my HP RX2600.
I'm seeing this backtrace now:
[ 905.883273] usb 1-2: SerialNumber: A60020000001
[ 905.918170] sda: sda1 sda2 sda3
[ 905.920107] sd 0:1:0:0: [sda] Attached SCSI disk
[ 905.944102] usb-storage 1-2:1.0: USB Mass Storage device detected
[ 905.944102] scsi host1: usb-storage 1-2:1.0
[ 905.944102] usbcore: registered new interface driver usb-storage
[ 905.944117] usbcore: registered new interface driver uas
[ 905.948117] scsi 1:0:0:0: CD-ROM TEAC DV-W28EAW H.0C PQ: 0 ANSI: 0
[ 905.952013] usb 2-1: new full-speed USB device number 2 using ohci-pci
[ 905.956102] sr 1:0:0:0: Power-on or device reset occurred
[ 905.968107] sr 1:0:0:0: [sr0] scsi3-mmc drive: 24x/24x writer cd/rw xa/form2 cdda tray
[ 905.968107] cdrom: Uniform CD-ROM driver Revision: 3.20
[ 906.028013] ioc0: LSISAS1068 B0: Capabilities={Initiator}
[ 906.028110] tg3 0000:01:02.0 eth0: Tigon3 [partno(BCM95700A6) rev 2100] (PCIX:66MHz:64-bit) MAC address 00:17:a4:99:2d:09
[ 906.026167] usb 2-1: New USB device found, idVendorf0, idProduct26, bcdDevice= 0.01
[ 906.028110] tg3 0000:01:02.0 eth0: attached PHY is 5704 (10/100/1000Base-T Ethernet) (WireSpeed[1], EEE[0])
[ 906.028110] tg3 0000:01:02.0 eth0: RXcsums[1] LinkChgREG[0] MIirq[0] ASF[0] TSOcap[1]
[ 906.030214] usb 2-1: New USB device strings: Mfr=1, Product=2, SerialNumberc
[ 906.032240] tg3 0000:01:02.0 eth0: dma_rwctrl[769f0000] dma_mask[64-bit]
[ 906.036102] GSI 30 (level, low) -> CPU 2 (0x0200) vector 67
[ 906.034186] usb 2-1: Product: Virtual Management Device
[ 906.038235] usb 2-1: Manufacturer: HP
[ 906.040017] usb 2-1: SerialNumber: 0017a499dd1c
[ 906.056108] hid: raw HID events driver (C) Jiri Kosina
[ 906.080013] usbcore: registered new interface driver usbhid
[ 906.080013] usbhid: USB HID core driver
[ 906.080107] input: HP Virtual Management Device as /devices/pci0000:00/0000:00:02.0/usb2/2-1/2-1:1.0/0003:03F0:1126.0001/input/input2
[ 906.088110] hid-generic 0003:03F0:1126.0001: input,hidraw0: USB HID v1.11 Keyboard [HP Virtual Management Device] on usb-0000:00:02.0-1/input0
[ 906.088110] input: HP Virtual Management Device as /devices/pci0000:00/0000:00:02.0/usb2/2-1/2-1:1.1/0003:03F0:1126.0002/input/input3
[ 906.092110] hid-generic 0003:03F0:1126.0002: input,hidraw1: USB HID v1.01 Mouse [HP Virtual Management Device] on usb-0000:00:02.0-1/input1
[ 906.104104] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1
[ 906.108288] hpsa 0000:05:00.0: device is ready.
[ 906.108288] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1
[ 906.152107] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1
[ 906.170926] hpsa 0000:05:00.0: device is ready.
[ 906.170926] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1
[ 906.218925] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1
[ 906.222925] hpsa 0000:05:00.0: device is ready.
[ 906.222925] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1
[ 906.266926] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1
[ 906.272016] hpsa 0000:05:00.0: device is ready.
[ 906.272016] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1
[ 906.272107] scsi host2: ioc0: LSISAS1068 B0, FwRev0f0000h, Ports=1, MaxQQ1, IRQb
[ 906.324110] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1
[ 906.330925] hpsa 0000:05:00.0: device is ready.
[ 906.330925] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1
[ 906.378925] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1
[ 906.382926] hpsa 0000:05:00.0: device is ready.
[ 906.382926] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1
[ 906.386926] tg3 0000:01:02.1 eth1: Tigon3 [partno(BCM95700A6) rev 2100] (PCIX:66MHz:64-bit) MAC address 00:17:a4:99:2d:08
[ 906.386926] tg3 0000:01:02.1 eth1: attached PHY is 5704 (10/100/1000Base-T Ethernet) (WireSpeed[1], EEE[0])
[ 906.388016] tg3 0000:01:02.1 eth1: RXcsums[1] LinkChgREG[0] MIirq[0] ASF[0] TSOcap[1]
[ 906.388016] tg3 0000:01:02.1 eth1: dma_rwctrl[769f0000] dma_mask[64-bit]
[ 906.396108] tg3 0000:01:02.1 enp1s2f1: renamed from eth1
[ 906.408107] tg3 0000:01:02.0 enp1s2f0: renamed from eth0 Begin: Loading essential drivers ... done.
Begin: Running /scripts/init-premount ... done.
Begin: Mounting root file system ... Begin: Running /scripts/local-top ... done.
Begin: Running /scripts/local-premount ... done.
Begin: Will now check root file system ... fsck from util-linux 2.36 [/sbin/fsck.ext4 (1) -- /dev/sda2] fsck.ext4 -a -C0 /dev/sda2 /dev/sda2: clean, 317994/2068416 files, 6480495/8257536 blocks
[ 906.666923] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 906.670923] hpsa 0000:05:00.0: device is ready. [ 906.670923] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 done. [ 906.722166] rcu: INFO: rcu_sched detected stalls on CPUs/tasks: [ 906.722166] rcu: 2-....: (3 ticks this GP) idleþ6/1/0x4000000000000000 softirqi3/698 fqs=4 [ 906.722166] (detected by 0, ta15 jiffies, gF5, q€) [ 906.722166] Task dump for CPU 2: [ 906.722166] task:modprobe state:R running task stack: 0 pid: 162 ppid: 146 flags:0x00000002 [ 906.722166] [ 906.722166] Call Trace: [ 906.722166] [<0000000000000fd6>] 0xfd6 [ 906.722166] spà00010046d27c70 bspà00010046d20e80 [ 906.782168] rcu: INFO: rcu_sched detected stalls on CPUs/tasks: [ 906.782168] rcu: 2-....: (18 ticks this GP) idleþ6/1/0x4000000000000000 softirqi3/698 fqs [ 906.782168] (detected by 0, t"157 jiffies, gF5, q€) [ 906.782168] Task dump for CPU 2: [ 906.782168] task:modprobe state:R running task stack: 0 pid: 162 ppid: 146 flags:0x00000002 [ 906.782168] [ 906.782168] Call Trace: [ 906.782168] [<0000001d00000065>] 0x1d00000065 [ 906.782168] spà00010046d27c70 bspà00010046d20d48 [ 906.844107] EXT4-fs (sda2): mounted filesystem with ordered data mode. Opts: (null) done. Begin: Running /scripts/local-bottom ... done. Begin: Running /scripts/init-bottom ... done. [ 906.978917] Not activating Mandatory Access Control as /sbin/tomoyo-init does not exist. [ 907.726923] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 907.734923] hpsa 0000:05:00.0: device is ready. [ 907.734923] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 907.790923] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 907.802923] hpsa 0000:05:00.0: device is ready. [ 907.802923] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 907.860014] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 907.886923] hpsa 0000:05:00.0: device is ready. [ 907.886923] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 907.930923] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 907.942923] hpsa 0000:05:00.0: device is ready. [ 907.942923] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 907.976107] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 907.982923] hpsa 0000:05:00.0: device is ready. [ 907.982923] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 908.106923] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 908.110923] hpsa 0000:05:00.0: device is ready. [ 908.110923] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 908.256014] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 908.258922] hpsa 0000:05:00.0: device is ready. [ 908.258922] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 908.428014] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 908.434923] hpsa 0000:05:00.0: device is ready. [ 908.434923] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 908.710922] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 908.714922] hpsa 0000:05:00.0: device is ready. [ 908.714922] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 908.754922] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 908.758922] hpsa 0000:05:00.0: device is ready. [ 908.758922] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 908.788106] systemd[1]: Inserted module 'autofs4' [ 908.972107] systemd[1]: systemd 246.6-5 running in system mode. (+PAM +AUDIT +SELINUX +IMA +APPARMOR +SMACK +SYSVINIT +UTMP +LIBCRYPTSETUP +GCRYPT +GNUTLS +ACL +XZ +LZ4 +ZSTD -SECCOMP +BLKID +ELFUTILS +KMOD +IDN2 -IDN +PCRE2 default-hierarchy=hybrid) [ 908.976013] systemd[1]: Detected architecture ia64.
Welcome to Debian GNU/Linux bullseye/sid!
[ 909.020014] systemd[1]: Set hostname to <glendronach>. [ 909.178923] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 909.182922] hpsa 0000:05:00.0: device is ready. [ 909.182922] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 909.242922] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 909.254922] hpsa 0000:05:00.0: device is ready. [ 909.254922] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 909.322922] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 909.334922] hpsa 0000:05:00.0: device is ready. [ 909.334922] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 909.360108] INFO: task systemd-sysv-ge:200 blocked for more than 127 seconds. [ 909.360108] Not tainted 5.10.0+ #130 [ 909.360108] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 909.360108] task:systemd-sysv-ge state:D stack: 0 pid: 200 ppid: 189 flags:0x00000000 [ 909.364108] [ 909.364108] Call Trace: [ 909.364423] [<a00000010109b210>] __schedule+0x890/0x21e0 [ 909.364423] spà000100487d7b70 bspà000100487d1748 [ 909.368423] [<a00000010109cc00>] schedule+0xa0/0x240 [ 909.368423] spà000100487d7b90 bspà000100487d16e0 [ 909.368558] [<a00000010109ce70>] io_schedule+0x70/0xa0 [ 909.368558] spà000100487d7b90 bspà000100487d16c0 [ 909.372290] [<a00000010109e1c0>] bit_wait_io+0x20/0xe0 [ 909.372290] spà000100487d7b90 bspà000100487d1698 [ 909.374168] rcu: INFO: rcu_sched detected stalls on CPUs/tasks: [ 909.376290] [<a00000010109d860>] __wait_on_bit+0xc0/0x1c0 [ 909.376290] spà000100487d7b90 bspà000100487d1648 [ 909.374168] rcu: 3-....: (2 ticks this GP) idlee/1/0x4000000000000002 softirq81/1581 fqs=2 [ 909.374168] (detected by 0, tV61 jiffies, g89, q=3) [ 909.376290] [<a00000010109da80>] out_of_line_wait_on_bit+0x120/0x140 [ 909.376290] spà000100487d7b90 bspà000100487d1610 [ 909.374168] Task dump for CPU 3: [ 909.374168] task:khungtaskd state:R running task
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Re: [PATCH v2 05/15] ia64: convert to legacy_timer_tick
Quoted 12 lines · John Paul Adrian Glaubitz
Hi Arnd!
Quoted 8 lines · Arnd Bergmann
ia64 is the only architecture that calls
xtime_update()in a loop, once for each jiffie that has passed since the last event.Before commit
3171a0305d62("[PATCH] simplifyupdate_times(avoid jiffies/jiffies_64 aliasing problem)") in 2006, it could not actually do this any differently, but now it seems simpler to just pass the number of jiffies that passed in the meantime.
Quoted 6 lines
Quoted 4 lines
While this loses the ability process interrupts in the middle of the timer tick by calling
local_irq_enable(), doing so is fairly peculiar anyway and it seems better to just do what everyone else does here.This broke the hpsa block device driver on my HP RX2600.
Hi Adrian,
Sorry for causing this bug, and thank you for bisecting it down to my patch.
Do you see any other strange behavior with that patch, or is this the only symptom you are aware of?
Quoted 10 lines
I'm seeing this backtrace now:
[ 905.883273] usb 1-2: SerialNumber: A60020000001 [ 905.918170] sda: sda1 sda2 sda3 [ 905.920107] sd 0:1:0:0: [sda] Attached SCSI disk [ 905.944102] usb-storage 1-2:1.0: USB Mass Storage device detected [ 905.944102] scsi host1: usb-storage 1-2:1.0 [ 905.944102] usbcore: registered new interface driver usb-storage [ 905.944117] usbcore: registered new interface driver uas
The timestamps show that time is moving forward, which is at least something. Do you have a feeling for whether the timestamps are counting in (roughly) the correct speed, or is it going much faster or slower than it should?
To clarify: the [905.944117] numbers are seconds/microseconds since boot, so message would be 906 seconds after the kernel started.
Quoted 1 line
Begin: Loading essential drivers ... done. > Begin: Running /scripts/init-premount ... done. > Begin: Mounting root file system ... Begin: Running /scripts/local-top ... done.
Ok, so it gets into user space. Is this initramfs or the actual read-only root?
Quoted 7 lines
[ 906.666923] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 906.670923] hpsa 0000:05:00.0: device is ready. [ 906.670923] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 done. [ 906.722166] rcu: INFO: rcu_sched detected stalls on CPUs/tasks: [ 906.722166] rcu: 2-....: (3 ticks this GP) idle=fe6/1/0x4000000000000000 softirq=693/698 fqs=4 [ 906.722166] (detected by 0, t=6115 jiffies, g=465, q=80)
This appears to be an 'rcu stall' warning, from print_cpu_stall_info(), indicating that timer ticks are missing.
Quoted 15 lines
[ 909.360108] INFO: task systemd-sysv-ge:200 blocked for more than 127 seconds. [ 909.360108] Not tainted 5.10.0+ #130 [ 909.360108] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 909.360108] task:systemd-sysv-ge state:D stack: 0 pid: 200 ppid: 189 flags:0x00000000 [ 909.364108] [ 909.364108] Call Trace: [ 909.364423] [<a00000010109b210>] __schedule+0x890/0x21e0 [ 909.364423] sp=e0000100487d7b70 bsp=e0000100487d1748 [ 909.368423] [<a00000010109cc00>] schedule+0xa0/0x240 [ 909.368423] sp=e0000100487d7b90 bsp=e0000100487d16e0 [ 909.368558] [<a00000010109ce70>] io_schedule+0x70/0xa0 [ 909.368558] sp=e0000100487d7b90 bsp=e0000100487d16c0 [ 909.372290] [<a00000010109e1c0>] bit_wait_io+0x20/0xe0 [ 909.372290] sp=e0000100487d7b90 bsp=e0000100487d1698 [ 909.374168] rcu: INFO: rcu_sched detected stalls on CPUs/tasks:
Quoted 8 lines
[ 909.376290] [<a00000010109d860>] __wait_on_bit+0xc0/0x1c0 [ 909.376290] sp=e0000100487d7b90 bsp=e0000100487d1648 [ 909.374168] rcu: 3-....: (2 ticks this GP) idle=19e/1/0x4000000000000002 softirq=1581/1581 fqs=2 [ 909.374168] (detected by 0, t=5661 jiffies, g=1089, q=3) [ 909.376290] [<a00000010109da80>] out_of_line_wait_on_bit+0x120/0x140 [ 909.376290] sp=e0000100487d7b90 bsp=e0000100487d1610 [ 909.374168] Task dump for CPU 3: [ 909.374168] task:khungtaskd state:R running task
and this seems to be another instance of the same. I would assume that this is completely unrelated to the block driver and just happened to trigger during the same time the driver was doing something.
Can you see in your full logs if the "Oops: timer tick before it's due" warning triggered at any point?
I've attached a patch for a partial revert of my original change, this should still work with the final cleanup on top, but restore the loop plus the local_irq_enable()/local_irq_disable() that I dropped from the original code. Does this make a difference?
Arnd
arch/ia64/kernel/time.c +18 -13
@@ -161,29 +161,34 @@ void vtime_account_idle(struct task_struct *tsk)static irqreturn_t timer_interrupt (int irq,void *dev_id) { -unsigned long cur_itm, new_itm, ticks; +unsigned long new_itm;if (cpu_is_offline (smp_processor_id ())) {return IRQ_HANDLED ; } new_itm = local_cpu_data->itm_next; - cur_itm =ia64_get_itc (); -if (!time_after (cur_itm, new_itm)) { +if (!time_after (ia64_get_itc (), new_itm))printk (KERN_ERR "Oops: timer tick before it's due (itc=%lx,itm=%lx)\n" , - cur_itm, new_itm); - ticks =1 ; - }else { - ticks =DIV_ROUND_UP (cur_itm - new_itm, - local_cpu_data->itm_delta); - new_itm += ticks * local_cpu_data->itm_delta; - } +ia64_get_itc (), new_itm); + +while (1 ) { + new_itm += local_cpu_data->itm_delta; + +legacy_timer_tick (smp_processor_id () == time_keeper_id); -if (smp_processor_id () != time_keeper_id) - ticks =0 ; + local_cpu_data->itm_next = new_itm; -legacy_timer_tick (ticks); +if (time_after (new_itm,ia64_get_itc ())) +break ; + +/* +* Allow IPIs to interrupt the timer loop. +*/ +local_irq_enable (); +local_irq_disable (); + } do { /*
John Paul Adrian Glaubitz
maintainerRe: [PATCH v2 05/15] ia64: convert to legacy_timer_tick
Hi Arnd!
Quoted 5 lines · Arnd Bergmann
Sorry for causing this bug, and thank you for bisecting it down to my patch.
Do you see any other strange behavior with that patch, or is this the only symptom you are aware of?
This seems to be the only issue I'm seeing so far. However, as I'm not able to fully boot the system, I'm not able to be certain that there might be other fallouts once the system is running.
Quoted 10 lines
Quoted 9 lines
I'm seeing this backtrace now:
[ 905.883273] usb 1-2: SerialNumber: A60020000001 [ 905.918170] sda: sda1 sda2 sda3 [ 905.920107] sd 0:1:0:0: [sda] Attached SCSI disk [ 905.944102] usb-storage 1-2:1.0: USB Mass Storage device detected [ 905.944102] scsi host1: usb-storage 1-2:1.0 [ 905.944102] usbcore: registered new interface driver usb-storage [ 905.944117] usbcore: registered new interface driver uas
Quoted 8 lines
The timestamps show that time is moving forward, which is at least something. Do you have a feeling for whether the timestamps are counting in (roughly) the correct speed, or is it going much faster or slower than it should?
To clarify: the [905.944117] numbers are seconds/microseconds since boot, so message would be 906 seconds after the kernel started.
No, that would be definitely off. I hadn't had the machine up and running for 15 minutes. This issue showed right after boot.
Quoted 3 lines
Quoted 1 line
Begin: Loading essential drivers ... done. > Begin: Running /scripts/init-premount ... done. > Begin: Mounting root file system ... Begin: Running /scripts/local-top ... done.
Ok, so it gets into user space. Is this initramfs or the actual read-only root?
This is using an initramfs.
Quoted 9 lines
Quoted 7 lines
[ 906.666923] hpsa 0000:05:00.0: scsi 0:1:0:0: resetting logical Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 [ 906.670923] hpsa 0000:05:00.0: device is ready. [ 906.670923] hpsa 0000:05:00.0: scsi 0:1:0:0: reset logical completed successfully Direct-Access HP LOGICAL VOLUME RAID-0 SSDSmartPathCap- En- Exp=1 done. [ 906.722166] rcu: INFO: rcu_sched detected stalls on CPUs/tasks: [ 906.722166] rcu: 2-....: (3 ticks this GP) idleþ6/1/0x4000000000000000 softirqi3/698 fqs=4 [ 906.722166] (detected by 0, ta15 jiffies, gF5, q€)This appears to be an 'rcu stall' warning, from
print_cpu_stall_info(), indicating that timer ticks are missing.
OK.
Quoted 24 lines
Quoted 15 lines
[ 909.360108] INFO: task systemd-sysv-ge:200 blocked for more than 127 seconds. [ 909.360108] Not tainted 5.10.0+ #130 [ 909.360108] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 909.360108] task:systemd-sysv-ge state:D stack: 0 pid: 200 ppid: 189 flags:0x00000000 [ 909.364108] [ 909.364108] Call Trace: [ 909.364423] [<a00000010109b210>] __schedule+0x890/0x21e0 [ 909.364423] spà000100487d7b70 bspà000100487d1748 [ 909.368423] [<a00000010109cc00>] schedule+0xa0/0x240 [ 909.368423] spà000100487d7b90 bspà000100487d16e0 [ 909.368558] [<a00000010109ce70>] io_schedule+0x70/0xa0 [ 909.368558] spà000100487d7b90 bspà000100487d16c0 [ 909.372290] [<a00000010109e1c0>] bit_wait_io+0x20/0xe0 [ 909.372290] spà000100487d7b90 bspà000100487d1698 [ 909.374168] rcu: INFO: rcu_sched detected stalls on CPUs/tasks:Quoted 8 lines
[ 909.376290] [<a00000010109d860>] __wait_on_bit+0xc0/0x1c0 [ 909.376290] spà000100487d7b90 bspà000100487d1648 [ 909.374168] rcu: 3-....: (2 ticks this GP) idlee/1/0x4000000000000002 softirq81/1581 fqs=2 [ 909.374168] (detected by 0, tV61 jiffies, g89, q=3) [ 909.376290] [<a00000010109da80>] out_of_line_wait_on_bit+0x120/0x140 [ 909.376290] spà000100487d7b90 bspà000100487d1610 [ 909.374168] Task dump for CPU 3: [ 909.374168] task:khungtaskd state:R running task
Quoted 6 lines
and this seems to be another instance of the same. I would assume that this is completely unrelated to the block driver and just happened to trigger during the same time the driver was doing something.
Can you see in your full logs if the "Oops: timer tick before it's due" warning triggered at any point?
It's difficult, to be honest. The problem is that the above message spams the whole kernel buffer to the point that the buffer of the built-in serial console is filled up. So I'm not sure if I've seen this message.
Quoted 4 lines
I've attached a patch for a partial revert of my original change, this should still work with the final cleanup on top, but restore the loop plus the local_irq_enable()/local_irq_disable() that I dropped from the original code. Does this make a difference?
I'll give it a try and report back.
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
John Paul Adrian Glaubitz
maintainerRe: [PATCH v2 05/15] ia64: convert to legacy_timer_tick
Hi Arnd!
Quoted 6 lines · John Paul Adrian Glaubitz
Quoted 4 lines
I've attached a patch for a partial revert of my original change, this should still work with the final cleanup on top, but restore the loop plus the local_irq_enable()/local_irq_disable() that I dropped from the original code. Does this make a difference?
I'll give it a try and report back.
Yes. That solves the timer issues. Now there is unfortunately still a second, unrelated regression with the hpsa driver that was introduced by one of the ia64 patches in the mm tree from Andrew which makes the hpsa driver not load at all.
Haven't figured out yet what the problem is.
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
PATCH v2 6/15 ARM: rpc: use legacy_timer_tick
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
rpc is the only user of the timer_tick() function now, and can just call the newly added generic version instead.
--- arch/arm/Kconfig | 1 + arch/arm/include/asm/mach/time.h | 2 -- arch/arm/kernel/time.c | 14 -------------- arch/arm/mach-rpc/time.c | 2 +- 4 files changed, 2 insertions(+), 17 deletions(-)
arch/arm/Kconfig +1 -0
@@ -452,6 +452,7 @@ config ARCH_RPC select HAVE_IDE select HAVE_PATA_PLATFORM select ISA_DMA_API + select LEGACY_TIMER_TICK select NEED_MACH_IO_H select NEED_MACH_MEMORY_H select NO_IOPORT_MAP
arch/arm/include/asm/mach/time.h +0 -2
@@ -7,8 +7,6 @@#ifndef __ASM_ARM_MACH_TIME_H#define __ASM_ARM_MACH_TIME_H -extern void timer_tick (void ); -typedef void (*clock_access_fn )(struct timespec64 *);extern int register_persistent_clock (clock_access_fn read_persistent);
arch/arm/kernel/time.c +0 -14
@@ -60,20 +60,6 @@ unsigned long profile_pc(struct pt_regs *regs)EXPORT_SYMBOL (profile_pc);#endif -#ifndef CONFIG_GENERIC_CLOCKEVENTS -/* -* Kernel system timer support. -*/ -void timer_tick (void ) -{ -profile_tick (CPU_PROFILING ); -xtime_update (1 ); -#ifndef CONFIG_SMP -update_process_times (user_mode (get_irq_regs ())); -#endif -} -#endif -static void dummy_clock_access (struct timespec64 *ts) { ts->tv_sec =0 ;
arch/arm/mach-rpc/time.c +1 -1
@@ -81,7 +81,7 @@ static irqreturn_t ioc_timer_interrupt(int irq, void *dev_id) { ioc_time += RPC_LATCH; -timer_tick (); +legacy_timer_tick (1 );return IRQ_HANDLED ; }
Signature · 1 line
2.27.0
PATCH v2 7/15 parisc: use legacy_timer_tick
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
parisc has selected CONFIG_GENERIC_CLOCKEVENTS since commit 43b1f6abd590 ("parisc: Switch to generic sched_clock implementation"), but does not appear to actually be using it, and instead calls the low-level timekeeping functions directly.
Remove the GENERIC_CLOCKEVENTS select again, and instead convert to the newly added legacy_timer_tick() helper.
--- Documentation/features/time/clockevents/arch-support.txt | 2 +- arch/parisc/Kconfig | 2 +- arch/parisc/kernel/time.c | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-)
Documentation/features/time/clockevents/arch-support.txt +1 -1
@@ -21,7 +21,7 @@ | nds32: | ok | | nios2: | ok | | openrisc: | ok | - | parisc: | ok | + | parisc: | TODO | | powerpc: | ok | | riscv: | ok | | s390: | ok |
arch/parisc/Kconfig +1 -1
@@ -52,7 +52,7 @@ config PARISC select HAVE_REGS_AND_STACK_ACCESS_API select GENERIC_SCHED_CLOCK select HAVE_UNSTABLE_SCHED_CLOCK if SMP - select GENERIC_CLOCKEVENTS + select LEGACY_TIMER_TICK select CPU_NO_EFFICIENT_FFS select NEED_DMA_MAP_STATE select NEED_SG_DMA_LENGTH
arch/parisc/kernel/time.c +3 -6
@@ -70,8 +70,6 @@ irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id)/* gcc can optimize for "read-only" case with a local clocktick */ unsigned long cpt = clocktick; -profile_tick (CPU_PROFILING ); -/* Initialize next_tick to the old expected tick time. */ next_tick = cpuinfo->it_value;
@@ -86,10 +84,9 @@ irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id) cpuinfo->it_value = next_tick;/* Go do system house keeping. */ -if (cpu =0 ) -xtime_update (ticks_elapsed); - -update_process_times (user_mode (get_irq_regs ())); +if (cpu !=0 ) + ticks_elapsed =0 ; +legacy_timer_tick (ticks_elapsed);/* Skip clockticks on purpose if we know we would miss those. * The new CR16 must be "later" than current CR16 otherwise
Signature · 1 line
2.27.0
Helge Deller
maintainerRe: [PATCH v2 07/15] parisc: use legacy_timer_tick
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
parisc has selected
CONFIG_GENERIC_CLOCKEVENTSsince commit43b1f6abd590("parisc: Switch to genericsched_clockimplementation"), but does not appear to actually be using it, and instead calls the low-level timekeeping functions directly.
Arnd, thank you for this patch!
It reminded me that I really missed to fully implement the clockevents on parisc!
Your other patch ("RFC: m68k: mac: convert to generic clockevent") was a big help too, as it showed how it might work on parisc as well.
Here is now a current version of the clockevents-enabling-patch for parisc:
https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git/commit/?h=for-next&id=3b7ab4a74a2d1972dbeb33285d85f1500b2ff96a
Quoted 2 lines
Remove the
GENERIC_CLOCKEVENTSselect again, and instead convert to the newly addedlegacy_timer_tick()helper.
My patch still needs more testing, but if it turns to work out right, would you mind to drop your patch for parisc?
Helge
Quoted 62 lines
Reviewed-by Linus Walleij <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>--- Documentation/features/time/clockevents/arch-support.txt | 2 +- arch/parisc/Kconfig | 2 +- arch/parisc/kernel/time.c | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-)Documentation/features/time/clockevents/arch-support.txt +1
-1@@ -21,7 +21,7 @@ | nds32: | ok | | nios2: | ok | | openrisc: | ok | - | parisc: | ok | + | parisc: | TODO | | powerpc: | ok | | riscv: | ok | | s390: | ok |arch/parisc/Kconfig +1
-1@@ -52,7 +52,7 @@ config PARISC select HAVE_REGS_AND_STACK_ACCESS_API select GENERIC_SCHED_CLOCK select HAVE_UNSTABLE_SCHED_CLOCK if SMP - select GENERIC_CLOCKEVENTS + select LEGACY_TIMER_TICK select CPU_NO_EFFICIENT_FFS select NEED_DMA_MAP_STATE select NEED_SG_DMA_LENGTHarch/parisc/kernel/time.c +3
-6@@ -70,8 +70,6 @@ irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id)/* gcc can optimize for "read-only" case with a local clocktick */ unsigned long cpt = clocktick; -profile_tick (CPU_PROFILING ); -/* Initialize next_tick to the old expected tick time. */ next_tick = cpuinfo->it_value;@@ -86,10 +84,9 @@ irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id) cpuinfo->it_value = next_tick;/* Go do system house keeping. */ -if (cpu ==0 ) -xtime_update (ticks_elapsed); - -update_process_times (user_mode (get_irq_regs ())); +if (cpu !=0 ) + ticks_elapsed =0 ; +legacy_timer_tick (ticks_elapsed);/* Skip clockticks on purpose if we know we would miss those. * The new CR16 must be "later" than current CR16 otherwise
Re: [PATCH v2 07/15] parisc: use legacy_timer_tick
Quoted 9 lines · Helge Deller
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
parisc has selected
CONFIG_GENERIC_CLOCKEVENTSsince commit43b1f6abd590("parisc: Switch to genericsched_clockimplementation"), but does not appear to actually be using it, and instead calls the low-level timekeeping functions directly.
Quoted 8 lines
Arnd, thank you for this patch!
It reminded me that I really missed to fully implement the clockevents on parisc!Your other patch ("RFC: m68k: mac: convert to generic clockevent") was a big help too, as it showed how it might work on parisc as well.
Here is now a current version of the clockevents-enabling-patch for parisc:
https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git/commit/?h=for-next&id;7ab4a74a2d1972dbeb33285d85f1500b2ff96a
Ah, nice!
Quoted 5 lines
Quoted 2 lines
Remove the
GENERIC_CLOCKEVENTSselect again, and instead convert to the newly addedlegacy_timer_tick()helper.My patch still needs more testing, but if it turns to work out right, would you mind to drop your patch for parisc?
I think it would be easier if you could base your patch on top of my series, as they would otherwise inevitably conflict. I could either add it to my tree, or you could merge my branch into your tree.
Arnd
Helge Deller
maintainerRe: [PATCH v2 07/15] parisc: use legacy_timer_tick
Quoted 24 lines · Arnd Bergmann
Quoted 9 lines · Helge Deller
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
parisc has selected
CONFIG_GENERIC_CLOCKEVENTSsince commit43b1f6abd590("parisc: Switch to genericsched_clockimplementation"), but does not appear to actually be using it, and instead calls the low-level timekeeping functions directly.Quoted 8 lines
Arnd, thank you for this patch!
It reminded me that I really missed to fully implement the clockevents on parisc!Your other patch ("RFC: m68k: mac: convert to generic clockevent") was a big help too, as it showed how it might work on parisc as well.
Here is now a current version of the clockevents-enabling-patch for parisc:
https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git/commit/?h=for-next&id=3b7ab4a74a2d1972dbeb33285d85f1500b2ff96aAh, nice!
Quoted 3 lines
Quoted 2 lines
Remove the
GENERIC_CLOCKEVENTSselect again, and instead convert to the newly addedlegacy_timer_tick()helper.
Quoted 6 lines
Quoted 2 lines
My patch still needs more testing, but if it turns to work out right, would you mind to drop your patch for parisc?
I think it would be easier if you could base your patch on top of my series, as they would otherwise inevitably conflict. I could either add it to my tree, or you could merge my branch into your tree.
Couldn't you drop your patch and include mine in your tree instead? That way nothing conflicts, and they get merged together?
Helge
Re: [PATCH v2 07/15] parisc: use legacy_timer_tick
Quoted 28 lines · Helge Deller
Quoted 27 lines · Arnd Bergmann
Quoted 9 lines · Helge Deller
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
parisc has selected
CONFIG_GENERIC_CLOCKEVENTSsince commit43b1f6abd590("parisc: Switch to genericsched_clockimplementation"), but does not appear to actually be using it, and instead calls the low-level timekeeping functions directly.Quoted 8 lines
Arnd, thank you for this patch!
It reminded me that I really missed to fully implement the clockevents on parisc!Your other patch ("RFC: m68k: mac: convert to generic clockevent") was a big help too, as it showed how it might work on parisc as well.
Here is now a current version of the clockevents-enabling-patch for parisc:
https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git/commit/?h=for-next&id;7ab4a74a2d1972dbeb33285d85f1500b2ff96aAh, nice!
Quoted 5 lines
Quoted 2 lines
Remove the
GENERIC_CLOCKEVENTSselect again, and instead convert to the newly addedlegacy_timer_tick()helper.My patch still needs more testing, but if it turns to work out right, would you mind to drop your patch for parisc?
Quoted 6 lines
Quoted 3 lines
I think it would be easier if you could base your patch on top of my series, as they would otherwise inevitably conflict. I could either add it to my tree, or you could merge my branch into your tree.
Couldn't you drop your patch and include mine in your tree instead? That way nothing conflicts, and they get merged together?
That only works if nobody merges this branch into another one, otherwise we end up with multiple copies of the later commits.
Arnd
PATCH v2 8/15 m68k: coldfire: use legacy_timer_tick()
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Replace the indirect function calls in the timer code with direct calls to the newly added legacy_timer_tick() helper for those that have not yet been converted to generic clockevents.
This makes the timer code a little more self-contained.
--- arch/m68k/Kconfig.cpu | 35 +++++++++++++++++++++++++++++------ arch/m68k/coldfire/Makefile | 32 ++++++++++++++++++-------------- arch/m68k/coldfire/sltimers.c | 6 ++---- arch/m68k/coldfire/timers.c | 6 ++---- 4 files changed, 51 insertions(+), 28 deletions(-)
arch/m68k/Kconfig.cpu +29 -6
@@ -137,6 +137,7 @@ config M5206 bool "MCF5206" depends on !MMU select COLDFIRE_SW_A7 + select COLDFIRE_TIMERS select HAVE_MBAR select CPU_NO_EFFICIENT_FFS help
@@ -146,6 +147,7 @@ config M5206e bool "MCF5206e" depends on !MMU select COLDFIRE_SW_A7 + select COLDFIRE_TIMERS select HAVE_MBAR select CPU_NO_EFFICIENT_FFS help
@@ -154,7 +156,7 @@ config M5206e config M520x bool "MCF520x" depends on !MMU - select GENERIC_CLOCKEVENTS + select COLDFIRE_PIT_TIMER select HAVE_CACHE_SPLIT help Freescale Coldfire 5207/5208 processor support.
@@ -162,7 +164,7 @@ config M520x config M523x bool "MCF523x" depends on !MMU - select GENERIC_CLOCKEVENTS + select COLDFIRE_PIT_TIMER select HAVE_CACHE_SPLIT select HAVE_IPSBAR help
@@ -172,6 +174,7 @@ config M5249 bool "MCF5249" depends on !MMU select COLDFIRE_SW_A7 + select COLDFIRE_TIMERS select HAVE_MBAR select CPU_NO_EFFICIENT_FFS help
@@ -181,6 +184,7 @@ config M525x bool "MCF525x" depends on !MMU select COLDFIRE_SW_A7 + select COLDFIRE_TIMERS select HAVE_MBAR select CPU_NO_EFFICIENT_FFS help
@@ -189,10 +193,10 @@ config M525x config M5271 bool "MCF5271" depends on !MMU + select COLDFIRE_PIT_TIMER select M527x select HAVE_CACHE_SPLIT select HAVE_IPSBAR - select GENERIC_CLOCKEVENTS help Freescale (Motorola) ColdFire 5270/5271 processor support.
@@ -200,6 +204,7 @@ config M5272 bool "MCF5272" depends on !MMU select COLDFIRE_SW_A7 + select COLDFIRE_TIMERS select HAVE_MBAR select CPU_NO_EFFICIENT_FFS help
@@ -208,17 +213,17 @@ config M5272 config M5275 bool "MCF5275" depends on !MMU + select COLDFIRE_PIT_TIMER select M527x select HAVE_CACHE_SPLIT select HAVE_IPSBAR - select GENERIC_CLOCKEVENTS help Freescale (Motorola) ColdFire 5274/5275 processor support. config M528x bool "MCF528x" depends on !MMU - select GENERIC_CLOCKEVENTS + select COLDFIRE_PIT_TIMER select HAVE_CACHE_SPLIT select HAVE_IPSBAR help
@@ -227,6 +232,7 @@ config M528x config M5307 bool "MCF5307" depends on !MMU + select COLDFIRE_TIMERS select COLDFIRE_SW_A7 select HAVE_CACHE_CB select HAVE_MBAR
@@ -237,6 +243,7 @@ config M5307 config M532x bool "MCF532x" depends on !MMU + select COLDFIRE_TIMERS select M53xx select HAVE_CACHE_CB help
@@ -245,6 +252,7 @@ config M532x config M537x bool "MCF537x" depends on !MMU + select COLDFIRE_TIMERS select M53xx select HAVE_CACHE_CB help
@@ -254,6 +262,7 @@ config M5407 bool "MCF5407" depends on !MMU select COLDFIRE_SW_A7 + select COLDFIRE_TIMERS select HAVE_CACHE_CB select HAVE_MBAR select CPU_NO_EFFICIENT_FFS
@@ -263,6 +272,7 @@ config M5407 config M547x bool "MCF547x" select M54xx + select COLDFIRE_SLTIMERS select MMU_COLDFIRE if MMU select FPU if MMU select HAVE_CACHE_CB
@@ -273,6 +283,7 @@ config M547x config M548x bool "MCF548x" + select COLDFIRE_SLTIMERS select MMU_COLDFIRE if MMU select FPU if MMU select M54xx
@@ -284,8 +295,8 @@ config M548x config M5441x bool "MCF5441x" + select COLDFIRE_PIT_TIMER select MMU_COLDFIRE if MMU - select GENERIC_CLOCKEVENTS select HAVE_CACHE_CB help Freescale Coldfire 54410/54415/54416/54417/54418 processor support.
@@ -302,6 +313,18 @@ config M54xx select HAVE_PCI bool +config COLDFIRE_PIT_TIMER + bool + select GENERIC_CLOCKEVENTS + +config COLDFIRE_TIMERS + bool + select LEGACY_TIMER_TICK + +config COLDFIRE_SLTIMERS + bool + select LEGACY_TIMER_TICK + endif # COLDFIRE
arch/m68k/coldfire/Makefile +18 -14
@@ -16,20 +16,24 @@ asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1 obj-$(CONFIG_COLDFIRE) += cache.o clk.o device.o dma.o entry.o vectors.o -obj-$(CONFIG_M5206) += m5206.o timers.o intc.o reset.o -obj-$(CONFIG_M5206e) += m5206.o timers.o intc.o reset.o -obj-$(CONFIG_M520x) += m520x.o pit.o intc-simr.o reset.o -obj-$(CONFIG_M523x) += m523x.o pit.o dma_timer.o intc-2.o reset.o -obj-$(CONFIG_M5249) += m5249.o timers.o intc.o intc-5249.o reset.o -obj-$(CONFIG_M525x) += m525x.o timers.o intc.o intc-525x.o reset.o -obj-$(CONFIG_M527x) += m527x.o pit.o intc-2.o reset.o -obj-$(CONFIG_M5272) += m5272.o intc-5272.o timers.o -obj-$(CONFIG_M528x) += m528x.o pit.o intc-2.o reset.o -obj-$(CONFIG_M5307) += m5307.o timers.o intc.o reset.o -obj-$(CONFIG_M53xx) += m53xx.o timers.o intc-simr.o reset.o -obj-$(CONFIG_M5407) += m5407.o timers.o intc.o reset.o -obj-$(CONFIG_M54xx) += m54xx.o sltimers.o intc-2.o -obj-$(CONFIG_M5441x) += m5441x.o pit.o intc-simr.o reset.o +obj-$(CONFIG_M5206) += m5206.o intc.o reset.o +obj-$(CONFIG_M5206e) += m5206.o intc.o reset.o +obj-$(CONFIG_M520x) += m520x.o intc-simr.o reset.o +obj-$(CONFIG_M523x) += m523x.o dma_timer.o intc-2.o reset.o +obj-$(CONFIG_M5249) += m5249.o intc.o intc-5249.o reset.o +obj-$(CONFIG_M525x) += m525x.o intc.o intc-525x.o reset.o +obj-$(CONFIG_M527x) += m527x.o intc-2.o reset.o +obj-$(CONFIG_M5272) += m5272.o intc-5272.o +obj-$(CONFIG_M528x) += m528x.o intc-2.o reset.o +obj-$(CONFIG_M5307) += m5307.o intc.o reset.o +obj-$(CONFIG_M53xx) += m53xx.o intc-simr.o reset.o +obj-$(CONFIG_M5407) += m5407.o intc.o reset.o +obj-$(CONFIG_M54xx) += m54xx.o intc-2.o +obj-$(CONFIG_M5441x) += m5441x.o intc-simr.o reset.o + +obj-$(CONFIG_COLDFIRE_PIT_TIMER) += pit.o +obj-$(CONFIG_COLDFIRE_TIMERS) += timers.o +obj-$(CONFIG_COLDFIRE_SLTIMERS) += sltimers.o obj-$(CONFIG_NETtel) += nettel.o obj-$(CONFIG_CLEOPATRA) += nettel.o
arch/m68k/coldfire/sltimers.c +2 -4
@@ -83,14 +83,13 @@ void mcfslt_profile_init(void)static u32 mcfslt_cycles_per_jiffy;static u32 mcfslt_cnt; -static irq_handler_t timer_interrupt; -static irqreturn_t mcfslt_tick (int irq,void *dummy) {/* Reset Slice Timer 0 */ __raw_writel (MCFSLT_SSR_BE |MCFSLT_SSR_TE ,TA (MCFSLT_SSR )); mcfslt_cnt += mcfslt_cycles_per_jiffy; -return timer_interrupt (irq, dummy); +legacy_timer_tick (1 ); +return IRQ_HANDLED ; }static u64 mcfslt_read_clk (struct clocksource *cs)
@@ -136,7 +135,6 @@ void hw_timer_init(irq_handler_t handler)/* initialize mcfslt_cnt knowing that slice timers count down */ mcfslt_cnt = mcfslt_cycles_per_jiffy; - timer_interrupt = handler; r =request_irq (MCF_IRQ_TIMER , mcfslt_tick,IRQF_TIMER ,"timer" ,NULL );if (r) { pr_err("Failed to request irq %d (timer): %pe\n", MCF_IRQ_TIMER,
arch/m68k/coldfire/timers.c +2 -4
@@ -48,8 +48,6 @@ void coldfire_profile_init(void);static u32 mcftmr_cycles_per_jiffy;static u32 mcftmr_cnt; -static irq_handler_t timer_interrupt; -/***************************************************************************/ static void init_timer_irq (void )
@@ -77,7 +75,8 @@ static irqreturn_t mcftmr_tick(int irq, void *dummy)__raw_writeb (MCFTIMER_TER_CAP |MCFTIMER_TER_REF ,TA (MCFTIMER_TER )); mcftmr_cnt += mcftmr_cycles_per_jiffy; -return timer_interrupt (irq, dummy); +legacy_timer_tick (1 ); +return IRQ_HANDLED ; }/***************************************************************************/
@@ -126,7 +125,6 @@ void hw_timer_init(irq_handler_t handler)clocksource_register_hz (&mcftmr_clk,FREQ ); - timer_interrupt = handler;init_timer_irq (); r =request_irq (MCF_IRQ_TIMER , mcftmr_tick,IRQF_TIMER ,"timer" ,NULL );if (r) {
Signature · 1 line
2.27.0
PATCH v2 9/15 m68k: split heartbeat out of timer function
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The heartbeat functionality is mostly separate from the actual timer interrupt handling, and it is only used on five platforms.
Split it out into a separate function and call that directly from the timer irq on those platforms.
--- arch/m68k/amiga/config.c | 1 + arch/m68k/apollo/config.c | 1 + arch/m68k/atari/time.c | 2 ++ arch/m68k/hp300/time.c | 1 + arch/m68k/include/asm/machdep.h | 7 +++++++ arch/m68k/kernel/time.c | 7 +++++-- arch/m68k/q40/q40ints.c | 2 ++ 7 files changed, 19 insertions(+), 2 deletions(-)
arch/m68k/amiga/config.c +1 -0
@@ -480,6 +480,7 @@ static irqreturn_t ciab_timer_handler(int irq, void *dev_id) clk_total += jiffy_ticks; clk_offset =0 ;timer_routine (0 ,NULL ); +timer_heartbeat ();return IRQ_HANDLED ; }
arch/m68k/apollo/config.c +1 -0
@@ -173,6 +173,7 @@ irqreturn_t dn_timer_int(int irq, void *dev_id)volatile unsigned char x;timer_handler (irq, dev_id); +timer_heartbeat (); x = *(volatile unsigned char *)(apollo_timer +3 ); x = *(volatile unsigned char *)(apollo_timer +5 );
arch/m68k/atari/time.c +2 -0
@@ -21,6 +21,7 @@#include <linux/export.h> #include <asm/atariints.h> +#include <asm/machdep.h> DEFINE_SPINLOCK (rtc_lock);EXPORT_SYMBOL_GPL (rtc_lock);
@@ -49,6 +50,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id) }while (last_timer_count =1 ); clk_total +=INT_TICKS ;timer_routine (0 ,NULL ); +timer_heartbeat ();local_irq_restore (flags);return IRQ_HANDLED ;
arch/m68k/hp300/time.c +1 -0
@@ -65,6 +65,7 @@ static irqreturn_t hp300_tick(int irq, void *dev_id) clk_total +=INTVAL ; clk_offset =0 ;timer_routine (0 ,NULL ); +timer_heartbeat ();local_irq_restore (flags);/* Turn off the network and SCSI leds */
arch/m68k/include/asm/machdep.h +7 -0
@@ -35,6 +35,13 @@ extern void (*mach_beep) (unsigned int, unsigned int);/* Hardware clock functions */ extern void hw_timer_init (irq_handler_t handler);extern unsigned long hw_timer_offset (void ); +#ifdef CONFIG_HEARTBEAT +extern void timer_heartbeat (void ); +#else +static inline void timer_heartbeat (void ) +{ +} +#endif extern void config_BSP (char *command,int len);
arch/m68k/kernel/time.c +5 -2
@@ -45,8 +45,12 @@ static irqreturn_t timer_interrupt(int irq, void *dummy)xtime_update (1 );update_process_times (user_mode (get_irq_regs ()));profile_tick (CPU_PROFILING ); +return IRQ_HANDLED ; +}#ifdef CONFIG_HEARTBEAT +void timer_heartbeat (void ) +{/* use power LED as a heartbeat instead -- much more useful for debugging -- based on the version for PReP by Cort */ /* acts like an actual heart beat -- ie thump-thump-pause... */
@@ -68,9 +72,8 @@ static irqreturn_t timer_interrupt(int irq, void *dummy) dist = period / 4; } } -#endif /* CONFIG_HEARTBEAT */ -return IRQ_HANDLED ; } +#endif /* CONFIG_HEARTBEAT */ #ifdef CONFIG_M68KCLASSIC #if !IS_BUILTIN (CONFIG_RTC_DRV_GENERIC )
arch/m68k/q40/q40ints.c +2 -0
@@ -17,6 +17,7 @@#include <linux/interrupt.h> #include <linux/irq.h> +#include <asm/machdep.h> #include <asm/ptrace.h> #include <asm/traps.h>
@@ -144,6 +145,7 @@ static irqreturn_t q40_timer_int(int irq, void *dev_id)local_irq_save (flags);timer_routine (0 ,NULL ); +timer_heartbeat ();local_irq_restore (flags); }return IRQ_HANDLED ;
Signature · 1 line
2.27.0
PATCH v2 10/15 m68k: sun3/sun3c: use legacy_timer_tick
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
These two are different from all other machines:
* sun3 does not call timer_routine() but open-codes it except for the profile_tick() call that appears to be unintentionally missing.
* sun3x has a commented-out timer irq handler but no functional timer tick I could find.
Change both to calling the new legacy_timer_tick here, which includes the call to profile_tick() but does not fix sun3x as that is still commented out.
--- arch/m68k/Kconfig.machine | 2 ++ arch/m68k/sun3/sun3ints.c | 3 +-- arch/m68k/sun3x/time.c | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/m68k/Kconfig.machine +2 -0
@@ -99,6 +99,7 @@ config HP300 config SUN3X bool "Sun3x support" depends on MMU + select LEGACY_TIMER_TICK select MMU_MOTOROLA if MMU select M68030 help
@@ -126,6 +127,7 @@ config SUN3 depends on MMU depends on !MMU_MOTOROLA select MMU_SUN3 if MMU + select LEGACY_TIMER_TICK select NO_DMA select M68020 help
arch/m68k/sun3/sun3ints.c +1 -2
@@ -73,8 +73,7 @@ static irqreturn_t sun3_int5(int irq, void *dev_id)#ifdef CONFIG_SUN3 intersil_clear ();#endif -xtime_update (1 ); -update_process_times (user_mode (get_irq_regs ())); +legacy_timer_tick (1 ); cnt =kstat_irqs_cpu (irq,0 );if (!(cnt %20 ))sun3_leds (led_pattern[cnt %160 /20 ]);
arch/m68k/sun3x/time.c +1 -2
@@ -77,14 +77,13 @@ int sun3x_hwclk(int set, struct rtc_time *t)#if 0 static irqreturn_t sun3x_timer_tick (int irq,void *dev_id) { -irq_handler_t timer_routine = dev_id;unsigned long flags;local_irq_save (flags);/* Clear the pending interrupt - pulse the enable line low */ disable_irq (5 );enable_irq (5 ); -timer_routine (0 ,NULL ); +legacy_timer_tick (1 );local_irq_restore (flags);return IRQ_HANDLED ;
Signature · 1 line
2.27.0
PATCH v2 11/15 m68k: m68328: use legacy_timer_tick()
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
A couple of machines share the m68328 timer code that is based on calling timer_interrupt(). Change these to the new and slightly more generic legacy_timer_tick() helper.
--- arch/m68k/68000/timers.c | 5 ++--- arch/m68k/Kconfig.cpu | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-)
arch/m68k/68000/timers.c +2 -3
@@ -52,7 +52,6 @@#endif static u32 m68328_tick_cnt; -static irq_handler_t timer_interrupt;/***************************************************************************/
@@ -62,7 +61,8 @@ static irqreturn_t hw_tick(int irq, void *dummy)TSTAT &=0 ; m68328_tick_cnt +=TICKS_PER_JIFFY ; -return timer_interrupt (irq, dummy); +legacy_timer_tick (1 ); +return IRQ_HANDLED ; }/***************************************************************************/
@@ -113,7 +113,6 @@ void hw_timer_init(irq_handler_t handler)/* Enable timer 1 */ TCTL |=TCTL_TEN ;clocksource_register_hz (&m68328_clk,TICKS_PER_JIFFY *HZ ); - timer_interrupt = handler; }/***************************************************************************/
arch/m68k/Kconfig.cpu +3 -0
@@ -104,6 +104,7 @@ config M68060 config M68328 bool "MC68328" depends on !MMU + select LEGACY_TIMER_TICK select M68000 help Motorola 68328 processor support.
@@ -111,6 +112,7 @@ config M68328 config M68EZ328 bool "MC68EZ328" depends on !MMU + select LEGACY_TIMER_TICK select M68000 help Motorola 68EX328 processor support.
@@ -118,6 +120,7 @@ config M68EZ328 config M68VZ328 bool "MC68VZ328" depends on !MMU + select LEGACY_TIMER_TICK select M68000 help Motorola 68VZ328 processor support.
Signature · 1 line
2.27.0
PATCH v2 12/15 m68k: change remaining timers to legacy_timer_tick
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
There are nine more machines that each have their own timer interrupt calling the m68k timer_interrupt() function through an indirect pointer.
This function is now the same as legacy_timer_tick, so just call that directly and select the corresponding Kconfig symbol.
--- arch/m68k/Kconfig.machine | 9 +++++++++ arch/m68k/amiga/config.c | 6 ++---- arch/m68k/apollo/config.c | 6 ++---- arch/m68k/atari/time.c | 5 ++--- arch/m68k/bvme6000/config.c | 5 ++--- arch/m68k/hp300/time.c | 5 ++--- arch/m68k/mac/via.c | 6 ++---- arch/m68k/mvme147/config.c | 5 ++--- arch/m68k/mvme16x/config.c | 5 ++--- arch/m68k/q40/q40ints.c | 6 ++---- 10 files changed, 27 insertions(+), 31 deletions(-)
arch/m68k/Kconfig.machine +9 -0
@@ -7,6 +7,7 @@ config AMIGA bool "Amiga support" depends on MMU select MMU_MOTOROLA if MMU + select LEGACY_TIMER_TICK help This option enables support for the Amiga series of computers. If you plan to use this kernel on an Amiga, say Y here and browse the
@@ -17,6 +18,7 @@ config ATARI depends on MMU select MMU_MOTOROLA if MMU select HAVE_ARCH_NVRAM_OPS + select LEGACY_TIMER_TICK help This option enables support for the 68000-based Atari series of computers (including the TT, Falcon and Medusa). If you plan to use
@@ -28,6 +30,7 @@ config MAC depends on MMU select MMU_MOTOROLA if MMU select HAVE_ARCH_NVRAM_OPS + select LEGACY_TIMER_TICK help This option enables support for the Apple Macintosh series of computers (yes, there is experimental support now, at least for part
@@ -40,6 +43,7 @@ config APOLLO bool "Apollo support" depends on MMU select MMU_MOTOROLA if MMU + select LEGACY_TIMER_TICK help Say Y here if you want to run Linux on an MC680x0-based Apollo Domain workstation such as the DN3500.
@@ -58,6 +62,7 @@ config MVME147 bool "MVME147 support" depends on MMU depends on VME + select LEGACY_TIMER_TICK help Say Y to include support for early Motorola VME boards. This will build a kernel which can run on MVME147 single-board computers. If
@@ -68,6 +73,7 @@ config MVME16x bool "MVME162, 166 and 167 support" depends on MMU depends on VME + select LEGACY_TIMER_TICK help Say Y to include support for Motorola VME boards. This will build a kernel which can run on MVME162, MVME166, MVME167, MVME172, and
@@ -79,6 +85,7 @@ config BVME6000 bool "BVME4000 and BVME6000 support" depends on MMU depends on VME + select LEGACY_TIMER_TICK help Say Y to include support for VME boards from BVM Ltd. This will build a kernel which can run on BVME4000 and BVME6000 boards. If
@@ -89,6 +96,7 @@ config HP300 bool "HP9000/300 and HP9000/400 support" depends on MMU select MMU_MOTOROLA if MMU + select LEGACY_TIMER_TICK help This option enables support for the HP9000/300 and HP9000/400 series of workstations. Support for these machines is still somewhat
@@ -115,6 +123,7 @@ config Q40 bool "Q40/Q60 support" depends on MMU select MMU_MOTOROLA if MMU + select LEGACY_TIMER_TICK help The Q40 is a Motorola 68040-based successor to the Sinclair QL manufactured in Germany. There is an official Q40 home page at
arch/m68k/amiga/config.c +2 -4
@@ -475,11 +475,9 @@ static u32 clk_total, clk_offset;static irqreturn_t ciab_timer_handler (int irq,void *dev_id) { -irq_handler_t timer_routine = dev_id; - clk_total += jiffy_ticks; clk_offset =0 ; -timer_routine (0 ,NULL ); +legacy_timer_tick (1 );timer_heartbeat ();return IRQ_HANDLED ;
@@ -504,7 +502,7 @@ static void __init amiga_sched_init(irq_handler_t timer_routine)* SCSI code. We'll have to take a look at this later */ if (request_irq (IRQ_AMIGA_CIAB_TA , ciab_timer_handler,IRQF_TIMER , -"timer" , timer_routine)) +"timer" ,NULL ))pr_err ("Couldn't register timer interrupt\n" );/* start timer */ ciab.cra |=0x11 ;
arch/m68k/apollo/config.c +2 -4
@@ -168,11 +168,9 @@ void __init config_apollo(void)irqreturn_t dn_timer_int (int irq,void *dev_id) { -irq_handler_t timer_handler = dev_id; -volatile unsigned char x; -timer_handler (irq, dev_id); +legacy_timer_tick (1 );timer_heartbeat (); x = *(volatile unsigned char *)(apollo_timer +3 );
@@ -199,7 +197,7 @@ void dn_sched_init(irq_handler_t timer_routine) *(volatile unsigned char *)(apollo_timer + 0x3));#endif -if (request_irq (IRQ_APOLLO , dn_timer_int,0 ,"time" , timer_routine)) +if (request_irq (IRQ_APOLLO , dn_timer_int,0 ,"time" ,NULL ))pr_err ("Couldn't register timer interrupt\n" ); }
arch/m68k/atari/time.c +2 -3
@@ -41,7 +41,6 @@ static u8 last_timer_count;static irqreturn_t mfp_timer_c_handler (int irq,void *dev_id) { -irq_handler_t timer_routine = dev_id;unsigned long flags;local_irq_save (flags);
@@ -49,7 +48,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id) last_timer_count = st_mfp.tim_dt_c; }while (last_timer_count =1 ); clk_total +=INT_TICKS ; -timer_routine (0 ,NULL ); +legacy_timer_tick (1 );timer_heartbeat ();local_irq_restore (flags);
@@ -65,7 +64,7 @@ atari_sched_init(irq_handler_t timer_routine) st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd &15 ) |0x60 ;/* install interrupt service routine for MFP Timer C */ if (request_irq (IRQ_MFP_TIMC , mfp_timer_c_handler,IRQF_TIMER ,"timer" , - timer_routine)) +NULL ))pr_err ("Couldn't register timer interrupt\n" );clocksource_register_hz (&atari_clk,INT_CLK );
arch/m68k/bvme6000/config.c +2 -3
@@ -165,7 +165,6 @@ static u32 clk_total, clk_offset;static irqreturn_t bvme6000_timer_int (int irq,void *dev_id) { -irq_handler_t timer_routine = dev_id;unsigned long flags;volatile RtcPtr_t rtc = (RtcPtr_t )BVME_RTC_BASE ;unsigned char msr;
@@ -175,7 +174,7 @@ static irqreturn_t bvme6000_timer_int (int irq, void *dev_id) rtc->msr = msr |0x20 ;/* Ack the interrupt */ clk_total +=RTC_TIMER_CYCLES ; clk_offset =0 ; -timer_routine (0 ,NULL ); +legacy_timer_tick (1 );local_irq_restore (flags);return IRQ_HANDLED ;
@@ -198,7 +197,7 @@ void bvme6000_sched_init (irq_handler_t timer_routine) rtc->msr =0 ;/* Ensure timer registers accessible */ if (request_irq (BVME_IRQ_RTC , bvme6000_timer_int,IRQF_TIMER ,"timer" , - timer_routine)) +NULL ))panic ("Couldn't register timer int" ); rtc->t1cr_omr =0x04 ;/* Mode 2, ext clk */
arch/m68k/hp300/time.c +2 -3
@@ -55,7 +55,6 @@ static u32 clk_total, clk_offset;static irqreturn_t hp300_tick (int irq,void *dev_id) { -irq_handler_t timer_routine = dev_id;unsigned long flags;unsigned long tmp;
@@ -64,7 +63,7 @@ static irqreturn_t hp300_tick(int irq, void *dev_id) asmvolatile ("movpw %1@(5),%0" :"=d" (tmp) :"a" (CLOCKBASE )); clk_total +=INTVAL ; clk_offset =0 ; -timer_routine (0 ,NULL ); +legacy_timer_tick (1 );timer_heartbeat ();local_irq_restore (flags);
@@ -106,7 +105,7 @@ void __init hp300_sched_init(irq_handler_t vector) asmvolatile (" movpw %0,%1@(5)" : :"d" (INTVAL ),"a" (CLOCKBASE )); -if (request_irq (IRQ_AUTO_6 , hp300_tick,IRQF_TIMER ,"timer tick" , vector)) +if (request_irq (IRQ_AUTO_6 , hp300_tick,IRQF_TIMER ,"timer tick" ,NULL ))pr_err ("Couldn't register timer interrupt\n" );out_8 (CLOCKBASE +CLKCR2 ,0x1 );/* select CR1 */
arch/m68k/mac/via.c +2 -4
@@ -602,11 +602,9 @@ static u32 clk_total, clk_offset;static irqreturn_t via_timer_handler (int irq,void *dev_id) { -irq_handler_t timer_routine = dev_id; - clk_total +=VIA_TIMER_CYCLES ; clk_offset =0 ; -timer_routine (0 ,NULL ); +legacy_timer_tick (1 );return IRQ_HANDLED ; }
@@ -614,7 +612,7 @@ static irqreturn_t via_timer_handler(int irq, void *dev_id)void __init via_init_clock (irq_handler_t timer_routine) {if (request_irq (IRQ_MAC_TIMER_1 , via_timer_handler,IRQF_TIMER ,"timer" , - timer_routine)) { +NULL )) {pr_err ("Couldn't register %s interrupt\n" ,"timer" );return ; }
arch/m68k/mvme147/config.c +2 -3
@@ -112,14 +112,13 @@ static u32 clk_total;static irqreturn_t mvme147_timer_int (int irq,void *dev_id) { -irq_handler_t timer_routine = dev_id;unsigned long flags;local_irq_save (flags); m147_pcc->t1_int_cntrl =PCC_TIMER_INT_CLR ; m147_pcc->t1_cntrl =PCC_TIMER_CLR_OVF ; clk_total +=PCC_TIMER_CYCLES ; -timer_routine (0 ,NULL ); +legacy_timer_tick (1 );local_irq_restore (flags);return IRQ_HANDLED ;
@@ -129,7 +128,7 @@ static irqreturn_t mvme147_timer_int (int irq, void *dev_id)void mvme147_sched_init (irq_handler_t timer_routine) {if (request_irq (PCC_IRQ_TIMER1 , mvme147_timer_int,IRQF_TIMER , -"timer 1" , timer_routine)) +"timer 1" ,NULL ))pr_err ("Couldn't register timer interrupt\n" );/* Init the clock with a value */
arch/m68k/mvme16x/config.c +2 -3
@@ -372,14 +372,13 @@ static u32 clk_total;static irqreturn_t mvme16x_timer_int (int irq,void *dev_id) { -irq_handler_t timer_routine = dev_id;unsigned long flags;local_irq_save (flags);out_8 (PCCTIC1 ,in_8 (PCCTIC1 ) |PCCTIC1_INT_CLR );out_8 (PCCTOVR1 ,PCCTOVR1_OVR_CLR ); clk_total +=PCC_TIMER_CYCLES ; -timer_routine (0 ,NULL ); +legacy_timer_tick (1 );local_irq_restore (flags);return IRQ_HANDLED ;
@@ -396,7 +395,7 @@ void mvme16x_sched_init (irq_handler_t timer_routine)out_8 (PCCTOVR1 ,in_8 (PCCTOVR1 ) |PCCTOVR1_TIC_EN |PCCTOVR1_COC_EN );out_8 (PCCTIC1 ,PCCTIC1_INT_EN |6 );if (request_irq (MVME16x_IRQ_TIMER, mvme16x_timer_int,IRQF_TIMER ,"timer" , - timer_routine)) +NULL ))panic ("Couldn't register timer int" );clocksource_register_hz (&mvme16x_clk,PCC_TIMER_CLOCK_FREQ );
arch/m68k/q40/q40ints.c +2 -4
@@ -130,8 +130,6 @@ void q40_mksound(unsigned int hz, unsigned int ticks)static irqreturn_t q40_timer_int (int irq,void *dev_id) { -irq_handler_t timer_routine = dev_id; - ql_ticks = ql_ticks ?0 :1 ;if (sound_ticks) {unsigned char sval=(sound_ticks &1 ) ?128 -SVOL :128 +SVOL ;
@@ -144,7 +142,7 @@ static irqreturn_t q40_timer_int(int irq, void *dev_id)unsigned long flags;local_irq_save (flags); -timer_routine (0 ,NULL ); +legacy_timer_tick (1 );timer_heartbeat ();local_irq_restore (flags); }
@@ -157,7 +155,7 @@ void q40_sched_init (irq_handler_t timer_routine) timer_irq =Q40_IRQ_FRAME ; -if (request_irq (timer_irq, q40_timer_int,0 ,"timer" , timer_routine)) +if (request_irq (timer_irq, q40_timer_int,0 ,"timer" ,NULL ))panic ("Couldn't register timer int" );master_outb (-1 ,FRAME_CLEAR_REG );
Signature · 1 line
2.27.0
PATCH v2 13/15 m68k: remove timer_interrupt() function
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
This gets passed to a number of init functions, but is ignored everywhere, so remove the function and change the mach_sched_init callback to take no arguments.
--- arch/m68k/68000/timers.c | 2 +- arch/m68k/amiga/config.c | 4 ++-- arch/m68k/apollo/config.c | 4 ++-- arch/m68k/atari/config.c | 2 +- arch/m68k/atari/time.c | 2 +- arch/m68k/bvme6000/config.c | 4 ++-- arch/m68k/coldfire/pit.c | 2 +- arch/m68k/coldfire/sltimers.c | 2 +- arch/m68k/coldfire/timers.c | 2 +- arch/m68k/hp300/time.c | 2 +- arch/m68k/hp300/time.h | 2 +- arch/m68k/include/asm/machdep.h | 5 ++--- arch/m68k/kernel/setup_mm.c | 2 +- arch/m68k/kernel/setup_no.c | 2 +- arch/m68k/kernel/time.c | 15 +-------------- arch/m68k/mac/config.c | 6 +++--- arch/m68k/mac/via.c | 2 +- arch/m68k/mvme147/config.c | 4 ++-- arch/m68k/mvme16x/config.c | 4 ++-- arch/m68k/q40/config.c | 2 +- arch/m68k/q40/q40ints.c | 2 +- arch/m68k/sun3/config.c | 4 ++-- arch/m68k/sun3x/time.c | 2 +- arch/m68k/sun3x/time.h | 2 +- 24 files changed, 33 insertions(+), 47 deletions(-)
arch/m68k/68000/timers.c +1 -1
@@ -91,7 +91,7 @@ static struct clocksource m68328_clk = {/***************************************************************************/ -void hw_timer_init (irq_handler_t handler) +void hw_timer_init (void ) {int ret;
arch/m68k/amiga/config.c +2 -2
@@ -92,7 +92,7 @@ static char *amiga_models[] __initdata = {static char amiga_model_name[13 ] ="Amiga " ; -static void amiga_sched_init (irq_handler_t handler); +static void amiga_sched_init (void );static void amiga_get_model (char *model);static void amiga_get_hardware_list (struct seq_file *m);extern void amiga_mksound (unsigned int count,unsigned int ticks);
@@ -483,7 +483,7 @@ static irqreturn_t ciab_timer_handler(int irq, void *dev_id)return IRQ_HANDLED ; } -static void __init amiga_sched_init (irq_handler_t timer_routine) +static void __init amiga_sched_init (void ) {static struct resource sched_res = { .name ="timer" , .start =0x00bfd400 , .end =0x00bfd5ff ,
arch/m68k/apollo/config.c +2 -2
@@ -26,7 +26,7 @@ u_long cpuctrl_physaddr;u_long timer_physaddr;u_long apollo_model; -extern void dn_sched_init (irq_handler_t handler); +extern void dn_sched_init (void );extern void dn_init_IRQ (void );extern int dn_dummy_hwclk (int ,struct rtc_time *);extern void dn_dummy_reset (void );
@@ -179,7 +179,7 @@ irqreturn_t dn_timer_int(int irq, void *dev_id)return IRQ_HANDLED ; } -void dn_sched_init (irq_handler_t timer_routine) +void dn_sched_init (void ) {/* program timer 1 */ *(volatile unsigned char *)(apollo_timer +3 ) =0x01 ;
arch/m68k/atari/config.c +1 -1
@@ -77,7 +77,7 @@ static void atari_heartbeat(int on);#endif /* atari specific timer functions (in time.c) */ -extern void atari_sched_init (irq_handler_t ); +extern void atari_sched_init (void );extern int atari_mste_hwclk (int ,struct rtc_time *);extern int atari_tt_hwclk (int ,struct rtc_time *);
arch/m68k/atari/time.c +1 -1
@@ -56,7 +56,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id) }void __init -atari_sched_init (irq_handler_t timer_routine) +atari_sched_init (void ) {/* set Timer C data Register */ st_mfp.tim_dt_c =INT_TICKS ;
arch/m68k/bvme6000/config.c +2 -2
@@ -38,7 +38,7 @@#include <asm/bvme6000hw.h> static void bvme6000_get_model (char *model); -extern void bvme6000_sched_init (irq_handler_t handler); +extern void bvme6000_sched_init (void );extern int bvme6000_hwclk (int ,struct rtc_time *);extern void bvme6000_reset (void );void bvme6000_set_vectors (void );
@@ -189,7 +189,7 @@ static irqreturn_t bvme6000_timer_int (int irq, void *dev_id)* so divide by 8 to get the microsecond result. */ -void bvme6000_sched_init (irq_handler_t timer_routine) +void bvme6000_sched_init (void ) {volatile RtcPtr_t rtc = (RtcPtr_t )BVME_RTC_BASE ;unsigned char msr = rtc->msr &0xc0 ;
arch/m68k/coldfire/pit.c +1 -1
@@ -136,7 +136,7 @@ static struct clocksource pit_clk = {/***************************************************************************/ -void hw_timer_init (irq_handler_t handler) +void hw_timer_init (void ) {int ret;
arch/m68k/coldfire/sltimers.c +1 -1
@@ -118,7 +118,7 @@ static struct clocksource mcfslt_clk = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; -void hw_timer_init (irq_handler_t handler) +void hw_timer_init (void ) {int r;
arch/m68k/coldfire/timers.c +1 -1
@@ -107,7 +107,7 @@ static struct clocksource mcftmr_clk = {/***************************************************************************/ -void hw_timer_init (irq_handler_t handler) +void hw_timer_init (void ) {int r;
arch/m68k/hp300/time.c +1 -1
@@ -98,7 +98,7 @@ static u64 hp300_read_clk(struct clocksource *cs)return ticks; } -void __init hp300_sched_init (irq_handler_t vector) +void __init hp300_sched_init (void ) {out_8 (CLOCKBASE +CLKCR2 ,0x1 );/* select CR1 */ out_8 (CLOCKBASE +CLKCR1 ,0x1 );/* reset */
arch/m68k/hp300/time.h +1 -1
@@ -1 +1 @@ -extern void hp300_sched_init (irq_handler_t vector); +extern void hp300_sched_init (void );
arch/m68k/include/asm/machdep.h +2 -3
@@ -12,7 +12,7 @@ struct rtc_time;struct rtc_pll_info ;struct buffer_head ; -extern void (*mach_sched_init) (irq_handler_t handler); +extern void (*mach_sched_init) (void );/* machine dependent irq functions */ extern void (*mach_init_IRQ) (void );extern void (*mach_get_model) (char *model);
@@ -33,8 +33,7 @@ extern void (*mach_l2_flush) (int);extern void (*mach_beep) (unsigned int ,unsigned int );/* Hardware clock functions */ -extern void hw_timer_init (irq_handler_t handler); -extern unsigned long hw_timer_offset (void ); +extern void hw_timer_init (void );#ifdef CONFIG_HEARTBEAT extern void timer_heartbeat (void );#else
arch/m68k/kernel/setup_mm.c +1 -1
@@ -82,7 +82,7 @@ static struct m68k_mem_info m68k_ramdisk __initdata;static char m68k_command_line[CL_SIZE ]__initdata ; -void (*mach_sched_init) (irq_handler_t handler)__initdata =NULL ; +void (*mach_sched_init) (void )__initdata =NULL ;/* machine dependent irq functions */ void (*mach_init_IRQ) (void )__initdata =NULL ;void (*mach_get_model) (char *model);
arch/m68k/kernel/setup_no.c +1 -1
@@ -49,7 +49,7 @@ EXPORT_SYMBOL(memory_end);char __initdata command_line[COMMAND_LINE_SIZE ];/* machine dependent timer functions */ -void (*mach_sched_init)(irq_handler_t handler)__initdata =NULL ; +void (*mach_sched_init)(void )__initdata =NULL ;int (*mach_hwclk) (int ,struct rtc_time *);/* machine dependent reboot functions */
arch/m68k/kernel/time.c +1 -14
@@ -35,19 +35,6 @@unsigned long (*mach_random_get_entropy)(void );EXPORT_SYMBOL_GPL (mach_random_get_entropy); - -/* -* timer_interrupt() needs to keep up the real-time clock, -* as well as call the "xtime_update()" routine every clocktick -*/ -static irqreturn_t timer_interrupt (int irq,void *dummy) -{ -xtime_update (1 ); -update_process_times (user_mode (get_irq_regs ())); -profile_tick (CPU_PROFILING ); -return IRQ_HANDLED ; -} -#ifdef CONFIG_HEARTBEAT void timer_heartbeat (void ) {
@@ -157,5 +144,5 @@ module_init(rtc_init);void __init time_init (void ) { -mach_sched_init (timer_interrupt); +mach_sched_init (); }
arch/m68k/mac/config.c +3 -3
@@ -58,7 +58,7 @@ extern int mac_hwclk(int, struct rtc_time *);extern void iop_preinit (void );extern void iop_init (void );extern void via_init (void ); -extern void via_init_clock (irq_handler_t func); +extern void via_init_clock (void );extern void oss_init (void );extern void psc_init (void );extern void baboon_init (void );
@@ -69,9 +69,9 @@ static void mac_get_model(char *str);static void mac_identify (void );static void mac_report_hardware (void ); -static void __init mac_sched_init (irq_handler_t vector) +static void __init mac_sched_init (void ) { -via_init_clock (vector); +via_init_clock (); }/*
arch/m68k/mac/via.c +1 -1
@@ -609,7 +609,7 @@ static irqreturn_t via_timer_handler(int irq, void *dev_id)return IRQ_HANDLED ; } -void __init via_init_clock (irq_handler_t timer_routine) +void __init via_init_clock (void ) {if (request_irq (IRQ_MAC_TIMER_1 , via_timer_handler,IRQF_TIMER ,"timer" ,NULL )) {
arch/m68k/mvme147/config.c +2 -2
@@ -37,7 +37,7 @@static void mvme147_get_model (char *model); -extern void mvme147_sched_init (irq_handler_t handler); +extern void mvme147_sched_init (void );extern int mvme147_hwclk (int ,struct rtc_time *);extern void mvme147_reset (void );
@@ -125,7 +125,7 @@ static irqreturn_t mvme147_timer_int (int irq, void *dev_id) } -void mvme147_sched_init (irq_handler_t timer_routine) +void mvme147_sched_init (void ) {if (request_irq (PCC_IRQ_TIMER1 , mvme147_timer_int,IRQF_TIMER ,"timer 1" ,NULL ))
arch/m68k/mvme16x/config.c +2 -2
@@ -43,7 +43,7 @@ extern t_bdid mvme_bdid;static MK48T08ptr_t volatile rtc = (MK48T08ptr_t )MVME_RTC_BASE ;static void mvme16x_get_model (char *model); -extern void mvme16x_sched_init (irq_handler_t handler); +extern void mvme16x_sched_init (void );extern int mvme16x_hwclk (int ,struct rtc_time *);extern void mvme16x_reset (void );
@@ -384,7 +384,7 @@ static irqreturn_t mvme16x_timer_int (int irq, void *dev_id)return IRQ_HANDLED ; } -void mvme16x_sched_init (irq_handler_t timer_routine) +void mvme16x_sched_init (void ) {uint16_t brdno =be16_to_cpu (mvme_bdid.brdno);int irq;
arch/m68k/q40/config.c +1 -1
@@ -37,7 +37,7 @@extern void q40_init_IRQ (void );static void q40_get_model (char *model); -extern void q40_sched_init (irq_handler_t handler); +extern void q40_sched_init (void );static int q40_hwclk (int ,struct rtc_time *);static unsigned int q40_get_ss (void );
arch/m68k/q40/q40ints.c +1 -1
@@ -149,7 +149,7 @@ static irqreturn_t q40_timer_int(int irq, void *dev_id)return IRQ_HANDLED ; } -void q40_sched_init (irq_handler_t timer_routine) +void q40_sched_init (void ) {int timer_irq;
arch/m68k/sun3/config.c +2 -2
@@ -36,7 +36,7 @@char sun3_reserved_pmeg[SUN3_PMEGS_NUM ]; -static void sun3_sched_init (irq_handler_t handler); +static void sun3_sched_init (void );extern void sun3_get_model (char * model);extern int sun3_hwclk (int set,struct rtc_time *t);
@@ -151,7 +151,7 @@ void __init config_sun3(void)sun3_bootmem_alloc (memory_start, memory_end); } -static void __init sun3_sched_init (irq_handler_t timer_routine) +static void __init sun3_sched_init (void ) {sun3_disable_interrupts (); intersil_clock->cmd_reg=(INTERSIL_RUN |INTERSIL_INT_DISABLE |INTERSIL_24H_MODE );
arch/m68k/sun3x/time.c +1 -1
@@ -90,7 +90,7 @@ static irqreturn_t sun3x_timer_tick(int irq, void *dev_id) }#endif -void __init sun3x_sched_init (irq_handler_t vector) +void __init sun3x_sched_init (void ) {sun3_disable_interrupts ();
arch/m68k/sun3x/time.h +1 -1
@@ -3,7 +3,7 @@#define SUN3X_TIME_H extern int sun3x_hwclk (int set,struct rtc_time *t); -void sun3x_sched_init (irq_handler_t vector); +void sun3x_sched_init (void );struct mostek_dt {volatile unsigned char csr;
Signature · 1 line
2.27.0
PATCH v2 14/15 timekeeping: remove xtime_update
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
There are no more users of xtime_update aside from legacy_timer_tick(), so fold it into that function and remove the declaration.
update_process_times() is now only called inside of the kernel/time/ code, so the declaration can be moved there.
--- include/linux/timekeeping.h | 2 -- kernel/time/tick-legacy.c | 22 ++++++++++++++++++++-- kernel/time/timekeeping.c | 16 ---------------- kernel/time/timekeeping.h | 1 + 4 files changed, 21 insertions(+), 20 deletions(-)
include/linux/timekeeping.h +0 -2
@@ -10,8 +10,6 @@ void timekeeping_init(void);extern int timekeeping_suspended;/* Architecture timer tick functions: */ -extern void update_process_times (int user); -extern void xtime_update (unsigned long ticks);extern void legacy_timer_tick (unsigned long ticks);/*
kernel/time/tick-legacy.c +20 -2
@@ -10,10 +10,28 @@#include "tick-internal.h" +/** +* legacy_timer_tick() - advances the timekeeping infrastructure +* @ticks: number of ticks, that have elapsed since the last call. +* +* This is used by platforms that have not been converted to +* generic clockevents. +* +* If 'ticks' is zero, the CPU is not handling timekeeping, so +* only perform process accounting and profiling. +* +* Must be called with interrupts disabled. +*/ void legacy_timer_tick (unsigned long ticks) { -if (ticks) -xtime_update (ticks); +if (ticks) { +raw_spin_lock (&jiffies_lock); +write_seqcount_begin (&jiffies_seq); +do_timer (ticks); +write_seqcount_end (&jiffies_seq); +raw_spin_unlock (&jiffies_lock); +update_wall_time (); + }update_process_times (user_mode (get_irq_regs ()));profile_tick (CPU_PROFILING ); }
kernel/time/timekeeping.c +0 -16
@@ -2438,19 +2438,3 @@ void hardpps(const struct timespec64 *phase_ts, const struct timespec64 *raw_ts) }EXPORT_SYMBOL (hardpps);#endif /* CONFIG_NTP_PPS */ - -/** -* xtime_update() - advances the timekeeping infrastructure -* @ticks: number of ticks, that have elapsed since the last call. -* -* Must be called with interrupts disabled. -*/ -void xtime_update (unsigned long ticks) -{ -raw_spin_lock (&jiffies_lock); -write_seqcount_begin (&jiffies_seq); -do_timer (ticks); -write_seqcount_end (&jiffies_seq); -raw_spin_unlock (&jiffies_lock); -update_wall_time (); -}
kernel/time/timekeeping.h +1 -0
@@ -22,6 +22,7 @@ static inline int sched_clock_suspend(void) { return 0; }static inline void sched_clock_resume (void ) { }#endif +extern void update_process_times (int user);extern void do_timer (unsigned long ticks);extern void update_wall_time (void );
Signature · 1 line
2.27.0
PATCH v2 15/15 timekeeping: default GENERIC_CLOCKEVENTS to enabled
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Almost all machines use GENERIC_CLOCKEVENTS, so it feels wrong to require each one to select that symbol manually.
Instead, enable it whenever CONFIG_LEGACY_TIMER_TICK is disabled as a simplification. It should be possible to select both GENERIC_CLOCKEVENTS and LEGACY_TIMER_TICK from an architecture now and decide at runtime between the two.
For the clockevents arch-support.txt file, this means that additional architectures are marked as TODO when they have at least one machine that still uses LEGACY_TIMER_TICK, rather than being marked 'ok' when at least one machine has been converted. This means that both m68k and arm (for riscpc) revert to TODO.
At this point, we could just always enable CONFIG_GENERIC_CLOCKEVENTS rather than leaving it off when not needed. I built an m68k defconfig kernel (using gcc-10.1.0) and found that this would add around 5.5KB in kernel image size:
text data bss dec hex filename
3861936 1092236 196656 5150828 4e986c obj-m68k/vmlinux-no-clockevent
3866201 1093832 196184 5156217 4ead79 obj-m68k/vmlinux-clockevent
On Arm (MACH_RPC), that difference appears to be twice as large, around 11KB on top of an 6MB vmlinux.
--- .../features/time/clockevents/arch-support.txt | 6 +++--- arch/alpha/Kconfig | 1 - arch/arc/Kconfig | 1 - arch/arm/Kconfig | 12 ------------ 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/m68k/Kconfig.cpu | 1 - arch/microblaze/Kconfig | 1 - arch/mips/Kconfig | 1 - arch/nds32/Kconfig | 1 - arch/nios2/Kconfig | 1 - arch/openrisc/Kconfig | 1 - 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 - kernel/time/Kconfig | 2 +- 25 files changed, 4 insertions(+), 38 deletions(-)
Documentation/features/time/clockevents/arch-support.txt +3 -3
@@ -1,6 +1,6 @@ # # Feature name: clockevents -# Kconfig: GENERIC_CLOCKEVENTS +# Kconfig: !LEGACY_TIMER_TICK # description: arch support generic clock events # -----------------------
@@ -8,14 +8,14 @@ ----------------------- | alpha: | ok | | arc: | ok | - | arm: | ok | + | arm: | TODO | | arm64: | ok | | c6x: | ok | | csky: | ok | | h8300: | ok | | hexagon: | ok | | ia64: | TODO | - | m68k: | ok | + | m68k: | TODO | | microblaze: | ok | | mips: | ok | | nds32: | ok |
arch/alpha/Kconfig +0 -1
@@ -27,7 +27,6 @@ config ALPHA select ARCH_WANT_IPC_PARSE_VERSION select ARCH_HAVE_NMI_SAFE_CMPXCHG select AUDIT_ARCH - select GENERIC_CLOCKEVENTS select GENERIC_CPU_VULNERABILITIES select GENERIC_SMP_IDLE_THREAD select GENERIC_STRNCPY_FROM_USER
arch/arc/Kconfig +0 -1
@@ -19,7 +19,6 @@ config ARC select COMMON_CLK select DMA_DIRECT_REMAP select GENERIC_ATOMIC64 if !ISA_ARCV2 || !(ARC_HAS_LL64 && ARC_HAS_LLSC) - select GENERIC_CLOCKEVENTS select GENERIC_FIND_FIRST_BIT # for now, we don't need GENERIC_IRQ_PROBE, CONFIG_GENERIC_IRQ_CHIP select GENERIC_IRQ_SHOW
arch/arm/Kconfig +0 -12
@@ -321,7 +321,6 @@ config ARCH_MULTIPLATFORM select AUTO_ZRELADDR select TIMER_OF select COMMON_CLK - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_MULTI_HANDLER select HAVE_PCI select PCI_DOMAINS_GENERIC if PCI
@@ -336,7 +335,6 @@ config ARM_SINGLE_ARMV7M select TIMER_OF select COMMON_CLK select CPU_V7M - select GENERIC_CLOCKEVENTS select NO_IOPORT_MAP select SPARSE_IRQ select USE_OF
@@ -351,7 +349,6 @@ config ARCH_EP93XX select CLKDEV_LOOKUP select CLKSRC_MMIO select CPU_ARM920T - select GENERIC_CLOCKEVENTS select GPIOLIB select HAVE_LEGACY_CLK help
@@ -361,7 +358,6 @@ config ARCH_FOOTBRIDGE bool "FootBridge" select CPU_SA110 select FOOTBRIDGE - select GENERIC_CLOCKEVENTS select HAVE_IDE select NEED_MACH_IO_H if !MMU select NEED_MACH_MEMORY_H
@@ -389,7 +385,6 @@ config ARCH_IXP4XX select ARCH_SUPPORTS_BIG_ENDIAN select CPU_XSCALE select DMABOUNCE if PCI - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_MULTI_HANDLER select GPIO_IXP4XX select GPIOLIB
@@ -405,7 +400,6 @@ config ARCH_IXP4XX config ARCH_DOVE bool "Marvell Dove" select CPU_PJ4 - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_MULTI_HANDLER select GPIOLIB select HAVE_PCI
@@ -429,7 +423,6 @@ config ARCH_PXA select CLKSRC_MMIO select TIMER_OF select CPU_XSCALE if !CPU_XSC3 - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_MULTI_HANDLER select GPIO_PXA select GPIOLIB
@@ -470,7 +463,6 @@ config ARCH_SA1100 select COMMON_CLK select CPU_FREQ select CPU_SA1100 - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_MULTI_HANDLER select GPIOLIB select HAVE_IDE
@@ -485,7 +477,6 @@ config ARCH_S3C24XX bool "Samsung S3C24XX SoCs" select ATAGS select CLKSRC_SAMSUNG_PWM - select GENERIC_CLOCKEVENTS select GPIO_SAMSUNG select GPIOLIB select GENERIC_IRQ_MULTI_HANDLER
@@ -509,7 +500,6 @@ config ARCH_OMAP1 select ARCH_OMAP select CLKDEV_LOOKUP select CLKSRC_MMIO - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select GENERIC_IRQ_MULTI_HANDLER select GPIOLIB
@@ -772,7 +762,6 @@ config ARCH_ACORN config PLAT_IOP bool - select GENERIC_CLOCKEVENTS config PLAT_ORION bool
@@ -1163,7 +1152,6 @@ config HAVE_SMP config SMP bool "Symmetric Multi-Processing" depends on CPU_V6K || CPU_V7 - depends on GENERIC_CLOCKEVENTS depends on HAVE_SMP depends on MMU || ARM_MPU select IRQ_WORK
arch/arm64/Kconfig +0 -1
@@ -101,7 +101,6 @@ config ARM64 select FRAME_POINTER select GENERIC_ALLOCATOR select GENERIC_ARCH_TOPOLOGY - select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST select GENERIC_CPU_AUTOPROBE select GENERIC_CPU_VULNERABILITIES
arch/arm64/Kconfig.platforms +0 -1
@@ -256,7 +256,6 @@ config ARCH_TEGRA select ARM_GIC_PM select CLKSRC_MMIO select TIMER_OF - select GENERIC_CLOCKEVENTS select GPIOLIB select PINCTRL select PM
arch/c6x/Kconfig +0 -1
@@ -19,7 +19,6 @@ config C6X select IRQ_DOMAIN select OF select OF_EARLY_FLATTREE - select GENERIC_CLOCKEVENTS select MODULES_USE_ELF_RELA select MMU_GATHER_NO_RANGE if MMU select SET_FS
arch/csky/Kconfig +0 -1
@@ -28,7 +28,6 @@ config CSKY select GENERIC_LIB_UCMPDI2 select GENERIC_ALLOCATOR select GENERIC_ATOMIC64 - select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES select GENERIC_IRQ_CHIP select GENERIC_IRQ_PROBE
arch/h8300/Kconfig +0 -1
@@ -12,7 +12,6 @@ config H8300 select FRAME_POINTER select GENERIC_CPU_DEVICES select MODULES_USE_ELF_RELA - select GENERIC_CLOCKEVENTS select COMMON_CLK select ARCH_WANT_FRAME_POINTERS select OF
arch/hexagon/Kconfig +0 -1
@@ -27,7 +27,6 @@ config HEXAGON select GENERIC_IOMAP select GENERIC_SMP_IDLE_THREAD select STACKTRACE_SUPPORT - select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST select MODULES_USE_ELF_RELA select GENERIC_CPU_DEVICES
arch/m68k/Kconfig.cpu +0 -1
@@ -318,7 +318,6 @@ config M54xx config COLDFIRE_PIT_TIMER bool - select GENERIC_CLOCKEVENTS config COLDFIRE_TIMERS bool
arch/microblaze/Kconfig +0 -1
@@ -17,7 +17,6 @@ config MICROBLAZE select COMMON_CLK select DMA_DIRECT_REMAP if MMU select GENERIC_ATOMIC64 - select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES select GENERIC_IDLE_POLL_SETUP select GENERIC_IRQ_PROBE
arch/mips/Kconfig +0 -1
@@ -21,7 +21,6 @@ config MIPS select CPU_NO_EFFICIENT_FFS if (TARGET_ISA_REV < 1) select CPU_PM if CPU_IDLE select GENERIC_ATOMIC64 if !64BIT - select GENERIC_CLOCKEVENTS select GENERIC_CMOS_UPDATE select GENERIC_CPU_AUTOPROBE select GENERIC_GETTIMEOFDAY
arch/nds32/Kconfig +0 -1
@@ -17,7 +17,6 @@ config NDS32 select DMA_DIRECT_REMAP select GENERIC_ATOMIC64 select GENERIC_CPU_DEVICES - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select GENERIC_IRQ_SHOW select GENERIC_IOREMAP
arch/nios2/Kconfig +0 -1
@@ -10,7 +10,6 @@ config NIOS2 select COMMON_CLK select TIMER_OF select GENERIC_ATOMIC64 - select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW
arch/openrisc/Kconfig +0 -1
@@ -24,7 +24,6 @@ config OPENRISC select GENERIC_CPU_DEVICES select HAVE_UID16 select GENERIC_ATOMIC64 - select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER
arch/powerpc/Kconfig +0 -1
@@ -163,7 +163,6 @@ config PPC select EDAC_ATOMIC_SCRUB select EDAC_SUPPORT select GENERIC_ATOMIC64 if PPC32 - select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST if SMP select GENERIC_CMOS_UPDATE select GENERIC_CPU_AUTOPROBE
arch/riscv/Kconfig +0 -1
@@ -37,7 +37,6 @@ config RISCV select EDAC_SUPPORT select GENERIC_ARCH_TOPOLOGY if SMP select GENERIC_ATOMIC64 if !64BIT - select GENERIC_CLOCKEVENTS select GENERIC_EARLY_IOREMAP select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO select GENERIC_IOREMAP
arch/s390/Kconfig +0 -1
@@ -116,7 +116,6 @@ config S390 select CLONE_BACKWARDS2 select DMA_OPS if PCI select DYNAMIC_FTRACE if FUNCTION_TRACER - select GENERIC_CLOCKEVENTS select GENERIC_CPU_AUTOPROBE select GENERIC_CPU_VULNERABILITIES select GENERIC_FIND_FIRST_BIT
arch/sh/Kconfig +0 -1
@@ -16,7 +16,6 @@ config SUPERH select CPU_NO_EFFICIENT_FFS select DMA_DECLARE_COHERENT select GENERIC_ATOMIC64 - select GENERIC_CLOCKEVENTS select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST select GENERIC_IDLE_POLL_SETUP select GENERIC_IRQ_SHOW
arch/sparc/Kconfig +0 -1
@@ -39,7 +39,6 @@ config SPARC select HAVE_EBPF_JIT if SPARC64 select HAVE_DEBUG_BUGVERBOSE select GENERIC_SMP_IDLE_THREAD - select GENERIC_CLOCKEVENTS select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER select MODULES_USE_ELF_RELA
arch/um/Kconfig +0 -1
@@ -17,7 +17,6 @@ config UML select NO_DMA select GENERIC_IRQ_SHOW select GENERIC_CPU_DEVICES - select GENERIC_CLOCKEVENTS select HAVE_GCC_PLUGINS select SET_FS select TTY # Needed for line.c
arch/x86/Kconfig +0 -1
@@ -108,7 +108,6 @@ config X86 select DCACHE_WORD_ACCESS select EDAC_ATOMIC_SCRUB select EDAC_SUPPORT - select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC) select GENERIC_CLOCKEVENTS_MIN_ADJUST select GENERIC_CMOS_UPDATE
arch/xtensa/Kconfig +0 -1
@@ -16,7 +16,6 @@ config XTENSA select COMMON_CLK select DMA_REMAP if MMU select GENERIC_ATOMIC64 - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_SHOW select GENERIC_PCI_IOMAP select GENERIC_SCHED_CLOCK
kernel/time/Kconfig +1 -1
@@ -28,7 +28,7 @@ config GENERIC_TIME_VSYSCALL # The generic clock events infrastructure config GENERIC_CLOCKEVENTS - bool + def_bool !LEGACY_TIMER_TICK # Architecture can handle broadcast in a driver-agnostic way config ARCH_HAS_TICK_BROADCAST
Signature · 1 line
2.27.0
Quoted 5 lines · Arnd Bergmann
CONFIG_ARCH_GETTIMEOFFSEThas 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 theARCH_GETTIMEOFFSETinfrastructure.
The CONFIG_ARCH_GETTIMEOFFSET patches weren't part of v1. Is there some kind of dependency here?
Quoted 11 lines · Finn Thain
Quoted 5 lines · Arnd Bergmann
CONFIG_ARCH_GETTIMEOFFSEThas 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 theARCH_GETTIMEOFFSETinfrastructure.The
CONFIG_ARCH_GETTIMEOFFSETpatches weren't part of v1. Is there some kind of dependency here?
There is technically a dependency, though nobody would notice in practice: removing the ARM timer tick function in patch 6 would break the ebsa110 platform if we didn't first remove it in patch 1. Changing ebsa110 to use legacy_timer_tick in turn would introduce a conflict against the removal patch.
Neither of those is particularly harmful as there are no users of the affected ebsa110 code, but keeping the two series together avoids getting complaints from the build bots.
Arnd