Merge chrisguikema/zcu102_virtio_net

apps/Arm/vm_virtio_net/CMakeLists.txt

@@ -13,6 +13,8 @@ include(${CAMKES_ARM_VM_HELPERS_PATH})
 find_package(camkes-vm-linux REQUIRED)
 include(${CAMKES_VM_LINUX_HELPERS_PATH})
 
+set(cpp_includes "${CAMKES_VM_DIR}/components/VM_Arm")
+
 set(dtb_file "${CAMKES_VM_IMAGES_DIR}/${KernelARMPlatform}/linux-dtb")
 set(rootfs_file "${CAMKES_VM_IMAGES_DIR}/${KernelARMPlatform}/rootfs.cpio.gz")
 
@@ -26,6 +28,33 @@ elseif("${KernelARMPlatform}" STREQUAL "tx2")
     set(rootfs_address "0xf7000000")
     set(dtb_file "${CAMKES_VM_IMAGES_DIR}/${KernelARMPlatform}/linux-pci-dtb")
     set(rootfs_file "${CAMKES_VM_IMAGES_DIR}/${KernelARMPlatform}/rootfs_crossvm.cpio.gz")
+elseif("${KernelARMPlatform}" STREQUAL "zcu102")
+
+    if(NOT VmZynqmpPetalinux2018_3)
+        message(FATAL_ERROR "Petalinux 2018_3 is the only supported version for this application")
+    endif()
+
+    set(dts_file "${CAMKES_VM_IMAGES_DIR}/zynqmp/${VmZynqmpPetalinuxVersion}/linux.dts")
+    set(
+        rootfs_file
+        "${CAMKES_VM_IMAGES_DIR}/zynqmp/${VmZynqmpPetalinuxVersion}/rootfs-minimal.cpio.gz"
+    )
+
+    add_custom_command(
+        OUTPUT linux/linux-dtb
+        COMMAND
+            dtc -q -I dts -O dtb -o linux/linux-dtb ${dts_file}
+        VERBATIM
+        DEPENDS ${dts_file}
+    )
+
+    # Create custom target for setting the dtb
+    add_custom_target(set_dtb DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/linux/linux-dtb")
+    AddToFileServer("linux-dtb" "${CMAKE_CURRENT_BINARY_DIR}/linux/linux-dtb" DEPENDS set_dtb)
+
+    list(APPEND cpp_includes "${CAMKES_VM_DIR}/components/VM_Arm/plat_include/zynqmp")
+
+    CAmkESAddImportPath(${KernelARMPlatform}/${VmZynqmpPetalinuxVersion})
 endif()
 
 # Generate overlayed rootfs
@@ -43,6 +72,17 @@ if(VIRTIO_NET_PING)
         "etc/init.d"
         overlay
     )
+
+    # The ZCU102 Filesystem expects init scripts to be setup like this, else they won't run
+    if("${KernelARMPlatform}" STREQUAL "zcu102")
+        AddLinkToOverlayDir("K90ping_test" "../init.d/S90ping_test" "etc/rc0.d/" overlay)
+        AddLinkToOverlayDir("K90ping_test" "../init.d/S90ping_test" "etc/rc1.d/" overlay)
+        AddLinkToOverlayDir("K90ping_test" "../init.d/S90ping_test" "etc/rc6.d/" overlay)
+        AddLinkToOverlayDir("S90ping_test" "../init.d/S90ping_test" "etc/rc2.d/" overlay)
+        AddLinkToOverlayDir("S90ping_test" "../init.d/S90ping_test" "etc/rc3.d/" overlay)
+        AddLinkToOverlayDir("S90ping_test" "../init.d/S90ping_test" "etc/rc4.d/" overlay)
+        AddLinkToOverlayDir("S90ping_test" "../init.d/S90ping_test" "etc/rc5.d/" overlay)
+    endif()
 else()
     AddFileToOverlayDir(
         "S90arping_test"
@@ -62,20 +102,24 @@ AddOverlayDirToRootfs(
     GZIP
 )
 
-# Updated dtb based on generated initrd
-UpdateDtbFromInitrd(
-    ${dtb_file}
-    ${output_overlayed_rootfs_location}
-    ${rootfs_address}
-    dtb_gen_target
-    output_dtb_location
-    DEPENDS
-    rootfs_target
-)
-
-AddToFileServer("linux-dtb" "${output_dtb_location}" DEPENDS dtb_gen_target)
 AddToFileServer("linux-initrd" ${output_overlayed_rootfs_location} DEPENDS rootfs_target)
-AddToFileServer("linux" "${CAMKES_VM_IMAGES_DIR}/${KernelARMPlatform}/linux")
+
+if("${KernelARMPlatform}" STREQUAL "zcu102")
+    AddToFileServer("linux" "${CAMKES_VM_IMAGES_DIR}/zynqmp/linux")
+else()
+    # Updated dtb based on generated initrd
+    UpdateDtbFromInitrd(
+        ${dtb_file}
+        ${output_overlayed_rootfs_location}
+        ${rootfs_address}
+        dtb_gen_target
+        output_dtb_location
+        DEPENDS
+        rootfs_target
+    )
+    AddToFileServer("linux" "${CAMKES_VM_IMAGES_DIR}/${KernelARMPlatform}/linux")
+    AddToFileServer("linux-dtb" "${output_dtb_location}" DEPENDS dtb_gen_target)
+endif()
 
 AddCamkesCPPFlag(
     cpp_flags
@@ -102,19 +146,13 @@ if(VIRTIO_NET_PING)
         sel4_autoconf
     )
 
-    DeclareCAmkESRootserver(
-        vm_echo_ping.camkes
-        CPP_FLAGS
-        ${cpp_flags}
-        CPP_INCLUDES
-        ${CAMKES_VM_DIR}/components/VM_Arm
-    )
+    DeclareCAmkESRootserver(vm_echo_ping.camkes CPP_FLAGS ${cpp_flags} CPP_INCLUDES ${cpp_includes})
 else()
     DeclareCAmkESRootserver(
         vm_virtio_net.camkes
         CPP_FLAGS
         ${cpp_flags}
         CPP_INCLUDES
-        ${CAMKES_VM_DIR}/components/VM_Arm
+        ${cpp_includes}
     )
 endif()

apps/Arm/vm_virtio_net/settings.cmake

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 #
 
-set(supported "exynos5422;tx2")
+set(supported "exynos5422;tx2;zcu102")
 if(NOT "${PLATFORM}" IN_LIST supported)
     message(FATAL_ERROR "PLATFORM: ${PLATFORM} not supported.
          Supported: ${supported}")
@@ -18,3 +18,13 @@ else()
 endif()
 set(VmInitRdFile ON CACHE BOOL "" FORCE)
 set(VmDtbFile ON CACHE BOOL "provide dtb" FORCE)
+
+if(${PLATFORM} STREQUAL "zcu102")
+    if(NOT VIRTIO_NET_PING)
+        message(FATAL_ERROR "The ZCU102 filesystem doesn't have arping installed. \
+                            Please set VIRTIO_NET_PING to run application")
+    endif()
+    set(AARCH64 ON CACHE BOOL "" FORCE)
+    set(KernelAllowSMCCalls ON CACHE BOOL "" FORCE)
+    set(VmZynqmpPetalinuxVersion 2018_3 CACHE STRING "" FORCE)
+endif()

apps/Arm/vm_virtio_net/zcu102/2018_3/devices.camkes

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2023, DornerWorks
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include <plat/smc.h>
+#include <configurations/vm.h>
+
+#define VM_INITRD_MAX_SIZE 0x1900000 //25 MB
+#define VM_RAM_BASE 0x10000000
+#define VM_RAM_SIZE 0x10000000
+#define VM_ENTRY_ADDR 0x10080000
+#define VM_RAM_OFFSET 0
+#define VM_DTB_ADDR 0x12000000
+#define VM_INITRD_ADDR 0x13000000
+
+assembly {
+	composition {}
+	configuration {
+
+        vm0.vm_address_config = {
+            "ram_base" : VAR_STRINGIZE(VM_RAM_BASE),
+            "ram_paddr_base" : VAR_STRINGIZE(VM_RAM_BASE),
+            "ram_size" : VAR_STRINGIZE(VM_RAM_SIZE),
+            "dtb_addr" : VAR_STRINGIZE(VM_DTB_ADDR),
+            "initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
+            "kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
+        };
+        vm0.num_vcpus = 4;
+
+        /* Extra untyped pool to allow for 256MB of RAM */
+        vm0.simple_untyped28_pool = 1;
+
+        vm0.vm_image_config = {
+            "kernel_name" : "linux",
+            "initrd_name" : "linux-initrd",
+            "kernel_bootcmdline" : "console=ttyPS0,115200 root=/dev/ram rw earlycon clk_ignore_unused",
+            "kernel_stdout" : "serial0:115200n8",
+            "generate_dtb" : true,
+            "provide_dtb" : false,
+            "map_one_to_one" : false,
+            "provide_initrd": true,
+            "clean_cache" : false,
+        };
+
+        vm0.dtb = dtb([{"path": "/amba/serial@ff000000"} ]);
+
+        vm0.untyped_mmios = ["0xf9060000:12"]; // Interrupt Controller Virtual CPU interface (Virtual Machine view)
+
+        vm0.plat_keep_devices = [];
+        vm0.plat_keep_devices_and_subtree = [];
+
+        vm0.allow_smc = false;
+        vm0.allowed_smc_functions = [];
+	}
+}