Add watchdog timer support for Tegra186/194/234 SoCs
v3 cover Add watchdog timer support for Tegra186/194/234 SoCs
The native timers IP block found on Tegra SoCs implements a watchdog timer that can be used to recover from system hangs. This series of patches adds support for watchdog timers available on Tegra186, Tegra194 and Tegra234 SOC's.
To keep the history intact, I added Tegra234 driver change as separate. The original patchset is an old one authored by Thierry.
Kartik (4):
dt-bindings: timer: Add Tegra186 & Tegra234 Timer clocksource/drivers/timer-tegra186: Add support for Tegra234 SoC
arm64: tegra: Enable native timers on Tegra186
arm64: tegra: Enable native timers on Tegra234
Thierry Reding (2):
clocksource: Add Tegra186 timers support
arm64: tegra: Enable native timers on Tegra194
.../bindings/timer/nvidia,tegra186-timer.yaml | 109 ++++ arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 +- arch/arm64/boot/dts/nvidia/tegra194.dtsi | 16 + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 22 + drivers/clocksource/Kconfig | 8 + drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-tegra186.c | 514 ++++++++++++++++++ 7 files changed, 671 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml create mode 100644 drivers/clocksource/timer-tegra186.c
Signature · 1 line
2.17.1
PATCH v3 1/6 dt-bindings: timer: Add Tegra186 & Tegra234 Timer
The Tegra186 timer provides ten 29-bit timer counters and one 32-bit timestamp counter. The Tegra234 timer provides sixteen 29-bit timer counters and one 32-bit timestamp counter. Each NV timer selects its timing reference signal from the 1 MHz reference generated by USEC, TSC or either clk_m or OSC. Each TMR can be programmed to generate one-shot, periodic, or watchdog interrupts.
--- .../bindings/timer/nvidia,tegra186-timer.yaml | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml
Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml new file +109 -0
@@ -0,0 +1,109 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/timer/nvidia,tegra186-timer.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: NVIDIA Tegra186 timer + +maintainers: + - Thierry Reding <[email protected]> + +description: > + The Tegra timer provides 29-bit timer counters and a 32-bit timestamp + counter. Each NV timer selects its timing reference signal from the 1 MHz + reference generated by USEC, TSC or either clk_m or OSC. Each TMR can be + programmed to generate one-shot, periodic, or watchdog interrupts. + + +properties: + compatible: + oneOf: + - const: nvidia,tegra186-timer + description: > + The Tegra186 timer provides ten 29-bit timer counters. + - const: nvidia,tegra234-timer + description: > + The Tegra234 timer provides sixteen 29-bit timer counters. + + reg: + maxItems: 1 + + interrupts: true + +allOf: + - if: + properties: + compatible: + contains: + const: nvidia,tegra186-timer + then: + properties: + interrupts: + maxItems: 10 + description: > + One per each timer channels 0 through 9. + + - if: + properties: + compatible: + contains: + const: nvidia,tegra234-timer + then: + properties: + interrupts: + maxItems: 16 + description: > + One per each timer channels 0 through 15. + +required: + - compatible + - reg + - interrupts + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + + timer@3010000 { + compatible = "nvidia,tegra186-timer"; + reg = <0x03010000 0x000e0000>; + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; + }; + + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + + timer@2080000 { + compatible = "nvidia,tegra234-timer"; + reg = <0x02080000 0x00121000>; + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; + };
Signature · 1 line
2.17.1
Re: [PATCH v3 1/6] dt-bindings: timer: Add Tegra186 & Tegra234 Timer
Quoted 7 lines · Kartik
The Tegra186 timer provides ten 29-bit timer counters and one 32-bit timestamp counter. The Tegra234 timer provides sixteen 29-bit timer counters and one 32-bit timestamp counter. Each NV timer selects its timing reference signal from the 1 MHz reference generated by USEC, TSC or either
clk_mor OSC. Each TMR can be programmed to generate one-shot, periodic, or watchdog interrupts.
Quoted 6 lines
Signed-off-by Kartik <[email protected]>--- .../bindings/timer/nvidia,tegra186-timer.yaml | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml
PATCH v3 2/6 clocksource: Add Tegra186 timers support
In reply to KartikFrom: Thierry Reding <[email protected]>
Currently this only supports a single watchdog, which uses a timer in the background for countdown. Eventually the timers could be used for various time-keeping tasks, but by default the architected timer will already provide that functionality.
--- drivers/clocksource/Kconfig | 8 + drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-tegra186.c | 508 +++++++++++++++++++++++++++ 3 files changed, 517 insertions(+) create mode 100644 drivers/clocksource/timer-tegra186.c
drivers/clocksource/Kconfig +8 -0
@@ -156,6 +156,14 @@ config TEGRA_TIMER help Enables support for the Tegra driver. +config TEGRA186_TIMER + tristate "NVIDIA Tegra186 timer driver" + depends on ARCH_TEGRA || COMPILE_TEST + depends on WATCHDOG && WATCHDOG_CORE + help + Enables support for the timers and watchdogs found on NVIDIA + Tegra186 and later SoCs. + config VT8500_TIMER bool "VT8500 timer driver" if COMPILE_TEST depends on HAS_IOMEM
drivers/clocksource/Makefile +1 -0
@@ -36,6 +36,7 @@ obj-$(CONFIG_SUN4I_TIMER) += timer-sun4i.o obj-$(CONFIG_SUN5I_HSTIMER) += timer-sun5i.o obj-$(CONFIG_MESON6_TIMER) += timer-meson6.o obj-$(CONFIG_TEGRA_TIMER) += timer-tegra.o +obj-$(CONFIG_TEGRA186_TIMER) += timer-tegra186.o obj-$(CONFIG_VT8500_TIMER) += timer-vt8500.o obj-$(CONFIG_NSPIRE_TIMER) += timer-zevio.o obj-$(CONFIG_BCM_KONA_TIMER) += bcm_kona_timer.o
drivers/clocksource/timer-tegra186.c new file +508 -0
508 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v3 2/6] clocksource: Add Tegra186 timers support
Quoted 7 lines · Kartik
From: Thierry Reding <[email protected]>
Currently this only supports a single watchdog, which uses a timer in the background for countdown. Eventually the timers could be used for various time-keeping tasks, but by default the architected timer will already provide that functionality.
Quoted 8 lines
Signed-off-by Thierry Reding <[email protected]>Signed-off-by Kartik <[email protected]>--- drivers/clocksource/Kconfig | 8 + drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-tegra186.c | 508 +++++++++++++++++++++++++++ 3 files changed, 517 insertions(+) create mode 100644 drivers/clocksource/timer-tegra186.c
Daniel, any more work needed on this? Looks good to me, so:
I've picked up patches 1 and 4-6 into the Tegra tree, so you only need to take patches 2 and 3.
Thanks,
Thierry
Daniel Lezcano
AppliedRe: [PATCH v3 2/6] clocksource: Add Tegra186 timers support
Quoted 17 lines · Thierry Reding
Quoted 7 lines · Kartik
From: Thierry Reding <[email protected]>
Currently this only supports a single watchdog, which uses a timer in the background for countdown. Eventually the timers could be used for various time-keeping tasks, but by default the architected timer will already provide that functionality.
Quoted 8 lines
Signed-off-by Thierry Reding <[email protected]>Signed-off-by Kartik <[email protected]>--- drivers/clocksource/Kconfig | 8 + drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-tegra186.c | 508 +++++++++++++++++++++++++++ 3 files changed, 517 insertions(+)create mode 100644
drivers/clocksource/timer-tegra186.c
Quoted 6 lines
Daniel, any more work needed on this? Looks good to me, so:
Acked-by Thierry Reding <[email protected]>I've picked up patches 1 and 4-6 into the Tegra tree, so you only need to take patches 2 and 3.
Applied, thanks
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
[tip: timers/core] clocksource: Add Tegra186 timers support
In reply to KartikThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 42cee19a9f839f2d60f1cd237d6905d8649127aa Gitweb: https://git.kernel.org/tip/42cee19a9f839f2d60f1cd237d6905d8649127aa Author: Thierry Reding <[email protected]> AuthorDate: Mon, 04 Jul 2022 13:43:38 +05:30 Committer: Daniel Lezcano <[email protected]> CommitterDate: Sat, 16 Jul 2022 00:38:50 +02:00
clocksource: Add Tegra186 timers support
Currently this only supports a single watchdog, which uses a timer in the background for countdown. Eventually the timers could be used for various time-keeping tasks, but by default the architected timer will already provide that functionality.
--- drivers/clocksource/Kconfig | 8 +- drivers/clocksource/Makefile | 1 +- drivers/clocksource/timer-tegra186.c | 508 ++++++++++++++++++++++++++- 3 files changed, 517 insertions(+) create mode 100644 drivers/clocksource/timer-tegra186.c
drivers/clocksource/Kconfig +8 -0
@@ -150,6 +150,14 @@ config TEGRA_TIMER help Enables support for the Tegra driver. +config TEGRA186_TIMER + tristate "NVIDIA Tegra186 timer driver" + depends on ARCH_TEGRA || COMPILE_TEST + depends on WATCHDOG && WATCHDOG_CORE + help + Enables support for the timers and watchdogs found on NVIDIA + Tegra186 and later SoCs. + config VT8500_TIMER bool "VT8500 timer driver" if COMPILE_TEST depends on HAS_IOMEM
drivers/clocksource/Makefile +1 -0
@@ -36,6 +36,7 @@ obj-$(CONFIG_SUN4I_TIMER) += timer-sun4i.o obj-$(CONFIG_SUN5I_HSTIMER) += timer-sun5i.o obj-$(CONFIG_MESON6_TIMER) += timer-meson6.o obj-$(CONFIG_TEGRA_TIMER) += timer-tegra.o +obj-$(CONFIG_TEGRA186_TIMER) += timer-tegra186.o obj-$(CONFIG_VT8500_TIMER) += timer-vt8500.o obj-$(CONFIG_NSPIRE_TIMER) += timer-zevio.o obj-$(CONFIG_BCM_KONA_TIMER) += bcm_kona_timer.o
drivers/clocksource/timer-tegra186.c new file +508 -0
508 lines not on this page · raw message
PATCH v3 3/6 clocksource/drivers/timer-tegra186: Add support for Tegra234 SoC
In reply to KartikThe timer IP block present on Tegra234 SoC supports watchdog timer functionality that can be used to recover from system hangs. The watchdog timer uses a timer in the background for countdown.
--- drivers/clocksource/timer-tegra186.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/clocksource/timer-tegra186.c +6 -0
@@ -486,8 +486,14 @@ static const struct tegra186_timer_soc tegra186_timer = { .num_wdts = 3, }; +static const struct tegra186_timer_soc tegra234_timer = { + .num_timers =16 , + .num_wdts =3 , +}; +static const struct of_device_id tegra186_timer_of_match[] = { { .compatible ="nvidia,tegra186-timer" , .data = &tegra186_timer }, + { .compatible ="nvidia,tegra234-timer" , .data = &tegra234_timer }, { } };MODULE_DEVICE_TABLE (of, tegra186_timer_of_match);
Signature · 1 line
2.17.1
Re: [PATCH v3 3/6] clocksource/drivers/timer-tegra186: Add support for Tegra234 SoC
Quoted 8 lines · Kartik
The timer IP block present on Tegra234 SoC supports watchdog timer functionality that can be used to recover from system hangs. The watchdog timer uses a timer in the background for countdown.
Signed-off-by Kartik <[email protected]>--- drivers/clocksource/timer-tegra186.c | 6 ++++++ 1 file changed, 6 insertions(+)
[tip: timers/core] clocksource/drivers/timer-tegra186: Add support for Tegra234 SoC
In reply to KartikThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 07385a6055a8649593052703b1bfd6aef49db02a Gitweb: https://git.kernel.org/tip/07385a6055a8649593052703b1bfd6aef49db02a Author: Kartik <[email protected]> AuthorDate: Mon, 04 Jul 2022 13:43:39 +05:30 Committer: Daniel Lezcano <[email protected]> CommitterDate: Sat, 16 Jul 2022 00:38:50 +02:00
clocksource/drivers/timer-tegra186: Add support for Tegra234 SoC
The timer IP block present on Tegra234 SoC supports watchdog timer functionality that can be used to recover from system hangs. The watchdog timer uses a timer in the background for countdown.
--- drivers/clocksource/timer-tegra186.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/clocksource/timer-tegra186.c +6 -0
@@ -486,8 +486,14 @@ static const struct tegra186_timer_soc tegra186_timer = { .num_wdts = 3, }; +static const struct tegra186_timer_soc tegra234_timer = { + .num_timers =16 , + .num_wdts =3 , +}; +static const struct of_device_id tegra186_timer_of_match[] = { { .compatible ="nvidia,tegra186-timer" , .data = &tegra186_timer }, + { .compatible ="nvidia,tegra234-timer" , .data = &tegra234_timer }, { } };MODULE_DEVICE_TABLE (of, tegra186_timer_of_match);
PATCH v3 4/6 arm64: tegra: Enable native timers on Tegra186
In reply to KartikEnable the native timers on Tegra186 chips to allow using the watchdog functionality to recover from system hangs.
--- arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/nvidia/tegra186.dtsi +1 -1
@@ -599,7 +599,7 @@ <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; + status = "okay"; }; uarta: serial@3100000 {
Signature · 1 line
2.17.1
PATCH v3 5/6 arm64: tegra: Enable native timers on Tegra194
In reply to KartikFrom: Thierry Reding <[email protected]>
The native timers IP block found on NVIDIA Tegra SoCs implements a watchdog timer that can be used to recover from system hangs. Add and enable the device tree node on Tegra194.
--- arch/arm64/boot/dts/nvidia/tegra194.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/nvidia/tegra194.dtsi +16 -0
@@ -698,6 +698,22 @@ }; }; + timer@3010000 { + compatible = "nvidia,tegra186-timer"; + reg = <0x03010000 0x000e0000>; + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; + status = "okay"; + }; + uarta: serial@3100000 { compatible = "nvidia,tegra194-uart", "nvidia,tegra20-uart"; reg = <0x03100000 0x40>;
Signature · 1 line
2.17.1
PATCH v3 6/6 arm64: tegra: Enable native timers on Tegra234
In reply to KartikThe native timers IP block found on NVIDIA Tegra SoCs implements a watchdog timer that can be used to recover from system hangs. Add and enable the device tree node on Tegra234.
--- arch/arm64/boot/dts/nvidia/tegra234.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/arm64/boot/dts/nvidia/tegra234.dtsi +22 -0
@@ -519,6 +519,28 @@ status = "okay"; }; + timer@2080000 { + compatible = "nvidia,tegra234-timer"; + reg = <0x02080000 0x00121000>; + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; + status = "okay"; + }; + gpio: gpio@2200000 { compatible = "nvidia,tegra234-gpio"; reg-names = "security", "gpio";
Signature · 1 line
2.17.1
Thierry Reding
AppliedQuoted 18 lines · Kartik
The native timers IP block found on Tegra SoCs implements a watchdog timer that can be used to recover from system hangs. This series of patches adds support for watchdog timers available on Tegra186, Tegra194 and Tegra234 SOC's.
To keep the history intact, I added Tegra234 driver change as separate. The original patchset is an old one authored by Thierry.
Kartik (4):
dt-bindings: timer: Add Tegra186 & Tegra234 Timer clocksource/drivers/timer-tegra186: Add support for Tegra234 SoC
arm64: tegra: Enable native timers on Tegra186
arm64: tegra: Enable native timers on Tegra234Thierry Reding (2):
clocksource: Add Tegra186 timers support
arm64: tegra: Enable native timers on Tegra194
Quoted 10 lines
.../bindings/timer/nvidia,tegra186-timer.yaml | 109 ++++ arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 +- arch/arm64/boot/dts/nvidia/tegra194.dtsi | 16 + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 22 + drivers/clocksource/Kconfig | 8 + drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-tegra186.c | 514 ++++++++++++++++++ 7 files changed, 671 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml create mode 100644 drivers/clocksource/timer-tegra186.c
Applied patches 1 and 4-6 to the Tegra tree, thanks.
Thierry