From e536ed08243ff1ae90e96f8e01992729d9dce7df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Tue, 10 Dec 2024 10:01:33 +0200 Subject: [PATCH] freedreno/ci: use the boot watchdog to ensure the a750 boots MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows us to drop the reboot condition on SaharaMode which means that every time the reboot pattern is hit, it is due to a test execution issue (GPU hang) and not something unrelated to the job. Additionally, this allows us to try booting up to 5 times which should help boot reliability. Signed-off-by: Martin Roukala (né Peres) Reviewed-by: Eric Engestrom Part-of: --- src/freedreno/ci/gitlab-ci-inc.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index f9c10c50bdf..e1901d1e99b 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -356,9 +356,13 @@ B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g' # FIXME: drop the hangcheck part when we move to linux 6.11+ as hang # recovery should be more stable - B2C_SESSION_REBOOT_REGEX: 'Sahara Open\r?$|hangcheck detected' + B2C_SESSION_REBOOT_REGEX: 'hangcheck detected' B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_SECONDS: 30 B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_RETRIES: 3 + B2C_TIMEOUT_BOOT_WD_SECONDS: 20 + B2C_TIMEOUT_BOOT_WD_RETRIES: 5 + B2C_BOOT_WD_START_REGEX: 'VB: RWDeviceState: Succeed using devinfo!' # A line repeated during firmware boot + B2C_BOOT_WD_STOP_REGEX: 'CPU features: detected:' # A line repeated during Linux boot GPU_VERSION: freedreno-a750 tags: - farm:$RUNNER_FARM_LOCATION