TEE-329-2: OP-TEE: Allow u-boot to add optee node in dtb

If OP-TEE is loaded by ATF, u-boot will add optee device tree node in th edtb so that Linux can loads OP-TEE driver. Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com> (cherry picked from commit 441c23698ffd5c90c6421113da55fae420072473)

TEE-329-2: OP-TEE: Allow u-boot to add optee node in dtb
If OP-TEE is loaded by ATF, u-boot will add optee device tree node in th edtb so that Linux can loads OP-TEE driver. Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com> (cherry picked from commit 441c23698ffd5c90c6421113da55fae420072473)
Silvano di Ninno · Ye Li
1 parent 15ff24b142
Showing 1 changed file with 49 additions and 0 deletions Side-by-side Diff
arch/arm/mach-imx/imx8/cpu.c
@@ -1300,6 +1300,54 @@
 #endif
  
 #ifdef CONFIG_OF_SYSTEM_SETUP
+static int ft_add_optee_node(void *fdt, bd_t *bd)
+{
+	const char *path, *subpath;
+	int offs;
+
+	/*
+	 * No TEE space allocated indicating no TEE running, so no
+	 * need to add optee node in dts
+	 */
+	if (!rom_pointer[1])
+		return 0;
+
+	offs = fdt_increase_size(fdt, 512);
+	if (offs) {
+		printf("No Space for dtb\n");
+		return 1;
+	}
+
+	path = "/firmware";
+	offs = fdt_path_offset(fdt, path);
+	if (offs < 0) {
+		path = "/";
+		offs = fdt_path_offset(fdt, path);
+
+		if (offs < 0) {
+			printf("Could not find root node.\n");
+			return 1;
+		}
+
+		subpath = "firmware";
+		offs = fdt_add_subnode(fdt, offs, subpath);
+		if (offs < 0) {
+			printf("Could not create %s node.\n", subpath);
+		}
+	}
+
+	subpath = "optee";
+	offs = fdt_add_subnode(fdt, offs, subpath);
+	if (offs < 0) {
+		printf("Could not create %s node.\n", subpath);
+	}
+
+	fdt_setprop_string(fdt, offs, "compatible", "linaro,optee-tz");
+	fdt_setprop_string(fdt, offs, "method", "smc");
+
+	return 0;
+}
+
 int ft_system_setup(void *blob, bd_t *bd)
 {
 #ifdef BOOTAUX_RESERVED_MEM_BASE
@@ -1320,6 +1368,7 @@
 	config_smmu_fdt(blob);
 #endif
  
+	ft_add_optee_node(blob, bd);
 	return 0;
 }
 #endif
...	...	@@ -1300,6 +1300,54 @@
1300	1300	#endif
1301	1301
1302	1302	#ifdef CONFIG_OF_SYSTEM_SETUP
	1303	+static int ft_add_optee_node(void fdt, bd_t bd)
	1304	+{
	1305	+ const char path, subpath;
	1306	+ int offs;
	1307	+
	1308	+ /*
	1309	+ * No TEE space allocated indicating no TEE running, so no
	1310	+ * need to add optee node in dts
	1311	+ */
	1312	+ if (!rom_pointer[1])
	1313	+ return 0;
	1314	+
	1315	+ offs = fdt_increase_size(fdt, 512);
	1316	+ if (offs) {
	1317	+ printf("No Space for dtb\n");
	1318	+ return 1;
	1319	+ }
	1320	+
	1321	+ path = "/firmware";
	1322	+ offs = fdt_path_offset(fdt, path);
	1323	+ if (offs < 0) {
	1324	+ path = "/";
	1325	+ offs = fdt_path_offset(fdt, path);
	1326	+
	1327	+ if (offs < 0) {
	1328	+ printf("Could not find root node.\n");
	1329	+ return 1;
	1330	+ }
	1331	+
	1332	+ subpath = "firmware";
	1333	+ offs = fdt_add_subnode(fdt, offs, subpath);
	1334	+ if (offs < 0) {
	1335	+ printf("Could not create %s node.\n", subpath);
	1336	+ }
	1337	+ }
	1338	+
	1339	+ subpath = "optee";
	1340	+ offs = fdt_add_subnode(fdt, offs, subpath);
	1341	+ if (offs < 0) {
	1342	+ printf("Could not create %s node.\n", subpath);
	1343	+ }
	1344	+
	1345	+ fdt_setprop_string(fdt, offs, "compatible", "linaro,optee-tz");
	1346	+ fdt_setprop_string(fdt, offs, "method", "smc");
	1347	+
	1348	+ return 0;
	1349	+}
	1350	+
1303	1351	int ft_system_setup(void blob, bd_t bd)
1304	1352	{
1305	1353	#ifdef BOOTAUX_RESERVED_MEM_BASE
...	...	@@ -1320,6 +1368,7 @@
1320	1368	config_smmu_fdt(blob);
1321	1369	#endif
1322	1370
	1371	+ ft_add_optee_node(blob, bd);
1323	1372	return 0;
1324	1373	}
1325	1374	#endif