Deprecate cli related components

.github/workflows/ci.yml

@@ -149,7 +149,7 @@ jobs:
     - name: Check local packages and all of its dependencies for errors
       run: >
         cargo check --workspace
-        --exclude islet_sdk
+        --exclude islet_sdk --exclude rsictl
         --exclude cose --exclude cca_token
         --exclude ciborium
         --exclude islet_mc_harnesses

.gitmodules

@@ -73,3 +73,6 @@
 [submodule "third-party/dtc"]
 	path = third-party/dtc
 	url = https://git.kernel.org/pub/scm/utils/dtc/dtc.git
+[submodule "tools/rsictl"]
+	path = tools/rsictl
+	url = https://github.com/islet-project/rsictl.git

Cargo.toml

@@ -4,15 +4,16 @@ members = [
     "lib/armv9a",
     "lib/cca-token", # To be deprecated
     "lib/cose",
+    "lib/io",
     "lib/safe-abstraction",
-    "lib/vmsa",
     "lib/uart",
-    "lib/io",
+    "lib/vmsa",
+    "model-checking",
     "plat/fvp",
     "realm/rsi-test",
     "rmm/",
     "sdk",
-    "model-checking",
+    "tools/rsictl",
 ]
 
 [profile.dev]

realm/linux-rsi/Makefile

@@ -7,7 +7,7 @@ export PATH := ${ROOT}/assets/toolchain/aarch64-none-linux-gnu/bin:${PATH}
 export CROSS_COMPILE := aarch64-none-linux-gnu-
 export ARCH := arm64
 
-CMDLINE = ${ROOT}/cli
+CMDLINE = ${ROOT}/tools/rsictl
 HEADERS = rsi.h
 
 obj-m += rsi.o
@@ -19,7 +19,7 @@ module: ${HEADERS}
 	cp rsi.ko ${SHARED_DIR}
 
 cmdline:
-	cd ${CMDLINE}; make aarch64
+	cargo install --path "${CMDLINE}" --root "${SHARED_DIR}" --target aarch64-unknown-linux-gnu
 
 clean:
 	make -C ${KERNEL_DIR} M=${HERE} clean

scripts/config.py

@@ -28,7 +28,6 @@
 REALM = os.path.join(ROOT, "realm")
 RMM = os.path.join(ROOT, "plat/fvp")
 SDK = os.path.join(ROOT, "sdk/")
-CLI = os.path.join(ROOT, "cli/")
 RSI_KO = os.path.join(ROOT, "realm/linux-rsi")
 EXAMPLES = os.path.join(ROOT, "examples")
 HES = os.path.join(ROOT, "hes")

scripts/deps/assets.sh

@@ -7,3 +7,4 @@ ROOT=$(git rev-parse --show-toplevel)
 cd $ROOT && git submodule update --init --depth 1 assets
 git submodule update --init --depth 1 $ROOT/third-party/ciborium
 git submodule update --init --depth 1 $ROOT/third-party/coset
+git submodule update --init --depth 1 $ROOT/tools/rsictl

scripts/fvp-cca

@@ -140,10 +140,6 @@ def prepare_sdk():
     print("[!] Building RSI kernel module...")
     make(RSI_KO)
 
-def prepare_cli():
-    print("[!] Building CLI...")
-    make(CLI)
-
 def prepare_islet_hes():
     print("[!] Building islet-hes... ")
     run(["cargo", "build", "--release"], cwd=HES_APP)
@@ -709,7 +705,6 @@ if __name__ == "__main__":
                 place_realm_at_shared(args.rmm, args.realm_ip, args.fvp_tap_ip, args.fvp_ip, args.no_kvm_unit_tests, args.no_prebuilt_ml)
                 if args.no_sdk is False:
                     prepare_sdk()
-                    prepare_cli()
 
     if not args.build_only and args.hes:
         signal.signal(signal.SIGTERM, custom_signal_handler)

scripts/init_min.sh

@@ -8,11 +8,11 @@ HERE=$ROOT/scripts
 # Install packages
 $HERE/deps/pkgs-for-ci.sh
 
-# Sync submodules (only assets, tf-a, ciborium, and coset)
 git submodule update --init --depth 1 $ROOT/assets
 git submodule update --init --depth 1 $ROOT/third-party/tf-a
 git submodule update --init --depth 1 $ROOT/third-party/ciborium
 git submodule update --init --depth 1 $ROOT/third-party/coset
+git submodule update --init --depth 1 $ROOT/tools/rsictl
 
 # Install rust
 $HERE/deps/rust.sh

scripts/init_min_acs.sh

@@ -8,12 +8,12 @@ HERE=$ROOT/scripts
 # Install packages
 $HERE/deps/pkgs-for-ci.sh
 
-# Sync submodules (only assets, tf-a, acs, ciborium, and coset)
 git submodule update --init --depth 1 $ROOT/assets
 git submodule update --init --depth 1 $ROOT/third-party/tf-a
 git submodule update --init --depth 1 $ROOT/third-party/cca-rmm-acs
 git submodule update --init --depth 1 $ROOT/third-party/ciborium
 git submodule update --init --depth 1 $ROOT/third-party/coset
+git submodule update --init --depth 1 $ROOT/tools/rsictl
 
 # Install rust (min)
 $HERE/deps/rust_min.sh