From 98f66d7564673cb87ef60a40738871035270d512 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Tue, 25 Jan 2022 23:07:31 -0800 Subject: [PATCH] soc/intel_adsp: cavstool: don't unload driver when --log-only Audio users want logging too. This restores feature parity since the older scripts were removed in commit cd5302fa0021 ("boards/intel_adsp_cavs15: Remove ancient tooling") Signed-off-by: Marc Herbert --- soc/xtensa/intel_adsp/tools/cavstool.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/soc/xtensa/intel_adsp/tools/cavstool.py b/soc/xtensa/intel_adsp/tools/cavstool.py index 329fb49c4ce..46cf27031fe 100755 --- a/soc/xtensa/intel_adsp/tools/cavstool.py +++ b/soc/xtensa/intel_adsp/tools/cavstool.py @@ -37,8 +37,12 @@ def map_regs(): # Check sysfs for a loaded driver and remove it if os.path.exists(f"{pcidir}/driver"): mod = os.path.basename(os.readlink(f"{pcidir}/driver/module")) - log.warning(f"Existing driver found! Unloading \"{mod}\" module") - runx(f"rmmod -f {mod}") + found_msg = f"Existing driver \"{mod}\" found" + if args.log_only: + log.info(found_msg) + else: + log.warning(found_msg + ", unloading module") + runx(f"rmmod -f {mod}") # Disengage runtime power management so the kernel doesn't put it to sleep with open(f"{pcidir}/power/control", "w") as ctrl: