Skip to contentSkip to conversation

arm: mach-omap2: Relax checks on OP-TEE location to allow pageable image

PATCH In review Andrew F. Davis 3 participants 3 messages Sep 13, 2017 – Sep 16, 2017

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Andrew F. Davis

author
#0 lore raw

PATCH 1/1 arm: mach-omap2: Relax checks on OP-TEE location to allow pageable image

From: Harinarayan Bhatta <[email protected]>

When the OP-TEE image is built for secure paging the load address may be in SRAM, remove checks that prevent this.

Signed-off-by Harinarayan Bhatta <[email protected]>
Signed-off-by Andrew F. Davis <[email protected]>
---
 arch/arm/mach-omap2/sec-common.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/sec-common.c +2 -6
index 2d54a3165e..52e1785b4a 100644
@@ -305,12 +305,8 @@ int secure_tee_install(u32 addr)
 
 	if ((hdr->magic != OPTEE_MAGIC) ||
 	    (hdr->version != OPTEE_VERSION) ||
-	    (hdr->init_load_addr_hi != 0) ||
-	    (hdr->init_load_addr_lo < (sec_mem_start + sizeof(struct optee_header))) ||
-	    (tee_file_size > size) ||
-	    ((hdr->init_load_addr_lo + tee_file_size - 1) >
-	     (sec_mem_start + size - 1))) {
-		printf("Error in TEE header. Check load address and sizes\n");
+	    (tee_file_size > size)) {
+		printf("Error in TEE header. Check firewall and TEE sizes\n");
 		unmap_sysmem(hdr);
 		return CMD_RET_FAILURE;
 	}
Signature · 1 line
2.14.1
#2 lore raw
In reply to Andrew F. Davis
Quoted 8 lines · Andrew F. Davis

From: Harinarayan Bhatta <[email protected]>

When the OP-TEE image is built for secure paging the load address may be in SRAM, remove checks that prevent this.

Signed-off-by Harinarayan Bhatta <[email protected]>
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Lokesh Vutla <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170915/efc8be4a/attachment.sig>