From 7295104060abec7b719bcc77febe18ac047650b7 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Thu, 17 Jun 2021 22:46:39 -0700 Subject: [PATCH] check-sof-logger: reload drivers first As we look for the FW ABI banner we must start from a clean state Signed-off-by: Marc Herbert --- test-case/check-sof-logger.sh | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/test-case/check-sof-logger.sh b/test-case/check-sof-logger.sh index 473a5e2f..9c1412e5 100755 --- a/test-case/check-sof-logger.sh +++ b/test-case/check-sof-logger.sh @@ -21,13 +21,12 @@ set -e +TOPDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd) # shellcheck source=case-lib/lib.sh -source "$(dirname "${BASH_SOURCE[0]}")"/../case-lib/lib.sh +source "${TOPDIR}"/case-lib/lib.sh func_opt_parse_option "$@" -setup_kernel_check_point - # check sof-logger location type -a sof-logger || die "sof-logger Not Installed!" @@ -121,10 +120,31 @@ print_logs_exit() exit "$exit_code" } +reload_drivers() +{ + "${TOPDIR}"/tools/kmod/sof_remove.sh + + setup_kernel_check_point + + "${TOPDIR}"/tools/kmod/sof_insert.sh + + # The DSP may unfortunately need multiple retries to boot, see + # https://github.com/thesofproject/sof/issues/3395 + dlogi "Waiting a few seconds for the DSP to fully boot and then suspend" + for i in $(seq 1 5); do + if sudo test -e /sys/kernel/debug/sof/etrace; then break; fi + sleep 1 + done + # Now give enough time to go to D3 suspend + sleep 4 +} + main() { + reload_drivers + run_loggers || - print_logs_exit 1 "Reading etrace failed, run_loggers returned $?" + print_logs_exit 1 "Reading (e)trace failed, run_loggers returned $?" local f