adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

soc: intel_adsp: tools: cavstool: Fix fw_is_alive() and wait_fw_entered()

Browse source 
The fw_is_alive() depends on 'dsp' global variable which is assigned
from map_regs() return value. To make fw_is_alive() and
wait_fw_entered(), that calls fw_is_alive(), callable from another
module, the 'dsp' variable needs to be passed as an argument.

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
This commit is contained in:
Jyri Sarha 2024-09-19 12:11:28 +03:00 committed by Fabio Baltieri
parent 91495812bd
commit 9563960bde
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
soc/intel/intel_adsp/tools/cavstool.py
View file

@ -482,7 +482,7 @@ def load_firmware(fw_file):
log.info(f"Starting DMA, FW_STATUS = 0x{dsp.SRAM_FW_STATUS:x}")
sd.CTL |= 2 # START flag
wait_fw_entered()
wait_fw_entered(dsp, timeout_s=None)
# Turn DMA off and reset the stream. Clearing START first is a
# noop per the spec, but absolutely required for stability.
@ -604,7 +604,7 @@ def load_firmware_ace(fw_file):
log.info(f"Starting DMA, FW_STATUS = 0x{dsp.ROM_STATUS:x}")
sd.CTL |= 2 # START flag
wait_fw_entered()
wait_fw_entered(dsp, timeout_s=None)
# Turn DMA off and reset the stream. Clearing START first is a
# noop per the spec, but absolutely required for stability.
@ -618,17 +618,17 @@ def load_firmware_ace(fw_file):
sd.CTL |= 1
log.info(f"ACE firmware load complete")
def fw_is_alive():
def fw_is_alive(dsp):
return dsp.ROM_STATUS & ((1 << 28) - 1) == 5 # "FW_ENTERED"
def wait_fw_entered(timeout_s=2):
def wait_fw_entered(dsp, timeout_s):
log.info("Waiting %s for firmware handoff, ROM_STATUS = 0x%x",
"forever" if timeout_s is None else f"{timeout_s} seconds",
dsp.ROM_STATUS)
hertz = 100
attempts = None if timeout_s is None else timeout_s * hertz
while True:
alive = fw_is_alive()
alive = fw_is_alive(dsp)
if alive:
break
if attempts is not None:
@ -875,10 +875,10 @@ def ipc_command(data, ext_data):
sys.stdout.flush()
else:
log.warning(f"cavstool: Unrecognized IPC command 0x{data:x} ext 0x{ext_data:x}")
if not fw_is_alive():
if not fw_is_alive(dsp):
if args.log_only:
log.info("DSP power seems off")
wait_fw_entered(timeout_s=None)
wait_fw_entered(dsp, timeout_s=None)
else:
log.warning("DSP power seems off?!")
time.sleep(2) # potential spam reduction
@ -929,7 +929,7 @@ async def main():
log.info(f"Detected cAVS 1.8+ hardware")
if args.log_only:
wait_fw_entered(timeout_s=None)
wait_fw_entered(dsp, timeout_s=None)
else:
if not args.fw_file:
log.error("Firmware file argument missing")