[wip-odroid]

README.md

@@ -18,9 +18,9 @@ To ensure you have the necessary dependencies for building the CAmkES VM project
 To build an application with this project we use CMake. This repo provides a series of CMake helper functions (found in `camkes_vm_helpers.cmake`) to assit you with defining your CAmkES VM application. Importing this file into your applications CMake configuration gives you access to the following helper functions:
 
 - `DeclareCAmkESVM(init_component [SOURCES INCLUDES LIBS LD_FLAGS C_FLAGS])`: Function for declaring a CAmkESVM. This is called for each Init component in the defined in the applications `.camkes` file. The user can also pass in extra compilation sources, includes, libs and flags to be compiled with the component through additional arguments (`SOURCES`, `INCLUDES`, `LIBS`, `LD_FLAGS` and `C_FLAGS`)
-- `DeclareCAmkESVMRootServer(camkes_config)`: Declares the CAmkESVM root server. This function takes the applications `.camkes` file as an argument (`camkes_config`).
-- `AddToFileServer(filename_pref file_dest [DEPENDS])`: Function for adding a file/image to the vm file server. The caller specifies the name of they wish to refer to the image in the FileServer through the `filename_pref` parameter. `file_dest` is the file system location of the image the caller is adding. Additional dependencies to the image can be passed through the optional `DEPENDS` parameter.
+- `DefineCAmkESVMFileServer([TYPE <type>] [INSTANCE <name>] [FILES <item>[ <item>[...]] [DEPENDS <dep>[ <dep>[...]])`: Function for explicitly creating a file server with the given files. This takes into account any files that have been added before via calls to `AddToFileServer()`. This is called internally from `DeclareCAmkESVMRootServer()`.
 - `DecompressLinuxKernel(decompress_target decompressed_kernel_image compressed_kernel_image [DEPENDS])`: Function for decompressing/extracting a vmlinux file from a given kernel image. The caller specifies a target name (`decompress_target`) for decompressing the kernel, the kernel image to decompress (`compressed_kernel_image`) and additional dependencies to the compressed image through the optional `DEPENDS` parameter. The location of the decompressed image is populated in the `decompressed_kernel_image` parameter passed by the caller.
+- `DeclareCAmkESRootserver()`. Declare the the CAmkES Root Server that sets up the system.
 
 ## Items
 

arm_vm_helpers.cmake

@@ -47,13 +47,21 @@ function(DeclareCAmkESARMVM init_component)
         ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/fdt_manipulation.c
         ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/crossvm.c
         ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/map_frame_hack.c
-        ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/init_ram.c
     )
 
+    if(KernelPlatformQEMUArmVirt)
+        list(APPEND vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/vgicv2m.c)
+    endif()
+
     if(VmVirtUart)
         list(APPEND vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/vuart_init.c)
     endif()
 
+    if(VmVirtUartPL011)
+        list(APPEND vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/vpl011.c)
+    endif()
+
+
     if(Tk1DeviceFwd)
         list(
             APPEND vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/plat/tk1/device_fwd.c

camkes_vm_helpers.cmake

@@ -119,25 +119,21 @@ function(DefineCAmkESVMFileServer)
         set(PARAM_INSTANCE "fserv")
     endif()
 
-    # The target might exist already when AddToFileServer() was called.
-    set(FSRV_TARGET "vm_fileserver_config_${PARAM_INSTANCE}")
-    if(NOT TARGET ${FSRV_TARGET})
-        add_custom_target(${FSRV_TARGET})
-    endif()
-
     # For dependencies and files, both lists and lists of list are supported for
     # convenience reasons. Furthermore, empty entries are also allowed. This
     # can happen when the caller uses variables for the lists, when in some
     # configurations the lists remain empty.
 
+    set(DEPS "")
     foreach(element IN LISTS PARAM_DEPENDS)
         foreach(item IN LISTS element)
             if(item)
-                set_property(TARGET ${FSRV_TARGET} APPEND PROPERTY DEPS ${item})
+                list(APPEND DEPS "${item}")
             endif()
         endforeach()
     endforeach()
 
+    set(CPIO_FILES "")
     foreach(element IN LISTS PARAM_FILES)
         foreach(item IN LISTS element) # [<CPIO_NAME>:]<FILENAME>
             if(item)
@@ -158,54 +154,24 @@ function(DefineCAmkESVMFileServer)
                     set(FILE_NAME "${CMAKE_MATCH_1}")
                     get_filename_component(CPIO_NAME "${FILE_NAME}" NAME)
                 endif()
-                set_property(
-                    TARGET ${FSRV_TARGET}
-                    APPEND
-                    PROPERTY FILES "${CPIO_NAME}:${FILE_NAME}"
+                set(CPIO_FILE "${PARAM_INSTANCE}/files/${CPIO_NAME}")
+                add_custom_command(
+                    OUTPUT "${CPIO_FILE}"
+                    COMMENT "copy: ${FILE_NAME} -> ${CPIO_FILE}"
+                    COMMAND
+                        ${CMAKE_COMMAND} -E copy "${FILE_NAME}" "${CPIO_FILE}"
+                    VERBATIM
+                    DEPENDS ${FILE_NAME} ${DEPS}
                 )
+                # There is no need to create an explicit target for the command
+                # above, because the archive creation depends on all files
+                # listed in CPIO_FILES. The command above is the creation rule
+                # for each one.
+                list(APPEND CPIO_FILES "${CPIO_FILE}")
             endif()
         endforeach()
     endforeach()
 
-    # now process the file/deps list
-    get_target_property(files ${FSRV_TARGET} FILES)
-    if(NOT files) # this also catches "files-NOTFOUND" if property is not set
-        set(files "")
-    endif()
-    get_target_property(deps ${FSRV_TARGET} DEPS)
-    if(NOT deps) # this also catches "deps-NOTFOUND" if property is not set
-        set(deps "")
-    endif()
-
-    set(CPIO_FILES "")
-    foreach(item IN LISTS files) # <CPIO_NAME>:<FILENAME>
-        string(
-            REGEX
-                MATCH
-                "^([^:]+):([^:]+)$"
-                cpio_item
-                "${item}"
-        )
-        if(NOT cpio_item)
-            message(FATAL_ERROR "invalid CPIO file format: '${item}'")
-        endif()
-        set(CPIO_NAME "${CMAKE_MATCH_1}")
-        set(FILE_NAME "${CMAKE_MATCH_2}")
-        set(CPIO_FILE "${PARAM_INSTANCE}/files/${CPIO_NAME}")
-        add_custom_command(
-            OUTPUT "${CPIO_FILE}"
-            COMMENT "copy: ${FILE_NAME} -> ${CPIO_FILE}"
-            COMMAND
-                ${CMAKE_COMMAND} -E copy "${FILE_NAME}" "${CPIO_FILE}"
-            VERBATIM
-            DEPENDS ${FILE_NAME} ${deps}
-        )
-        # There is no need to create an explicit target for the command above,
-        # the archive creation depends on all files in CPIO_FILES, where the
-        # command above is the creation rule for each one.
-        list(APPEND CPIO_FILES "${CPIO_FILE}")
-    endforeach()
-
     # Build CPIO archive. It implicitly depends on all files in CPIO_FILES,
     # which have their own dependencies each from above. So we don't have any
     # additional explicit dependencies here.
@@ -234,86 +200,6 @@ function(DefineCAmkESVMFileServer)
 
 endfunction(DefineCAmkESVMFileServer)
 
-# Function for declaring the CAmkESVM root server. Taking the camkes application
-# config file we declare a CAmkES Root server and the VM File Server. It is
-# expected the caller has declared the file server images before using this
-# function.
-# camkes_config: The applications .camkes file
-# In addition the user can pass in extra CPP compilation includes and flags through
-# the CPP_INCLUDES and CPP_FLAGS arguments.
-function(DeclareCAmkESVMRootServer camkes_config)
-    cmake_parse_arguments(PARSE_ARGV 1 CAMKES_ROOT_VM "" "" "CPP_INCLUDES;CPP_FLAGS")
-    # Initialise the CAmKES VM fileserver
-    DefineCAmkESVMFileServer()
-    get_absolute_source_or_binary(config_file "${camkes_config}")
-    # Declare CAmkES root server
-    DeclareCAmkESRootserver(
-        ${config_file}
-        CPP_FLAGS
-        ${CAMKES_ROOT_VM_CPP_FLAGS}
-        CPP_INCLUDES
-        "${VM_PROJECT_DIR}/components/VM"
-        ${CAMKES_ROOT_VM_CPP_INCLUDES}
-    )
-endfunction(DeclareCAmkESVMRootServer)
-
-# Function for adding a file/image to the vm file server.
-#
-# Parameters:
-#
-# <filename_pref>
-#   The name to use for the file in the file server. Components using a file
-#   server could expect certain files to have a specific name, which could
-#   differer from the file name on the disk, so this provides a convenient way
-#   to handle the renaming.
-#
-# <file_dest>
-#   The location of the file on the disk.
-#
-# INSTANCE <name>
-#   The File server instance to add the file to.
-#   Optional, defaults to "fserv".
-#
-# DEPENDS <dep>[ <dep>[...]]
-#   Additional dependencies of the file added to the file server. This is an
-#   optional parameter for non-trivial dependencies of the input file. Each file
-#   server instance depends on all input files anyway, thus a re-build happens
-#   automatically on any changes. If an input file is created dynamically by
-#   another regular CMake target, any dependencies should have been specified
-#   there already, so there is no need to repeat them here.
-#
-function(AddToFileServer filename_pref file_dest)
-
-    cmake_parse_arguments(
-        PARSE_ARGV
-        2
-        PARAM # variable prefix
-        "" # option arguments
-        "INSTANCE" # optional single value arguments
-        "DEPENDS" # optional multi value arguments
-    )
-
-    if(PARAM_UNPARSED_ARGUMENTS)
-        message(FATAL_ERROR "Unknown arguments: ${PARAM_UNPARSED_ARGUMENTS}")
-    endif()
-
-    if(NOT PARAM_INSTANCE)
-        set(PARAM_INSTANCE "fserv")
-    endif()
-
-    set(FSRV_TARGET "vm_fileserver_config_${PARAM_INSTANCE}")
-    if(NOT TARGET ${FSRV_TARGET})
-        add_custom_target(${FSRV_TARGET})
-    endif()
-
-    set_property(TARGET ${FSRV_TARGET} APPEND PROPERTY FILES "${filename_pref}:${file_dest}")
-
-    if(PARAM_DEPENDS)
-        set_property(TARGET ${FSRV_TARGET} APPEND PROPERTY DEPS ${PARAM_DEPENDS})
-    endif()
-
-endfunction(AddToFileServer)
-
 # Function for decompressing/extracting a vmlinux file from a given kernel image
 # decompress_target: The target name the caller wishes to use to generate the decompressed kernel
 # image

components/Init/src/virtio_con.c

@@ -195,7 +195,7 @@ static void console_handle_irq(void *cookie)
 {
     virtio_con_cookie_t *virtio_cookie = (virtio_con_cookie_t *)cookie;
     if (!virtio_cookie || !virtio_cookie->vm) {
-        ZF_LOGE("NULL virtio cookie given to raw irq handler");
+        ZF_LOGE("invalid cookie given to raw irq handler");
         return;
     }
 

components/Init/src/virtio_vsock.c

@@ -214,7 +214,7 @@ static void vsock_inject_irq(void *cookie)
 {
     virtio_vsock_cookie_t *virtio_cookie = (virtio_vsock_cookie_t *)cookie;
     if (!virtio_cookie || !virtio_cookie->vm) {
-        ZF_LOGE("NULL virtio cookie given to raw irq handler");
+        ZF_LOGE("invalid cookie given to raw irq handler");
         return;
     }
 

components/VM_Arm/CMakeLists.txt

@@ -111,22 +111,6 @@ config_option(
     OFF
 )
 
-config_option(
-    VmInitRdFile
-    VM_INITRD_FILE
-    "Enables the option for the VM to open and load a seperate initrd file"
-    DEFAULT
-    OFF
-)
-
-config_option(
-    VmDtbFile
-    VM_DTB_FILE
-    "Enables the option for the VM to open and load a seperate dtb file"
-    DEFAULT
-    OFF
-)
-
 config_option(
     VmVirtUart
     VM_VIRT_UART

components/VM_Arm/configurations/vm.h

@@ -88,23 +88,6 @@
         int clean_cache = false; \
         int map_one_to_one = false; \
     } vm_image_config; \
-    attribute { \
-        string linux_ram_base; \
-        string linux_ram_paddr_base; \
-        string linux_ram_size; \
-        string linux_ram_offset = "0"; /* obsolete */ \
-        string dtb_addr; \
-        string initrd_max_size = "-1"; /* obsolete */ \
-        string initrd_addr; \
-    } linux_address_config; \
-    attribute { \
-        string linux_name = "linux"; \
-        string dtb_name = "linux-dtb"; \
-        string initrd_name = "linux-initrd"; \
-        string linux_bootcmdline = ""; \
-        string linux_stdout = ""; \
-        string dtb_base_name = ""; \
-    } linux_image_config; \
     attribute { \
         int send_id; \
         int recv_id; \

components/VM_Arm/plat_include/odroidc2/plat/vmlinux.h

@@ -11,9 +11,79 @@
 static const int linux_pt_irqs[] = {};
 
 static const int free_plat_interrupts[] =  { 50 + IRQ_SPI_OFFSET };
-static const char *plat_keep_devices[] = {};
+static const char *plat_keep_devices[] = {
+    "/timer",
+    "/xtal-clk",
+    "/arm-pmu",
+    "/psci",
+};
 static const char *plat_keep_device_and_disable[] = {};
 static const char *plat_keep_device_and_subtree[] = {
-    GIC_NODE_PATH,
+    // "/reserved-memory",
+    "/firmware",
+    "/efuse",
+    "/scpi",
+    // "/soc/sram@c8000000",
+    // GIC_NODE_PATH,
+    // "/soc/bus@c1100000/interrupt-controller@9880",
+    // "/soc/bus@c1100000/reset-controller@4404",
+    // "/soc/ethernet@c9410000",
+    "/soc",
+    //"/soc/bus@c8100000/sys-ctrl@0"
+
+    //  reserved-memory
+    //  cpus
+    //  arm-pmu {
+    //  psci {
+    //  timer {
+    //  xtal-clk {
+    //  firmware {
+    //  efuse {
+    //  scpi {
+    //  soc {
+    //      sram@c8000000 {
+    //      bus@c8100000 {
+    //          sys-ctrl@0 {
+    //              power-controller-vpu {
+    //              clock-controller {
+    //          cec@100 {
+    //          ao-secure@140 {
+    //          serial@4c0 {
+    //          serial@4e0 {
+    //          i2c@500 {
+    //          pwm@550 {
+    //          ir@580 {
+    //          pinctrl@14 {
+    //      periphs@c8834000 {
+    //          rng {
+    //          pinctrl@4b0 {
+    //      bus@c8838000 {
+    //          video-lut@48 {
+    //      bus@c883c000 {
+    //          system-controller@0 {
+    //              clock-controller {
+    //          mailbox@404 {
+    //      ethernet@c9410000 {
+    //          mdio {
+    //      apb@d0000000 {
+    //          mmc@70000 {
+    //          mmc@72000 {
+    //          mmc@74000 {
+    //          gpu@c0000 {
+    //      vpu@d0100000 {
+    //      hdmi-tx@c883a000 {
+    //      phy@c0000000 {
+    //      phy@c0000020 {
+    //      usb@c9000000 {
+    //      usb@c9100000 {
+    //  memory@0 {
+    //  regulator-usb-pwrs {
+    //  leds {
+    //  regulator-tflash_vdd {
+    //  gpio-regulator-tf_io {
+    //  regulator-vcc1v8 {
+    //  regulator-vcc3v3 {
+    //  emmc-pwrseq {
+    //  hdmi-connector {
 };
 static const char *plat_keep_device_and_subtree_and_disable[] = {};