From eea1308301ba09898c1474e21ad44a11b2d5b91c Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Fri, 10 Feb 2023 11:00:47 +0000 Subject: [PATCH] RISC-V: avoid soft lockup Radeon GPUs with u-boot-menu For the SiFive HiFive Unmatched board we create a pre-installed image using u-boot-menu. Increase the watchdog threshold in this case too. Signed-off-by: Heinrich Schuchardt --- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 ++ .../hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf | 1 + .../hooks.d/base/riscv64/u-boot-menu/90_watchdog-thresh.conf | 3 +++ 3 files changed, 6 insertions(+) create mode 100644 live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf create mode 100644 live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/90_watchdog-thresh.conf diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 4c1341d4..5bf703c9 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -370,6 +370,8 @@ EOF *) cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/ chroot mountpoint apt-get install -qqy u-boot-menu #grub-efi-riscv64 + mkdir -p mountpoint/etc/u-boot-menu/conf.d/ + cp ${my_d}/riscv64/u-boot-menu/*.conf mountpoint/etc/u-boot-menu/conf.d/ efi_target=riscv64-efi chroot mountpoint u-boot-update u_boot_arch="${SUBARCH}" diff --git a/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf b/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf new file mode 100644 index 00000000..380be66e --- /dev/null +++ b/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf @@ -0,0 +1 @@ +U_BOOT_PARAMETERS="ro efi=debug earlycon" diff --git a/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/90_watchdog-thresh.conf b/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/90_watchdog-thresh.conf new file mode 100644 index 00000000..d6340d33 --- /dev/null +++ b/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/90_watchdog-thresh.conf @@ -0,0 +1,3 @@ +# When booting with Radeon GPUs a soft lockup was observed. Increase the +# watchdog threshhold. +U_BOOT_PARAMETERS="$U_BOOT_PARAMETERS sysctl.kernel.watchdog_thresh=60"