Add watchdog timer support for Tegra186/194/234 SoCs
v2 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 | 111 ++++ 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, 673 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 v2 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 | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml
Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml new file +111 -0
@@ -0,0 +1,111 @@ +# 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: + minItems: 1 + maxItems: 10 + description: > + A list of 10 interrupts; one per each timer channels 0 through 9. + + - if: + properties: + compatible: + contains: + const: nvidia,tegra234-timer + then: + properties: + interrupts: + minItems: 1 + maxItems: 16 + description: > + A list of 16 interrupts; 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 v2 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 5 lines
Signed-off-by Kartik <[email protected]>--- .../bindings/timer/nvidia,tegra186-timer.yaml | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml
Rob, I've been wondering about patch application with these DT bindings. In the past I've preferred to apply these along with the driver changes that implement the bindings. I realize now that that's perhaps a bit naive because we've had cases where the driver doesn't fully implement everything in the binding as well as cases where the bindings are upstreamed without the driver necessarily being upstreamed at the same time.
So I'm thinking that it makes more sense to apply the DT bindings to the same tree as the DT changes that add corresponding DT nodes. This would also get rid of the (usually temporary) inconsistencies when running the DT validation (and even just something like checkpatch) on a DT tree that doesn't have corresponding DT bindings.
Do you have any strong preference on this?
Thierry
Rob Herring
maintainerRe: [PATCH v2 1/6] dt-bindings: timer: Add Tegra186 & Tegra234 Timer
Quoted 22 lines · Thierry Reding
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 5 lines
Signed-off-by Kartik <[email protected]>--- .../bindings/timer/nvidia,tegra186-timer.yaml | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yamlRob, I've been wondering about patch application with these DT bindings. In the past I've preferred to apply these along with the driver changes that implement the bindings. I realize now that that's perhaps a bit naive because we've had cases where the driver doesn't fully implement everything in the binding as well as cases where the bindings are upstreamed without the driver necessarily being upstreamed at the same time.
Quoted 5 lines
So I'm thinking that it makes more sense to apply the DT bindings to the same tree as the DT changes that add corresponding DT nodes. This would also get rid of the (usually temporary) inconsistencies when running the DT validation (and even just something like checkpatch) on a DT tree that doesn't have corresponding DT bindings.
The checkpatch warnings apply for the driver too. Though the current checks are pretty hacky (extract the compatible and grep the tree for it). I'm working on some more exact checks, but they will depend on processing the schemas and probably a built kernel/modules.
Quoted 1 line
Do you have any strong preference on this?
Well, the documented process is for bindings go via subsystem trees, so that's a wider discussion to change.
I prefer the bindings get accepted by subsystem maintainers that know that class of h/w and also have little motivation to accept them. Granted, some don't even look at bindings or only look if DT maintainers reviewed. If anyone else is going to look for what could be common or not, it's the subsystem maintainers, not sub-arch maintainers. Obviously, this is all generalizations and there's exceptions. It's similar reasons why I don't want to see bindings moved out of the kernel. We'd lose the subsystem maintainers review.
That being said, I might feel differently when platforms have 0 warnings and any temporary warnings are problematic.
Rob
Re: [PATCH v2 1/6] dt-bindings: timer: Add Tegra186 & Tegra234 Timer
In reply to KartikQuoted 120 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.Signed-off-by Kartik <[email protected]>--- .../bindings/timer/nvidia,tegra186-timer.yaml | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+)create mode 100644
Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yamlDocumentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml new file +101
-0@@ -0,0 +1,111 @@ +# 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: + minItems: 1 + maxItems: 10 + description: > + A list of 10 interrupts; one per each timer channels 0 through 9. + + - if: + properties: + compatible: + contains: + const: nvidia,tegra234-timer + then: + properties: + interrupts: + minItems: 1 + maxItems: 16 + description: > + A list of 16 interrupts; 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>,
Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml line 111
Quoted 10 lines
Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml new file +10
-0+ <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>; + };
Thanks!
Jon
Signature · 1 line
nvpublic
Rob Herring
maintainerRe: [PATCH v2 1/6] dt-bindings: timer: Add Tegra186 & Tegra234 Timer
In reply to KartikQuoted 55 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.Signed-off-by Kartik <[email protected]>--- .../bindings/timer/nvidia,tegra186-timer.yaml | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yamlDocumentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml new file +36
-0@@ -0,0 +1,111 @@ +# 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:
Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml line 46
Quoted 10 lines
Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml new file +10
-0+ compatible: + contains: + const: nvidia,tegra186-timer + then: + properties: + interrupts: + minItems: 1 + maxItems: 10 + description: > + A list of 10 interrupts; one per each timer channels 0 through 9.
The schema says it is a list of 1 to 10 interrupts. Which is it. Surely the h/w is fixed. If so, drop 'minItems' and the first sentence.
Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml line 59
Quoted 13 lines
Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml new file +13
-0+ + - if: + properties: + compatible: + contains: + const: nvidia,tegra234-timer + then: + properties: + interrupts: + minItems: 1 + maxItems: 16 + description: > + A list of 16 interrupts; one per each timer channels 0 through 15.
ditto
Quoted 56 lines
Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml new file +52
-0+ +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
PATCH v2 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 v2 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
Re: [PATCH v2 2/6] clocksource: Add Tegra186 timers support
In reply to KartikQuoted 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
Thanks!
Jon
Signature · 1 line
nvpublic
PATCH v2 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 v2 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(+)
Re: [PATCH v2 3/6] clocksource/drivers/timer-tegra186: Add support for Tegra234 SoC
In reply to KartikQuoted 18 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(+)drivers/clocksource/timer-tegra186.c +1
-0@@ -486,8 +486,14 @@ static const struct tegra186_timer_soc tegra186_timer = { .num_wdts = 3, }; +static const struct tegra186_timer_soc tegra234_timer = {
drivers/clocksource/timer-tegra186.c static const struct tegra186_timer_soc tegra186_timer = { · line 499
Quoted 10 lines
drivers/clocksource/timer-tegra186.c +5
-0+ .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);
Thanks!
Jon
Signature · 1 line
nvpublic
PATCH v2 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
Re: [PATCH v2 4/6] arm64: tegra: Enable native timers on Tegra186
Quoted 13 lines · Kartik
Enable the native timers on Tegra186 chips to allow using the watchdog functionality to recover from system hangs.
Signed-off-by Kartik <[email protected]>--- arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm64/boot/dts/nvidia/tegra186.dtsi +0
-0
arch/arm64/boot/dts/nvidia/tegra186.dtsi line 605
Quoted 8 lines
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 {
Thanks!
Jon
Signature · 1 line
nvpublic
PATCH v2 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
Re: [PATCH v2 5/6] arm64: tegra: Enable native timers on Tegra194
Quoted 29 lines · Kartik
From: 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.
Signed-off-by Thierry Reding <[email protected]>Signed-off-by Kartik <[email protected]>--- arch/arm64/boot/dts/nvidia/tegra194.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)arch/arm64/boot/dts/nvidia/tegra194.dtsi +9
-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>,
arch/arm64/boot/dts/nvidia/tegra194.dtsi line 719
Quoted 10 lines
arch/arm64/boot/dts/nvidia/tegra194.dtsi +7
-0+ <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>;
Thanks!
Jon
Signature · 1 line
nvpublic
PATCH v2 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
Re: [PATCH v2 6/6] arm64: tegra: Enable native timers on Tegra234
Quoted 32 lines · Kartik
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 Tegra234.
Signed-off-by Kartik <[email protected]>--- arch/arm64/boot/dts/nvidia/tegra234.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)arch/arm64/boot/dts/nvidia/tegra234.dtsi +15
-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>,
arch/arm64/boot/dts/nvidia/tegra234.dtsi line 546
Quoted 10 lines
arch/arm64/boot/dts/nvidia/tegra234.dtsi +7
-0+ <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";
Thanks!
Jon
Signature · 1 line
nvpublic