Merge pull request #155 from tenstorrent/asrinivasan/more_lava_changes

More lava related improvements

Author: asrinivasanTT

Makefile

@@ -43,6 +43,10 @@ ifeq ($(NO_VIRTIO), 1)
 	DT_NO_VIRTIO_DEVICES := --dt_no_virtio_devices
 endif
 
+ifneq ($(BOOTARGS),)
+	EXTRA_BOOTARGS := --extra_bootargs "$(BOOTARGS)"
+endif
+
 # Uncomment this to make the shell rules verbose
 # SHELL_VERBOSE := set -x ;
 
@@ -99,7 +103,7 @@ boot: _need_linux _need_opensbi _need_dtb _need_rootfs _need_hosttool _need_pyth
 
 # Boot one L2CPU in Blackhole RISC-V CPU into an initramfs specified by $(INITRAMFS)
 boot_initramfs: _need_linux _need_opensbi _need_dtb _need_rootfs _need_hosttool _need_python _need_luwen _need_ttkmd _need_pylibfdt
-	$(PYTHON) boot.py --boot --ttdevice $(TTDEVICE) --l2cpu $(L2CPU) --opensbi_bin fw_jump.bin --opensbi_dst 0x400030000000 --rootfs_dst 0x4000e5000000 --kernel_bin Image --kernel_dst 0x400030200000 --dtb_bin blackhole-card.dtb --dtb_dst 0x400030100000 --boot_device initramfs --rootfs_bin $(INITRAMFS) $(DT_NO_VIRTIO_DEVICES)
+	$(PYTHON) boot.py --boot --ttdevice $(TTDEVICE) --l2cpu $(L2CPU) --opensbi_bin fw_jump.bin --opensbi_dst 0x400030000000 --rootfs_dst 0x4000e5000000 --kernel_bin Image --kernel_dst 0x400030200000 --dtb_bin blackhole-card.dtb --dtb_dst 0x400030100000 --boot_device initramfs --rootfs_bin $(INITRAMFS) $(DT_NO_VIRTIO_DEVICES) $(EXTRA_BOOTARGS)
 	./console/tt-bh-linux --ttdevice $(TTDEVICE) --l2cpu $(L2CPU) --disk $(DISK_IMAGE)
 
 # boot_all: _need_linux _need_opensbi _need_dtb _need_dtb_all _need_rootfs _need_hosttool _need_python _need_luwen _need_ttkmd _need_pylibfdt

boot.py

@@ -40,6 +40,7 @@ def parse_args():
     # If using FW_PAYLOAD, set these args for rootfs and opensbi
     parser.add_argument("--boot_device", type=str, required=False, default="vda", help="Options: vda, vdaX or initramfs")
     parser.add_argument("--dt_no_virtio_devices", action="store_true", help="Don't patch DT to add virtio device nodes")
+    parser.add_argument("--extra_bootargs", type=str, default="", help="Extra kernel command line arguments")
 
     # Only used for initramfs
     parser.add_argument("--rootfs_bin", type=str, required=False, help="Path to initramfs")
@@ -114,7 +115,7 @@ def main():
         opensbi_addr = int(args.opensbi_dst[idx], 16)
         opensbi_bytes = read_bin_file(args.opensbi_bin)
 
-        if args.rootfs_dst and args.rootfs_bin:
+        if args.rootfs_dst and args.rootfs_bin and os.path.exists(args.rootfs_bin):
             rootfs_addr = int(args.rootfs_dst[idx], 16)
             rootfs_bytes = read_bin_file(args.rootfs_bin)
 
@@ -139,10 +140,13 @@ def main():
         if args.boot_device[:len("vda")] == "vda":
             bootargs += f" root=/dev/{args.boot_device}"
         elif args.boot_device == "initramfs":
-            bootargs += f" initrd={args.rootfs_dst[idx]},{len(rootfs_bytes)}"
+            if os.path.exists(args.rootfs_bin):
+                bootargs += f" initrd={args.rootfs_dst[idx]},{len(rootfs_bytes)}"
         else:
             print("Unsupported rootfs type")
             exit(1)
+        if args.extra_bootargs:
+            bootargs += f" {args.extra_bootargs}"
         fdt.setprop(chosen_offset, "bootargs", bytes(bootargs, encoding="utf-8") + b'\0')
 
         memory_node = fdt.path_offset("/memory@400030000000", libfdt.QUIET_NOTFOUND)
@@ -205,7 +209,7 @@ def main():
         print(f"Writing OpenSBI to 0x{opensbi_addr:x}")
         chip.noc_write(0, l2cpu_noc_x, l2cpu_noc_y, opensbi_addr, opensbi_bytes)
 
-        if args.rootfs_dst and args.rootfs_bin:
+        if args.rootfs_dst and args.rootfs_bin and os.path.exists(args.rootfs_bin):
             print(f"Writing rootfs to 0x{rootfs_addr:x}")
             chip.noc_write(0, l2cpu_noc_x, l2cpu_noc_y, rootfs_addr, rootfs_bytes)