Skip to content

Commit cd336f6

Browse files
torvaldstorvalds
committed
Merge tag 'timers-core-2023-06-26' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer updates from Thomas Gleixner: "Time, timekeeping and related device driver updates: Core: - A set of fixes, cleanups and enhancements to the posix timer code: - Prevent another possible live lock scenario in the exit() path, which affects POSIX_CPU_TIMERS_TASK_WORK enabled architectures. - Fix a loop termination issue which was reported syzcaller/KSAN in the posix timer ID allocation code. That triggered a deeper look into the posix-timer code which unearthed more small issues. - Add missing READ/WRITE_ONCE() annotations - Fix or remove completely outdated comments - Document places which are subtle and completely undocumented. - Add missing hrtimer modes to the trace event decoder - Small cleanups and enhancements all over the place Drivers: - Rework the Hyper-V clocksource and sched clock setup code - Remove a deprecated clocksource driver - Small fixes and enhancements all over the place" * tag 'timers-core-2023-06-26' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits) clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe dt-bindings: timers: Add Ralink SoCs timer clocksource/drivers/hyper-v: Rework clocksource and sched clock setup dt-bindings: timer: brcm,kona-timer: convert to YAML clocksource/drivers/imx-gpt: Fold <soc/imx/timer.h> into its only user clk: imx: Drop inclusion of unused header <soc/imx/timer.h> hrtimer: Add missing sparse annotations to hrtimer locking clocksource/drivers/imx-gpt: Use only a single name for functions clocksource/drivers/loongson1: Move PWM timer to clocksource framework dt-bindings: timer: Add Loongson-1 clocksource MIPS: Loongson32: Remove deprecated PWM timer clocksource clocksource/drivers/ingenic-timer: Use pm_sleep_ptr() macro tracing/timer: Add missing hrtimer modes to decode_hrtimer_mode(). posix-timers: Add sys_ni_posix_timers() prototype tick/rcu: Fix bogus ratelimit condition alarmtimer: Remove unnecessary (void *) cast alarmtimer: Remove unnecessary initialization of variable 'ret' posix-timers: Refer properly to CONFIG_HIGH_RES_TIMERS posix-timers: Polish coding style in a few places posix-timers: Remove pointless comments ...
2 parents 9244724 + d2b32be commit cd336f6

29 files changed

Lines changed: 777 additions & 587 deletions

File tree

‎Documentation/devicetree/bindings/timer/brcm,kona-timer.txt‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎Documentation/devicetree/bindings/timer/brcm,kona-timer.yaml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/timer/brcm,kona-timer.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom Kona family timer
8+
9+
maintainers:
10+
- Florian Fainelli <f.fainelli@gmail.com>
11+
12+
properties:
13+
compatible:
14+
const: brcm,kona-timer
15+
16+
reg:
17+
maxItems: 1
18+
19+
interrupts:
20+
maxItems: 1
21+
22+
clocks:
23+
maxItems: 1
24+
25+
clock-frequency: true
26+
27+
oneOf:
28+
- required:
29+
- clocks
30+
- required:
31+
- clock-frequency
32+
33+
required:
34+
- compatible
35+
- reg
36+
- interrupts
37+
38+
additionalProperties: false
39+
40+
examples:
41+
- |
42+
#include <dt-bindings/clock/bcm281xx.h>
43+
#include <dt-bindings/interrupt-controller/arm-gic.h>
44+
#include <dt-bindings/interrupt-controller/irq.h>
45+
46+
timer@35006000 {
47+
compatible = "brcm,kona-timer";
48+
reg = <0x35006000 0x1000>;
49+
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
50+
clocks = <&aon_ccu BCM281XX_AON_CCU_HUB_TIMER>;
51+
};
52+
...

‎Documentation/devicetree/bindings/timer/loongson,ls1x-pwmtimer.yaml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/timer/loongson,ls1x-pwmtimer.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Loongson-1 PWM timer
8+
9+
maintainers:
10+
- Keguang Zhang <keguang.zhang@gmail.com>
11+
12+
description:
13+
Loongson-1 PWM timer can be used for system clock source
14+
and clock event timers.
15+
16+
properties:
17+
compatible:
18+
const: loongson,ls1b-pwmtimer
19+
20+
reg:
21+
maxItems: 1
22+
23+
clocks:
24+
maxItems: 1
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
required:
30+
- compatible
31+
- reg
32+
- clocks
33+
- interrupts
34+
35+
additionalProperties: false
36+
37+
examples:
38+
- |
39+
#include <dt-bindings/clock/loongson,ls1x-clk.h>
40+
#include <dt-bindings/interrupt-controller/irq.h>
41+
clocksource: timer@1fe5c030 {
42+
compatible = "loongson,ls1b-pwmtimer";
43+
reg = <0x1fe5c030 0x10>;
44+
45+
clocks = <&clkc LS1X_CLKID_APB>;
46+
interrupt-parent = <&intc0>;
47+
interrupts = <20 IRQ_TYPE_LEVEL_HIGH>;
48+
};

‎Documentation/devicetree/bindings/timer/ralink,rt2880-timer.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/timer/ralink,rt2880-timer.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Timer present in Ralink family SoCs
8+
9+
maintainers:
10+
- Sergio Paracuellos <sergio.paracuellos@gmail.com>
11+
12+
properties:
13+
compatible:
14+
const: ralink,rt2880-timer
15+
16+
reg:
17+
maxItems: 1
18+
19+
clocks:
20+
maxItems: 1
21+
22+
interrupts:
23+
maxItems: 1
24+
25+
required:
26+
- compatible
27+
- reg
28+
- clocks
29+
- interrupts
30+
31+
additionalProperties: false
32+
33+
examples:
34+
- |
35+
timer@100 {
36+
compatible = "ralink,rt2880-timer";
37+
reg = <0x100 0x20>;
38+
39+
clocks = <&sysc 3>;
40+
41+
interrupt-parent = <&intc>;
42+
interrupts = <1>;
43+
};
44+
...

‎arch/alpha/kernel/osf_sys.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,8 +1014,6 @@ SYSCALL_DEFINE2(osf_settimeofday, struct timeval32 __user *, tv,
10141014
return do_sys_settimeofday64(tv ? &kts : NULL, tz ? &ktz : NULL);
10151015
}
10161016

1017-
asmlinkage long sys_ni_posix_timers(void);
1018-
10191017
SYSCALL_DEFINE2(osf_utimes, const char __user *, filename,
10201018
struct timeval32 __user *, tvs)
10211019
{

‎arch/mips/include/asm/mach-loongson32/loongson1.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747

4848
#include <regs-clk.h>
4949
#include <regs-mux.h>
50-
#include <regs-pwm.h>
5150
#include <regs-rtc.h>
5251
#include <regs-wdt.h>
5352

‎arch/mips/include/asm/mach-loongson32/regs-pwm.h‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎arch/mips/loongson32/Kconfig‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -35,41 +35,4 @@ config LOONGSON1_LS1C
3535
select COMMON_CLK
3636
endchoice
3737

38-
menuconfig CEVT_CSRC_LS1X
39-
bool "Use PWM Timer for clockevent/clocksource"
40-
select MIPS_EXTERNAL_TIMER
41-
depends on CPU_LOONGSON32
42-
help
43-
This option changes the default clockevent/clocksource to PWM Timer,
44-
and is required by Loongson1 CPUFreq support.
45-
46-
If unsure, say N.
47-
48-
choice
49-
prompt "Select clockevent/clocksource"
50-
depends on CEVT_CSRC_LS1X
51-
default TIMER_USE_PWM0
52-
53-
config TIMER_USE_PWM0
54-
bool "Use PWM Timer 0"
55-
help
56-
Use PWM Timer 0 as the default clockevent/clocksourcer.
57-
58-
config TIMER_USE_PWM1
59-
bool "Use PWM Timer 1"
60-
help
61-
Use PWM Timer 1 as the default clockevent/clocksourcer.
62-
63-
config TIMER_USE_PWM2
64-
bool "Use PWM Timer 2"
65-
help
66-
Use PWM Timer 2 as the default clockevent/clocksourcer.
67-
68-
config TIMER_USE_PWM3
69-
bool "Use PWM Timer 3"
70-
help
71-
Use PWM Timer 3 as the default clockevent/clocksourcer.
72-
73-
endchoice
74-
7538
endif # MACH_LOONGSON32

0 commit comments

Comments
 (0)