Switch to Jailhouse for TX2

diff --git a/build/Makefile b/build/Makefile
index 4cf222cf1bd8137678fe969ef05f4b7a2a933f7f..80b982185b9c9ec82f1dc9828f54d0c65894ee4d 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -13,7 +13,7 @@ buildroot/images/rootfs.cpio.uboot: $(shell find rootfs-overlay)
 rootfs-overlay/lib/firmware/jailhouse.bin: linux-4.4/vmlinux
 rootfs-overlay/lib/firmware/jailhouse.bin: ../jailhouse/include/jailhouse/config.h
 rootfs-overlay/lib/firmware/jailhouse.bin: $(addprefix ../jailhouse/,$(shell cd ../jailhouse && git ls-files))
-       $(MAKE) -C ../jailhouse -j$(NPROC) install KDIR=$(CURDIR)/linux-4.4 ARCH=arm64 DESTDIR=$(CURDIR)/rootfs-overlay
+       $(MAKE) -C ../jailhouse -j$(NPROC) install KDIR=$(CURDIR)/linux-4.4 ARCH=arm64 DESTDIR=$(CURDIR)/rootfs-overlay  prefix=/usr
        mkdir -p rootfs-overlay/jailhouse/configs/ rootfs-overlay/jailhouse/demos/
 #      cp ../jailhouse/inmates/demos/arm64/my-demo.bin rootfs-overlay/jailhouse/demos/
        cp ../jailhouse/configs/arm64/jetson-tx2.cell rootfs-overlay/jailhouse/configs/

diff --git a/build/boot b/build/boot
new file mode 100755 (executable)
index 0000000..82766b3
--- /dev/null
+++ b/build/boot
@@ -0,0 +1,9 @@
+#!/usr/bin/env novaboot
+
+# Boot localy built Linux kernel and initramfs and start Jailhouse during boot
+
+load linux-4.4/arch/arm64/boot/Image jailhouse mem=7808M vmalloc=512M console=ttyS0,115200n8 OS=l4t fbcon=map:0 net.ifnames=0 memtype=0 video=tegrafb no_console_suspend=1 earlycon=uart8250,mmio32,0x03100000 nvdumper_reserved=0x2772e0000 gpt tegraid=18.1.2.0.0 tegra_keep_boot_clocks maxcpus=6 androidboot.serialno=0320418051135 bl_prof_dataptr=0x10000@0x277240000 sdhci_tegra.en_boot_part_access=1
+load buildroot/images/rootfs.cpio.uboot
+
+# Use FDT prepared by firmware at address fdt_addr
+UBOOT_CMD=booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr}

diff --git a/build/rootfs-overlay/etc/init.d/S60jailhouse.sh b/build/rootfs-overlay/etc/init.d/S60jailhouse.sh
new file mode 100644 (file)
index 0000000..2112d8e
--- /dev/null
+++ b/build/rootfs-overlay/etc/init.d/S60jailhouse.sh
@@ -0,0 +1,19 @@
+if ! grep -q -w jailhouse /proc/cmdline; then
+    echo "Jailhouse not enabled"
+    return
+fi
+
+case "$1" in
+    start)
+       printf "Starting Jailhouse: "
+       modprobe jailhouse
+       jailhouse enable /jailhouse/configs/jetson-tx2.cell
+       [ $? = 0 ] && echo "OK" || echo "FAIL"
+       ;;
+    stop)
+       printf "Stopping Jailhouse: "
+       jailhouse disable /jailhouse/configs/jetson-tx2.cell
+       rmmod jailhouse
+       [ $? = 0 ] && echo "OK" || echo "FAIL"
+       ;;
+esac

diff --git a/build/rootfs-overlay/etc/init.d/S60runJailHouse b/build/rootfs-overlay/etc/init.d/S60runJailHouse
deleted file mode 100755 (executable)
index dc78bab..0000000
--- a/build/rootfs-overlay/etc/init.d/S60runJailHouse
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-ip a
-sleep 1
-echo "1" > /proc/sys/kernel/printk
-sleep 1
-#sh -c 'echo 1 > /sys/kernel/debug/cpuidle_t210/fast_cluster_states_enable'
-insmod /lib/modules/3.10.96/extra/driver/jailhouse.ko
-/usr/local/sbin/jailhouse enable /jail/configs/jetson-tx1.cell
-
-#sleep 5
-
-#/usr/local/sbin/jailhouse cell create /jail/configs/jetson-tx1-demo.cell
-#/usr/local/sbin/jailhouse cell load jetson-tx1-demo /jail/demos/my-demo.bin
-#/usr/local/sbin/jailhouse cell start jetson-tx1-demo
-
-#sudo jailhouse cell stats jetson-tx1-demo
-
-sleep 5
-/usr/local/sbin/jailhouse disable
-sleep 3
-rmmod jailhouse

diff --git a/jailhouse b/jailhouse
index 755c68b90a3bd131852b45d4afc18e3ab917d3ab..3ba5054d3b38e0a9e4e23ef9b5fd2ac234738fa7 160000 (submodule)
--- a/jailhouse
+++ b/jailhouse
@@ -1 +1 @@
-Subproject commit 755c68b90a3bd131852b45d4afc18e3ab917d3ab
+Subproject commit 3ba5054d3b38e0a9e4e23ef9b5fd2ac234738fa7