Skip to contentSkip to conversation

efi_loader: stop watchdog devices in ExitBootServices()

PATCH In review Carlo Caione 4 participants 10 messages Jul 4

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 efi_loader: stop watchdog devices in ExitBootServices()

U-Boot can autonomously start a hardware watchdog (CONFIG_WATCHDOG_AUTOSTART, default y) and service it from its main loop, but the EFI boot path never stops it: efi_exit_boot_services() tears the devices down without calling wdt_stop_all(), and a watchdog driver without a .remove hook leaves the hardware ticking across the firmware-to-OS handoff.

An EFI-booted OS that does not take over the SoC watchdog within the remaining timeout is reset mid-boot at a wall-clock-dependent point.

The UEFI specification (v2.11, section 7.5 "Miscellaneous Boot Services", EFI_BOOT_SERVICES.SetWatchdogTimer()) is explicit about the one watchdog it allows across the handoff:

"The watchdog timer is only used during boot services. On
successful completion of EFI_BOOT_SERVICES.ExitBootServices() the watchdog timer is disabled."

U-Boot's UEFI watchdog (an EFI timer event) complies by construction. A platform watchdog silently surviving the handoff defeats the purpose of that rule: the OS has no generic way to know it is running, let alone to service it.

Stop all watchdog devices in efi_exit_boot_services(), before the device teardown.

---
 lib/efi_loader/efi_boottime.c | 3 +++
 1 file changed, 3 insertions(+)
lib/efi_loader/efi_boottime.c +3 -0
index de57823bd44..9588d9b9739 100644
@@ -22,6 +22,7 @@
 #include <u-boot/crc.h>
 #include <usb.h>
 #include <watchdog.h>
+#include <wdt.h>
 #include <asm/global_data.h>
 #include <linux/libfdt_env.h>
 
@@ -2245,6 +2246,8 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle,
 		if (IS_ENABLED(CONFIG_DM_ETH))
 			eth_halt();
 		board_quiesce_devices();
+		if (IS_ENABLED(CONFIG_WDT))
+			wdt_stop_all();
 		dm_remove_devices_active();
 	}
 
Signature · 1 line
2.55.0
#1 lore raw
Quoted 23 lines · Carlo Caione

U-Boot can autonomously start a hardware watchdog (CONFIG_WATCHDOG_AUTOSTART, default y) and service it from its main loop, but the EFI boot path never stops it: efi_exit_boot_services() tears the devices down without calling wdt_stop_all(), and a watchdog driver without a .remove hook leaves the hardware ticking across the firmware-to-OS handoff.

An EFI-booted OS that does not take over the SoC watchdog within the remaining timeout is reset mid-boot at a wall-clock-dependent point.

The UEFI specification (v2.11, section 7.5 "Miscellaneous Boot Services", EFI_BOOT_SERVICES.SetWatchdogTimer()) is explicit about the one watchdog it allows across the handoff:

"The watchdog timer is only used during boot services. On
successful completion of EFI_BOOT_SERVICES.ExitBootServices() the watchdog timer is disabled."

U-Boot's UEFI watchdog (an EFI timer event) complies by construction. A platform watchdog silently surviving the handoff defeats the purpose of that rule: the OS has no generic way to know it is running, let alone to service it.

Quoted 4 lines

Stop all watchdog devices in efi_exit_boot_services(), before the device teardown.

NAK. We have had this come up before, and in short, the UEFI specification needs to be fixed here, as generally speaking a watchdog should never be stopped, as that leaves a gap where the system can hang and thus defeat the point of having enabled a watchdog.

Signature · 1 line
Tom
#2 lore raw
Quoted 32 lines · Tom Rini
Quoted 26 lines · Carlo Caione

U-Boot can autonomously start a hardware watchdog (CONFIG_WATCHDOG_AUTOSTART, default y) and service it from its main loop, but the EFI boot path never stops it: efi_exit_boot_services() tears the devices down without calling wdt_stop_all(), and a watchdog driver without a .remove hook leaves the hardware ticking across the firmware-to-OS handoff.

An EFI-booted OS that does not take over the SoC watchdog within the remaining timeout is reset mid-boot at a wall-clock-dependent point.

The UEFI specification (v2.11, section 7.5 "Miscellaneous Boot Services", EFI_BOOT_SERVICES.SetWatchdogTimer()) is explicit about the one watchdog it allows across the handoff:

"The watchdog timer is only used during boot services. On
successful completion of EFI_BOOT_SERVICES.ExitBootServices() the watchdog timer is disabled."

U-Boot's UEFI watchdog (an EFI timer event) complies by construction. A platform watchdog silently surviving the handoff defeats the purpose of that rule: the OS has no generic way to know it is running, let alone to service it.

Stop all watchdog devices in efi_exit_boot_services(), before the device teardown.

Quoted 6 lines
Quoted 1 line

NAK. We have had this come up before, and in short, the UEFI specification needs to be fixed here, as generally speaking a watchdog should never be stopped, as that leaves a gap where the system can hang and thus defeat the point of having enabled a watchdog.

Fair enough.

For the record, the failure that motivated this: a pristine Ubuntu 26.04 arm64 image on a MediaTek Genio 700 EVK dies silently about 60 seconds after ExitBootServices(), 100% reproducible, at a wall-clock dependent point. The generic kernel ships the watchdog driver as a module, so nothing services the watchdog in time, and nothing tells the OS that it is running. From the user's side this is indistinguishable from broken firmware.

In the meantime, is the accepted pattern hooking up a wdt_stop_all() in the EFI path via board_quiesce_devices()? That keeps the watchdog armed for the whole firmware lifetime and makes the handoff behaviour the board maintainer's call.

Cheers,

—
Carlo Caione

#3 lore raw
Quoted 41 lines

From: Carlo Caione <[email protected]>
Date: Sat, 4 Jul 2026 17:21:25 +0200

Quoted 30 lines · Tom Rini
Quoted 26 lines · Carlo Caione

U-Boot can autonomously start a hardware watchdog (CONFIG_WATCHDOG_AUTOSTART, default y) and service it from its main loop, but the EFI boot path never stops it: efi_exit_boot_services() tears the devices down without calling wdt_stop_all(), and a watchdog driver without a .remove hook leaves the hardware ticking across the firmware-to-OS handoff.

An EFI-booted OS that does not take over the SoC watchdog within the remaining timeout is reset mid-boot at a wall-clock-dependent point.

The UEFI specification (v2.11, section 7.5 "Miscellaneous Boot Services", EFI_BOOT_SERVICES.SetWatchdogTimer()) is explicit about the one watchdog it allows across the handoff:

"The watchdog timer is only used during boot services. On
successful completion of EFI_BOOT_SERVICES.ExitBootServices() the watchdog timer is disabled."

U-Boot's UEFI watchdog (an EFI timer event) complies by construction. A platform watchdog silently surviving the handoff defeats the purpose of that rule: the OS has no generic way to know it is running, let alone to service it.

Stop all watchdog devices in efi_exit_boot_services(), before the device teardown.

Quoted 6 lines
Quoted 1 line

NAK. We have had this come up before, and in short, the UEFI specification needs to be fixed here, as generally speaking a watchdog should never be stopped, as that leaves a gap where the system can hang and thus defeat the point of having enabled a watchdog.

Quoted 8 lines

Fair enough.

For the record, the failure that motivated this: a pristine Ubuntu 26.04 arm64 image on a MediaTek Genio 700 EVK dies silently about 60 seconds after ExitBootServices(), 100% reproducible, at a wall-clock dependent point. The generic kernel ships the watchdog driver as a module, so nothing services the watchdog in time, and nothing tells the OS that it is running.

The OS should probably assume that the watchdog timer is running. So the watchdog timer drivers should probably be built in. Or at least they should be present on initrd. If 60 seconds isn't good enough, you could look into extending the watchdog timeout (but the hardware might no support that).

Quoted 4 lines

In the meantime, is the accepted pattern hooking up a wdt_stop_all() in the EFI path via board_quiesce_devices()? That keeps the watchdog armed for the whole firmware lifetime and makes the handoff behaviour the board maintainer's call.

But it would make it impossible for users that want the watchdog enabled across the handover to use the EFI boot path.

If you really can't fix the OS, the more-or-less accepted pattern would be to disable CONFIG_WATCHDOG_AUTOSTART. That at least allows users that want the watchdog to remain active to enable the watchdog through a u-boot script.

#4 lore raw
In reply to Carlo Caione
Quoted 40 lines · Carlo Caione
Quoted 32 lines · Tom Rini
Quoted 26 lines · Carlo Caione

U-Boot can autonomously start a hardware watchdog (CONFIG_WATCHDOG_AUTOSTART, default y) and service it from its main loop, but the EFI boot path never stops it: efi_exit_boot_services() tears the devices down without calling wdt_stop_all(), and a watchdog driver without a .remove hook leaves the hardware ticking across the firmware-to-OS handoff.

An EFI-booted OS that does not take over the SoC watchdog within the remaining timeout is reset mid-boot at a wall-clock-dependent point.

The UEFI specification (v2.11, section 7.5 "Miscellaneous Boot Services", EFI_BOOT_SERVICES.SetWatchdogTimer()) is explicit about the one watchdog it allows across the handoff:

"The watchdog timer is only used during boot services. On
successful completion of EFI_BOOT_SERVICES.ExitBootServices() the watchdog timer is disabled."

U-Boot's UEFI watchdog (an EFI timer event) complies by construction. A platform watchdog silently surviving the handoff defeats the purpose of that rule: the OS has no generic way to know it is running, let alone to service it.

Stop all watchdog devices in efi_exit_boot_services(), before the device teardown.

Quoted 6 lines
Quoted 1 line

NAK. We have had this come up before, and in short, the UEFI specification needs to be fixed here, as generally speaking a watchdog should never be stopped, as that leaves a gap where the system can hang and thus defeat the point of having enabled a watchdog.

Quoted 5 lines

Fair enough.

For the record, the failure that motivated this: a pristine Ubuntu 26.04 arm64 image on a MediaTek Genio 700 EVK dies silently about 60 seconds after ExitBootServices(), 100% reproducible, at a wall-clock dependent point. The generic kernel ships the watchdog driver as a module, so nothing services the watchdog in time, and nothing tells the OS that it is running. From the user's side this is indistinguishable from broken firmware.

In the meantime, is the accepted pattern hooking up a wdt_stop_all() in the EFI path via board_quiesce_devices()? That keeps the watchdog armed for the whole firmware lifetime and makes the handoff behaviour the board maintainer's call.

No, Ubuntu needs to fix their kernel image to have the watchdog available early. I hate to be difficult on this, but it's been a known issue for years at this point that the spec needs to be updated. The workaround here is for the watchdog to not be started until the OS is ready to maintain it.

Signature · 1 line
Tom
#5 lore raw

Am 4. Juli 2026 18:17:07 MESZ schrieb Tom Rini <[email protected]>:

Quoted 45 lines · Carlo Caione
Quoted 44 lines
Quoted 32 lines · Tom Rini
Quoted 26 lines · Carlo Caione

U-Boot can autonomously start a hardware watchdog (CONFIG_WATCHDOG_AUTOSTART, default y) and service it from its main loop, but the EFI boot path never stops it: efi_exit_boot_services() tears the devices down without calling wdt_stop_all(), and a watchdog driver without a .remove hook leaves the hardware ticking across the firmware-to-OS handoff.

An EFI-booted OS that does not take over the SoC watchdog within the remaining timeout is reset mid-boot at a wall-clock-dependent point.

The UEFI specification (v2.11, section 7.5 "Miscellaneous Boot Services", EFI_BOOT_SERVICES.SetWatchdogTimer()) is explicit about the one watchdog it allows across the handoff:

"The watchdog timer is only used during boot services. On
successful completion of EFI_BOOT_SERVICES.ExitBootServices() the watchdog timer is disabled."

U-Boot's UEFI watchdog (an EFI timer event) complies by construction. A platform watchdog silently surviving the handoff defeats the purpose of that rule: the OS has no generic way to know it is running, let alone to service it.

Stop all watchdog devices in efi_exit_boot_services(), before the device teardown.

Quoted 6 lines
Quoted 1 line

NAK. We have had this come up before, and in short, the UEFI specification needs to be fixed here, as generally speaking a watchdog should never be stopped, as that leaves a gap where the system can hang and thus defeat the point of having enabled a watchdog.

Fair enough.

For the record, the failure that motivated this: a pristine Ubuntu 26.04 arm64 image on a MediaTek Genio 700 EVK dies silently about 60 seconds after ExitBootServices(), 100% reproducible, at a wall-clock dependent point. The generic kernel ships the watchdog driver as a module, so nothing services the watchdog in time, and nothing tells the OS that it is running. From the user's side this is indistinguishable from broken firmware.

Quoted 8 lines
Quoted 1 line

In the meantime, is the accepted pattern hooking up a wdt_stop_all() in the EFI path via board_quiesce_devices()? That keeps the watchdog armed for the whole firmware lifetime and makes the handoff behaviour the board maintainer's call.

No, Ubuntu needs to fix their kernel image to have the watchdog available early. I hate to be difficult on this, but it's been a known issue for years at this point that the spec needs to be updated. The workaround here is for the watchdog to not be started until the OS is ready to maintain it.

Nothing wrong with the spec. Some hardware engineers simply don't read it and create watchdog timers that cannot be set to a 5 min timeout.

Best regards

Heinrich

#6 lore raw
Quoted 48 lines · Heinrich Schuchardt

Am 4. Juli 2026 18:17:07 MESZ schrieb Tom Rini <[email protected]>:

Quoted 47 lines · Carlo Caione
Quoted 45 lines
Quoted 32 lines · Tom Rini
Quoted 26 lines · Carlo Caione

U-Boot can autonomously start a hardware watchdog (CONFIG_WATCHDOG_AUTOSTART, default y) and service it from its main loop, but the EFI boot path never stops it: efi_exit_boot_services() tears the devices down without calling wdt_stop_all(), and a watchdog driver without a .remove hook leaves the hardware ticking across the firmware-to-OS handoff.

An EFI-booted OS that does not take over the SoC watchdog within the remaining timeout is reset mid-boot at a wall-clock-dependent point.

The UEFI specification (v2.11, section 7.5 "Miscellaneous Boot Services", EFI_BOOT_SERVICES.SetWatchdogTimer()) is explicit about the one watchdog it allows across the handoff:

"The watchdog timer is only used during boot services. On
successful completion of EFI_BOOT_SERVICES.ExitBootServices() the watchdog timer is disabled."

U-Boot's UEFI watchdog (an EFI timer event) complies by construction. A platform watchdog silently surviving the handoff defeats the purpose of that rule: the OS has no generic way to know it is running, let alone to service it.

Stop all watchdog devices in efi_exit_boot_services(), before the device teardown.

Quoted 6 lines
Quoted 1 line

NAK. We have had this come up before, and in short, the UEFI specification needs to be fixed here, as generally speaking a watchdog should never be stopped, as that leaves a gap where the system can hang and thus defeat the point of having enabled a watchdog.

Fair enough.

For the record, the failure that motivated this: a pristine Ubuntu 26.04 arm64 image on a MediaTek Genio 700 EVK dies silently about 60 seconds after ExitBootServices(), 100% reproducible, at a wall-clock dependent point. The generic kernel ships the watchdog driver as a module, so nothing services the watchdog in time, and nothing tells the OS that it is running. From the user's side this is indistinguishable from broken firmware.

In the meantime, is the accepted pattern hooking up a wdt_stop_all() in the EFI path via board_quiesce_devices()? That keeps the watchdog armed for the whole firmware lifetime and makes the handoff behaviour the board maintainer's call.

Quoted 8 lines
Quoted 6 lines

No, Ubuntu needs to fix their kernel image to have the watchdog available early. I hate to be difficult on this, but it's been a known issue for years at this point that the spec needs to be updated. The workaround here is for the watchdog to not be started until the OS is ready to maintain it.

Nothing wrong with the spec. Some hardware engineers simply don't read it and create watchdog timers that cannot be set to a 5 min timeout.

Maybe 5 minutes is acceptable in some use cases. It's certainly not in others. The spec needs to be updated to reflect the reality of industries that people are pushing to use UEFI in. And then operating systems need to reflect that a watchdog is not some niche device for arm64 but something virtually every platform has and that it must be serviced ASAP.

Signature · 1 line
Tom
#7 lore raw
In reply to Tom Rini

Am 4. Juli 2026 18:17:07 MESZ schrieb Tom Rini <[email protected]>:

Quoted 45 lines · Carlo Caione
Quoted 44 lines
Quoted 32 lines · Tom Rini
Quoted 26 lines · Carlo Caione

U-Boot can autonomously start a hardware watchdog (CONFIG_WATCHDOG_AUTOSTART, default y) and service it from its main loop, but the EFI boot path never stops it: efi_exit_boot_services() tears the devices down without calling wdt_stop_all(), and a watchdog driver without a .remove hook leaves the hardware ticking across the firmware-to-OS handoff.

An EFI-booted OS that does not take over the SoC watchdog within the remaining timeout is reset mid-boot at a wall-clock-dependent point.

The UEFI specification (v2.11, section 7.5 "Miscellaneous Boot Services", EFI_BOOT_SERVICES.SetWatchdogTimer()) is explicit about the one watchdog it allows across the handoff:

"The watchdog timer is only used during boot services. On
successful completion of EFI_BOOT_SERVICES.ExitBootServices() the watchdog timer is disabled."

U-Boot's UEFI watchdog (an EFI timer event) complies by construction. A platform watchdog silently surviving the handoff defeats the purpose of that rule: the OS has no generic way to know it is running, let alone to service it.

Stop all watchdog devices in efi_exit_boot_services(), before the device teardown.

Quoted 6 lines
Quoted 1 line

NAK. We have had this come up before, and in short, the UEFI specification needs to be fixed here, as generally speaking a watchdog should never be stopped, as that leaves a gap where the system can hang and thus defeat the point of having enabled a watchdog.

Fair enough.

For the record, the failure that motivated this: a pristine Ubuntu 26.04 arm64 image on a MediaTek Genio 700 EVK dies silently about 60 seconds after ExitBootServices(), 100% reproducible, at a wall-clock dependent point. The generic kernel ships the watchdog driver as a module, so nothing services the watchdog in time, and nothing tells the OS that it is running. From the user's side this is indistinguishable from broken firmware.

Quoted 8 lines
Quoted 1 line

In the meantime, is the accepted pattern hooking up a wdt_stop_all() in the EFI path via board_quiesce_devices()? That keeps the watchdog armed for the whole firmware lifetime and makes the handoff behaviour the board maintainer's call.

No, Ubuntu needs to fix their kernel image to have the watchdog available early. I hate to be difficult on this, but it's been a known issue for years at this point that the spec needs to be updated. The workaround here is for the watchdog to not be started until the OS is ready to maintain it.

Best open a Launchpad bug explaining why this watchdog driver needs to be built in and not a module.

Best regards

Heinrich

#8 lore raw
Quoted 48 lines · Heinrich Schuchardt

Am 4. Juli 2026 18:17:07 MESZ schrieb Tom Rini <[email protected]>:

Quoted 47 lines · Carlo Caione
Quoted 45 lines
Quoted 32 lines · Tom Rini
Quoted 26 lines · Carlo Caione

U-Boot can autonomously start a hardware watchdog (CONFIG_WATCHDOG_AUTOSTART, default y) and service it from its main loop, but the EFI boot path never stops it: efi_exit_boot_services() tears the devices down without calling wdt_stop_all(), and a watchdog driver without a .remove hook leaves the hardware ticking across the firmware-to-OS handoff.

An EFI-booted OS that does not take over the SoC watchdog within the remaining timeout is reset mid-boot at a wall-clock-dependent point.

The UEFI specification (v2.11, section 7.5 "Miscellaneous Boot Services", EFI_BOOT_SERVICES.SetWatchdogTimer()) is explicit about the one watchdog it allows across the handoff:

"The watchdog timer is only used during boot services. On
successful completion of EFI_BOOT_SERVICES.ExitBootServices() the watchdog timer is disabled."

U-Boot's UEFI watchdog (an EFI timer event) complies by construction. A platform watchdog silently surviving the handoff defeats the purpose of that rule: the OS has no generic way to know it is running, let alone to service it.

Stop all watchdog devices in efi_exit_boot_services(), before the device teardown.

Quoted 6 lines
Quoted 1 line

NAK. We have had this come up before, and in short, the UEFI specification needs to be fixed here, as generally speaking a watchdog should never be stopped, as that leaves a gap where the system can hang and thus defeat the point of having enabled a watchdog.

Fair enough.

For the record, the failure that motivated this: a pristine Ubuntu 26.04 arm64 image on a MediaTek Genio 700 EVK dies silently about 60 seconds after ExitBootServices(), 100% reproducible, at a wall-clock dependent point. The generic kernel ships the watchdog driver as a module, so nothing services the watchdog in time, and nothing tells the OS that it is running. From the user's side this is indistinguishable from broken firmware.

In the meantime, is the accepted pattern hooking up a wdt_stop_all() in the EFI path via board_quiesce_devices()? That keeps the watchdog armed for the whole firmware lifetime and makes the handoff behaviour the board maintainer's call.

Quoted 8 lines
Quoted 6 lines

No, Ubuntu needs to fix their kernel image to have the watchdog available early. I hate to be difficult on this, but it's been a known issue for years at this point that the spec needs to be updated. The workaround here is for the watchdog to not be started until the OS is ready to maintain it.

Best open a Launchpad bug explaining why this watchdog driver needs to be built in and not a module.

I'll leave that to Carlos, and I would suggest digging out the mailing list threads from a year or two (or three?) ago when this had come up before, and the problem was explained and it was spelled out that U-Boot will not be spec compliant here, and I thought someone even volunteered to take this to the spec to get updated.

Signature · 1 line
Tom
#9 lore raw
Quoted 56 lines · Tom Rini
Quoted 55 lines · Heinrich Schuchardt

Am 4. Juli 2026 18:17:07 MESZ schrieb Tom Rini <[email protected]>:

Quoted 53 lines · Carlo Caione
Quoted 40 lines
Quoted 32 lines · Tom Rini
Quoted 26 lines · Carlo Caione

U-Boot can autonomously start a hardware watchdog (CONFIG_WATCHDOG_AUTOSTART, default y) and service it from its main loop, but the EFI boot path never stops it: efi_exit_boot_services() tears the devices down without calling wdt_stop_all(), and a watchdog driver without a .remove hook leaves the hardware ticking across the firmware-to-OS handoff.

An EFI-booted OS that does not take over the SoC watchdog within the remaining timeout is reset mid-boot at a wall-clock-dependent point.

The UEFI specification (v2.11, section 7.5 "Miscellaneous Boot Services", EFI_BOOT_SERVICES.SetWatchdogTimer()) is explicit about the one watchdog it allows across the handoff:

"The watchdog timer is only used during boot services. On
successful completion of EFI_BOOT_SERVICES.ExitBootServices() the watchdog timer is disabled."

U-Boot's UEFI watchdog (an EFI timer event) complies by construction. A platform watchdog silently surviving the handoff defeats the purpose of that rule: the OS has no generic way to know it is running, let alone to service it.

Stop all watchdog devices in efi_exit_boot_services(), before the device teardown.

Quoted 6 lines
Quoted 1 line

NAK. We have had this come up before, and in short, the UEFI specification needs to be fixed here, as generally speaking a watchdog should never be stopped, as that leaves a gap where the system can hang and thus defeat the point of having enabled a watchdog.

Quoted 5 lines

Fair enough.

For the record, the failure that motivated this: a pristine Ubuntu 26.04 arm64 image on a MediaTek Genio 700 EVK dies silently about 60 seconds after ExitBootServices(), 100% reproducible, at a wall-clock dependent point. The generic kernel ships the watchdog driver as a module, so nothing services the watchdog in time, and nothing tells the OS that it is running. From the user's side this is indistinguishable from broken firmware.

In the meantime, is the accepted pattern hooking up a wdt_stop_all() in the EFI path via board_quiesce_devices()? That keeps the watchdog armed for the whole firmware lifetime and makes the handoff behaviour the board maintainer's call.

No, Ubuntu needs to fix their kernel image to have the watchdog available early. I hate to be difficult on this, but it's been a known issue for years at this point that the spec needs to be updated. The workaround here is for the watchdog to not be started until the OS is ready to maintain it.

Quoted 3 lines
Quoted 1 line

Best open a Launchpad bug explaining why this watchdog driver needs to be built in and not a module.

I'll leave that to Carlos, and I would suggest digging out the mailing

... to Carlo, my apologies.

Signature · 1 line
Tom