| Message ID | 20250124080659.469424-3-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Security testing with MTDA | expand |
On 24.01.25 09:06, Quirin Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > Due to the multiple watchdogs available on the mcom > device efibootguard select the iTCO watchdog and the > Linux kernel selects the WDAT watchdog which leads to > an system reboot during booting as the Linux kernel no > longer drives the iTCO watchdog. > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > .gitlab-ci.yml | 2 ++ > kas/opt/disable-watchdog.yml | 15 +++++++++++++++ > 2 files changed, 17 insertions(+) > create mode 100644 kas/opt/disable-watchdog.yml > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 42e247d..97ef031 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -64,6 +64,7 @@ default: > - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi > - if [ "${release}" = "trixie" ]; then base_yaml="${base_yaml}:kas/opt/trixie.yml"; fi > - if [ "${encrypt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/encrypt-data.yml"; fi > + - if [ "${disable_watchdog}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/disable-watchdog.yml"; fi "watchdog = disable" would be nicer to read. Just make "enable" the default and turn it off when needed. Jan > - if [ "${swupdate_version}" = "2022.12" ]; then base_yaml="${base_yaml}:kas/opt/swupdate-2022.12.yaml"; fi > - echo "Building ${base_yaml}" > - kas build ${base_yaml} > @@ -250,6 +251,7 @@ build:x86-uefi-secure-boot: > use_rt: disable > targz: disable > encrypt: disable > + disable_watchdog: enable > > build:qemu-amd64-swupdate: > extends: > diff --git a/kas/opt/disable-watchdog.yml b/kas/opt/disable-watchdog.yml > new file mode 100644 > index 0000000..88ece6b > --- /dev/null > +++ b/kas/opt/disable-watchdog.yml > @@ -0,0 +1,15 @@ > +# > +# Copyright (c) Siemens AG, 2025 > +# > +# Authors: > +# Quirin Gylstorff <quirin.gylstorff@siemens.com> > +# > +# SPDX-License-Identifier: MIT > +# > + > +header: > + version: 14 > + > +local_conf_header: > + no-watchdog: | > + WDOG_TIMEOUT = "0"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42e247d..97ef031 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,6 +64,7 @@ default: - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi - if [ "${release}" = "trixie" ]; then base_yaml="${base_yaml}:kas/opt/trixie.yml"; fi - if [ "${encrypt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/encrypt-data.yml"; fi + - if [ "${disable_watchdog}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/disable-watchdog.yml"; fi - if [ "${swupdate_version}" = "2022.12" ]; then base_yaml="${base_yaml}:kas/opt/swupdate-2022.12.yaml"; fi - echo "Building ${base_yaml}" - kas build ${base_yaml} @@ -250,6 +251,7 @@ build:x86-uefi-secure-boot: use_rt: disable targz: disable encrypt: disable + disable_watchdog: enable build:qemu-amd64-swupdate: extends: diff --git a/kas/opt/disable-watchdog.yml b/kas/opt/disable-watchdog.yml new file mode 100644 index 0000000..88ece6b --- /dev/null +++ b/kas/opt/disable-watchdog.yml @@ -0,0 +1,15 @@ +# +# Copyright (c) Siemens AG, 2025 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# + +header: + version: 14 + +local_conf_header: + no-watchdog: | + WDOG_TIMEOUT = "0"