Merge chrisguikema/zynqmp_device_tree_fix

axel-h · Jan 30, 2024 · df679ac · df679ac
2 parents e37e592 + 33750fd
commit df679ac
Showing 1 changed file with 20 additions and 38 deletions.
diff --git a/apps/Arm/vm_minimal/zcu102/2021_1/devices.camkes b/apps/Arm/vm_minimal/zcu102/2021_1/devices.camkes
@@ -49,54 +49,36 @@ assembly {
 
         vm0.untyped_mmios = ["0xf9060000:12"]; // Interrupt Controller Virtual CPU interface (Virtual Machine view)
 
+        /* The ZCU102 can run different Xilinx releases of Petalinux
+         * During one release, the PS devices were moved from the "amba" to
+         * the "axi" bus. The seL4 kernel only needs the device tree to
+         * allocate untyped resources, so the device tree was never updated.
+         * However, it's a good idea to match the device tree with the version
+         * of Petalinux that is running.
+         *
+         * By default, the 2021.1 version of Petalinux runs, meaning a different
+         * device tree than the seL4 kernel device tree is used as the base for
+         * guest device tree generation. This version uses the axi bus. Therefore,
+         * any passthrough or emulated devices on that bus must be listed here
+         * with the plat_keep_devices, as the VMM will attempt to keep the amba
+         * bus versions, which do not exist in the base.
+         */
         vm0.plat_keep_devices = [
-            "/__symbols__",
-            "/aliases",
-            "/aux_ref_clk",
-            "/axi/interrupt-controller@f9010000",
-            "/dcc",
-            "/dp_aclk",
-            "/edac",
-            "/fclk0",
-            "/fclk1",
-            "/fclk2",
-            "/fclk3",
-            "/fpga-full",
+            "/pss_ref_clk",
             "/gt_crx_ref_clk",
-            "/ina226-u15",
-            "/ina226-u16",
-            "/ina226-u65",
-            "/ina226-u74",
-            "/ina226-u75",
-            "/ina226-u76",
-            "/ina226-u77",
-            "/ina226-u78",
-            "/ina226-u79",
-            "/ina226-u80",
-            "/ina226-u81",
-            "/ina226-u84",
-            "/ina226-u85",
-            "/ina226-u86",
-            "/ina226-u87",
-            "/ina226-u88",
-            "/ina226-u92",
-            "/ina226-u93",
+            "/pss_alt_ref_clk",
+            "/aux_ref_clk",
+            "/video_clk",
             "/pmu",
             "/psci",
-            "/pss_alt_ref_clk",
-            "/pss_ref_clk",
-            "/ref48M",
-            "/refhdmi",
             "/timer",
-            "/video_clk",
+            "/aliases",
+            "/axi/interrupt-controller@f9010000",
             "/axi/serial@ff000000",
         ];
 
         vm0.plat_keep_devices_and_subtree = [
             "/firmware",
-            "/gpio-keys",
-            "/leds",
-            "/zynqmp_ipi",
         ];
 
         vm0.allow_smc = true;