ARM: dts: watchdog param creates early-watchdog#6961
Merged
pelwell merged 1 commit intoraspberrypi:rpi-6.12.yfrom Jul 16, 2025
Merged
ARM: dts: watchdog param creates early-watchdog#6961pelwell merged 1 commit intoraspberrypi:rpi-6.12.yfrom
pelwell merged 1 commit intoraspberrypi:rpi-6.12.yfrom
Conversation
The firmware change correcting the implementation of dtoverlay_is_enabled had the unintended consequence of causing the firmware to enable the watchdog even though the user had not explicitly requested it. This is harmless on Linux because the watchdog driver takes over and disarms it, but on other operating systems this can lead to a reboot. An upcoming change to the firmware will avoid this problem by also requiring the presence of a new property, "early-watchdog". It's also the case that disabling the watchdog driver in Device Tree also disables important power management functionality. Therefore, change the dtparam=watchdog implementation to only add the new property (or not), leaving the container node enabled. See: raspberrypi/firmware#1980 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
timg236
approved these changes
Jul 16, 2025
popcornmix
added a commit
to raspberrypi/firmware
that referenced
this pull request
Jul 17, 2025
kernel: ARM: dts: watchdog param creates early-watchdog See: raspberrypi/linux#6961 kernel: Additional YUV420 10bit fmts See: raspberrypi/linux#6959 kernel: Update panel-waveshare-dsi-v2 driver See: raspberrypi/linux#6957
popcornmix
added a commit
to raspberrypi/rpi-firmware
that referenced
this pull request
Jul 17, 2025
kernel: ARM: dts: watchdog param creates early-watchdog See: raspberrypi/linux#6961 kernel: Additional YUV420 10bit fmts See: raspberrypi/linux#6959 kernel: Update panel-waveshare-dsi-v2 driver See: raspberrypi/linux#6957
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The firmware change correcting the implementation of dtoverlay_is_enabled had the unintended consequence of causing the firmware to enable the watchdog even though the user had not explicitly requested it. This is harmless on Linux because the watchdog driver takes over and disarms it, but on other operating systems this can lead to a reboot.
An upcoming change to the firmware will avoid this problem by also requiring the presence of a new property, "early-watchdog". It's also the case that disabling the watchdog driver in Device Tree also disables important power management functionality. Therefore, change the dtparam=watchdog implementation to only add the new property (or not), leaving the container node enabled.
See: raspberrypi/firmware#1980