Skip to contentSkip to conversation

optee: copy FDT OP-TEE related nodes before generic FDT changes

PATCH New Patrick Delaunay 2 participants 2 messages Sep 30, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 optee: copy FDT OP-TEE related nodes before generic FDT changes

From: Etienne Carriere <[email protected]>

Move call to optee_copy_fdt_nodes() introduced by [1] before generic changes in kernel FDT so that platform specific changes are not overridden by the changes made by this function.

Link [1] commit 6ccb05eae01b ("image: fdt: copy possible optee nodes to a loaded devicetree")
Fixes 6ccb05eae01b ('image: fdt: copy possible optee nodes to a loaded devicetree')

---

Changes in v2:
- rebase on master branch
- add Fixes tag

 common/image-fdt.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
common/image-fdt.c +8 -7
index f13eefb061..3d6935ad40 100644
@@ -557,6 +557,14 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
 		printf("ERROR: arch-specific fdt fixup failed\n");
 		goto err;
 	}
+
+	fdt_ret = optee_copy_fdt_nodes(gd->fdt_blob, blob);
+	if (fdt_ret) {
+		printf("ERROR: transfer of optee nodes to new fdt failed: %s\n",
+		       fdt_strerror(fdt_ret));
+		goto err;
+	}
+
 	/* Update ethernet nodes */
 	fdt_fixup_ethernet(blob);
 	if (IMAGE_OF_BOARD_SETUP) {
@@ -576,13 +584,6 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
 		}
 	}
 
-	fdt_ret = optee_copy_fdt_nodes(gd->fdt_blob, blob);
-	if (fdt_ret) {
-		printf("ERROR: transfer of optee nodes to new fdt failed: %s\n",
-		       fdt_strerror(fdt_ret));
-		goto err;
-	}
-
 	/* Delete the old LMB reservation */
 	if (lmb)
 		lmb_free(lmb, (phys_addr_t)(u32)(uintptr_t)blob,
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 optee: copy FDT OP-TEE related nodes before generic FDT changes

Quoted 8 lines · Patrick Delaunay

From: Etienne Carriere <[email protected]>

Move call to optee_copy_fdt_nodes() introduced by [1] before generic changes in kernel FDT so that platform specific changes are not overridden by the changes made by this function.

Link [1] commit 6ccb05eae01b ("image: fdt: copy possible optee nodes to a loaded devicetree")
Quoted 8 lines
Fixes 6ccb05eae01b ('image: fdt: copy possible optee nodes to a loaded devicetree')

---

Changes in v2:
- rebase on master branch
- add Fixes tag

Note that this applied cleanly for me and I reworded the commit slightly differently to also include a fixes tag. I'm currently testing this (just to be safe). Sorry for not being clear in the other thread I would just grab that and add the tag.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200930/81f69a4b/attachment.sig>