forked from microsoft/WSL2-Linux-Kernel
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'timers-core-2023-06-26' of ssh://gitolite.kernel.org/pub/s…
…cm/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 ...
- Loading branch information
Showing
29 changed files
with
777 additions
and
587 deletions.
There are no files selected for viewing
25 changes: 0 additions & 25 deletions
25
Documentation/devicetree/bindings/timer/brcm,kona-timer.txt
This file was deleted.
Oops, something went wrong.
52 changes: 52 additions & 0 deletions
52
Documentation/devicetree/bindings/timer/brcm,kona-timer.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/timer/brcm,kona-timer.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Broadcom Kona family timer | ||
|
||
maintainers: | ||
- Florian Fainelli <f.fainelli@gmail.com> | ||
|
||
properties: | ||
compatible: | ||
const: brcm,kona-timer | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
clocks: | ||
maxItems: 1 | ||
|
||
clock-frequency: true | ||
|
||
oneOf: | ||
- required: | ||
- clocks | ||
- required: | ||
- clock-frequency | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/clock/bcm281xx.h> | ||
#include <dt-bindings/interrupt-controller/arm-gic.h> | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
timer@35006000 { | ||
compatible = "brcm,kona-timer"; | ||
reg = <0x35006000 0x1000>; | ||
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; | ||
clocks = <&aon_ccu BCM281XX_AON_CCU_HUB_TIMER>; | ||
}; | ||
... |
48 changes: 48 additions & 0 deletions
48
Documentation/devicetree/bindings/timer/loongson,ls1x-pwmtimer.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/timer/loongson,ls1x-pwmtimer.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Loongson-1 PWM timer | ||
|
||
maintainers: | ||
- Keguang Zhang <keguang.zhang@gmail.com> | ||
|
||
description: | ||
Loongson-1 PWM timer can be used for system clock source | ||
and clock event timers. | ||
|
||
properties: | ||
compatible: | ||
const: loongson,ls1b-pwmtimer | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
clocks: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- clocks | ||
- interrupts | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/clock/loongson,ls1x-clk.h> | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
clocksource: timer@1fe5c030 { | ||
compatible = "loongson,ls1b-pwmtimer"; | ||
reg = <0x1fe5c030 0x10>; | ||
clocks = <&clkc LS1X_CLKID_APB>; | ||
interrupt-parent = <&intc0>; | ||
interrupts = <20 IRQ_TYPE_LEVEL_HIGH>; | ||
}; |
44 changes: 44 additions & 0 deletions
44
Documentation/devicetree/bindings/timer/ralink,rt2880-timer.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/timer/ralink,rt2880-timer.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Timer present in Ralink family SoCs | ||
|
||
maintainers: | ||
- Sergio Paracuellos <sergio.paracuellos@gmail.com> | ||
|
||
properties: | ||
compatible: | ||
const: ralink,rt2880-timer | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
clocks: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- clocks | ||
- interrupts | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
timer@100 { | ||
compatible = "ralink,rt2880-timer"; | ||
reg = <0x100 0x20>; | ||
clocks = <&sysc 3>; | ||
interrupt-parent = <&intc>; | ||
interrupts = <1>; | ||
}; | ||
... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.