1 files changed, 59 insertions, 17 deletions

diff --git a/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch b/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
index e66c0fd0..d3328fa7 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
+++ b/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
@@ -74,7 +74,7 @@ def help(status):
             if not set(APU_args).intersection(set(help_options)):
                 APU_args.append('-help')
             print(f"APU Options:\n")
-            print(f"    -bootbin <boot.bin> - Use a boot.bin instead of individual firmware, device trees and bootloader\n")
+            print(f"    -bootbin [arch:]<boot.bin> - Use a boot.bin instead of individual firmware, device trees and bootloader.  While arch: is optonal, it is recommended.  The default arch is 'versal'.\n")
             print(f"    -dtb - Specify hardware dtb for the APU\n")
             print(f"    -kernel - option is filtered out, but is available for compatibility\n")
             apu_args_s = ' '.join(APU_args)
@@ -83,6 +83,10 @@ def help(status):
         print(f"    -machine-path <path> - Optional path to use for multiarch files. This path must be less then about 100 characters.\n     Note: if specified caller is responsible for cleaning up the directory on exist\n")
 
         print(f"{help_cmd}\n")
+
+        # Without this the Popen below can end up printing before the above
+        sys.stdout.flush()
+
         process = subprocess.Popen(help_cmd, shell=True, stderr=subprocess.PIPE)
         status = process.wait()
     sys.exit(status)
@@ -121,16 +125,32 @@ if PMU_args:
             '\nSee "meta-xilinx/README.qemu.md" for more information on accquiring the PMU ROM.\n')
 
 if bootbin_arg:
-    if not os.path.isfile(bootbin_arg):
-        print(f"\nERROR: bootbin file not found at {bootbin_arg}\n")
+    # List of valid bootgen arches and settings
+    archs = [ 'versal' ]
+    boot_header_addr = {'versal' : '0xf201e000'}
+
+    # The bootbin is separated into "arch:file"
+    # Default to versal for legacy reasons
+    arch = 'versal'
+    bootbin_fn = bootbin_arg
+
+    if ':' in bootbin_arg:
+        (arch, bootbin_fn) = bootbin_arg.split(':', 1)
+
+    if not os.path.isfile(bootbin_fn):
+        print(f"\nERROR: bootbin file not found at {bootbin_fn}\n")
+        sys.exit(1)
+
+    if arch not in archs:
+        print(f"\nERROR: bootbin arch {arch} not valid ({archs})\n")
         sys.exit(1)
 
-    shutil.copyfile(bootbin_arg, f'{mach_path}/boot.bin')
+    shutil.copyfile(bootbin_fn, f'{mach_path}/boot.bin')
 
-    bootgen_command = [f'{binpath}/bootgen', '-arch', 'versal', '-dump', 'boot.bin']
+    bootgen_command = [f'{binpath}/bootgen', '-arch', arch, '-dump', 'boot.bin']
     subprocess.run(bootgen_command + ['boot_files'], check=True, cwd=mach_path, stdout=subprocess.DEVNULL)
 
-    bootgen_command = f"{binpath}/bootgen -arch versal -read {bootbin_arg}"
+    bootgen_command = f"{binpath}/bootgen -arch {arch} -read {bootbin_fn}"
     result = subprocess.check_output(bootgen_command.split())
     bootgen_output = result.decode().splitlines()
 
@@ -142,15 +162,26 @@ if bootbin_arg:
 
     plm_load_addr = re.search(r"exec_addr_lo \(0x10\) : (0x\w*)\s*", plm_line).group(1)
     pmc_load_addr = re.search(r"pmccdo_load_addr \(0x20\) : (0x\w*)", pmc_line).group(1)
-    print(f"qemu-system-aarch64-multiarch: INFO: Using QSPI/OSPI bootbin file\n")
-    print(f"qemu-system-aarch64-multiarch: INFO: bootbin file dump PLM load addr: {plm_load_addr}\n")
-    print(f"qemu-system-aarch64-multiarch: INFO: bootbin file dump PMC load addr: {pmc_load_addr}\n")
+    print(f"qemu-system-aarch64-multiarch: INFO: Using QSPI/OSPI bootbin file")
 
-    PLM_args.append(f"-device loader,file={mach_path}/boot_bh.bin,addr=0xF201E000,force-raw=on")
+    boot_bh_addr = boot_header_addr[arch]
+    if boot_bh_addr and os.path.exists(f'{mach_path}/boot_bh.bin'):
+        print(f"qemu-system-aarch64-multiarch: INFO: boot header load addr: {boot_bh_addr}")
+        PLM_args.append(f"-device loader,file={mach_path}/boot_bh.bin,addr={boot_bh_addr},force-raw=on")
+    else:
+        print(f"\nERROR: boot header ({mach_path}/boot_bh.bin) or boot header ({boot_bh_addr}) address is missing\n")
+        sys.exit(1)
+
+    print(f"qemu-system-aarch64-multiarch: INFO: bootbin file dump PMC load addr: {pmc_load_addr}")
     PLM_args.append(f"-device loader,file={mach_path}/pmc_cdo.bin,addr={pmc_load_addr},force-raw=on")
+
+    print(f"qemu-system-aarch64-multiarch: INFO: bootbin file dump PLM load addr: {plm_load_addr}")
     PLM_args.append(f"-device loader,file={mach_path}/plm.bin,addr={plm_load_addr},force-raw=on")
     PLM_args.append(f"-device loader,addr={plm_load_addr},cpu-num=1")
 
+    # Add blank to make the above easier to read
+    print()
+
 # We use the normal -dtb argument to specify the hw-dtb for the multiarch runner, as -dtb is not applicable.
 if dtb_arg:
     APU_args.append(f"-hw-dtb {dtb_arg}")
@@ -184,15 +215,26 @@ if mb_cmd:
 if apu_cmd:
     process_apu = subprocess.Popen(apu_cmd, shell=True, stderr=subprocess.PIPE)
 
+rc = 0
 error_msg = ""
-if apu_cmd and process_apu.wait():
-    # We only check for failures on the MB instance if APU fails
-    error_msg += '\nQEMU APU instance failed:\n%s' % process_apu.stderr.read().decode()
-
-    if mb_cmd and process_mb.wait():
-        error_msg += '\nQEMU MB instance failed:\n%s' % process_mb.stderr.read().decode()
+if apu_cmd:
+    apu_rc = process_apu.wait()
+    if apu_rc:
+        rc = apu_rc
+        error_msg += '\nQEMU APU instance failed (%s):\n%s' % (apu_rc, process_apu.stderr.read().decode())
+
+# We only report errors for MB if the APU failed (or APU wasn't started)
+# otherwise we assume that the shutdown of the APU is the cause of the error
+try:
+    if mb_cmd:
+        mb_rc = process_mb.wait(timeout=5)
+        if mb_rc and (apu_cmd and apu_rc):
+            rc += mb_rc
+            error_msg += '\nQEMU MB instance failed (%s):\n%s' % (mb_rc, process_mb.stderr.read().decode())
+except subprocess.TimeoutExpired:
+    process_mb.kill()
 
 if not mach_path_arg:
     shutil.rmtree(mach_path)
 
-sys.exit(error_msg)
+sys.exit(apu_rc)