commit 3c257455ae23ee1a69970e2c9683345dd399efab
author Andrew Scull <ascull@google.com> Tue Nov 26 13:32:50 2019 +0000
committer Andrew Scull <ascull@google.com> Mon Dec 02 17:51:59 2019 +0000
tree 67cb59b96f056e0449087c7304e8d12eb43f5858
parent cfe6164802ecc2f138cc2279208e1dcd85a709de

Initial IOMMU driver hooks.

This is intentially stripped back to initialization and a hook to the
driver when the VM's memory map is changing. This will work as the
baseline from which changes can be made to fit the needs of the drivers.

Change-Id: I904279f511e2d6e4b1c062fb49a2892042b79005

src/init.c

diff --git a/src/init.c b/src/init.c
index 6d9e8ad..897039f 100644
--- a/src/init.c
+++ b/src/init.c
@@ -25,11 +25,14 @@
 #include "hf/cpio.h"
 #include "hf/cpu.h"
 #include "hf/dlog.h"
+#include "hf/fdt_handler.h"
 #include "hf/load.h"
 #include "hf/mm.h"
 #include "hf/mpool.h"
 #include "hf/panic.h"
+#include "hf/plat/boot_flow.h"
 #include "hf/plat/console.h"
+#include "hf/plat/iommu.h"
 #include "hf/std.h"
 #include "hf/vm.h"
 
@@ -68,6 +71,8 @@
  */
 void one_time_init(void)
 {
+	struct fdt_header *fdt;
+	struct fdt_node fdt_root;
 	struct manifest manifest;
 	struct boot_params params;
 	struct boot_params_update update;
@@ -84,10 +89,28 @@
 
 	mm_stage1_locked = mm_lock_stage1();
 
-	if (!boot_flow_init(mm_stage1_locked, &manifest, &params, &ppool)) {
+	fdt = fdt_map(mm_stage1_locked, plat_boot_flow_get_fdt_addr(),
+		      &fdt_root, &ppool);
+	if (fdt == NULL) {
+		panic("Unable to map FDT.\n");
+	}
+
+	if (!fdt_find_child(&fdt_root, "")) {
+		panic("Unable to find FDT root node.\n");
+	}
+
+	if (!boot_flow_init(&fdt_root, &manifest, &params)) {
 		panic("Could not parse data from FDT.");
 	}
 
+	if (!plat_iommu_init(&fdt_root, mm_stage1_locked, &ppool)) {
+		panic("Could not initialize IOMMUs.");
+	}
+
+	if (!fdt_unmap(mm_stage1_locked, fdt, &ppool)) {
+		panic("Unable to unmap FDT.\n");
+	}
+
 	cpu_module_init(params.cpu_ids, params.cpu_count);
 
 	for (i = 0; i < params.mem_ranges_count; ++i) {