diff options
| author | Bryan O'Donoghue <[email protected]> | 2018-03-13 16:50:34 +0000 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-03-19 16:14:25 -0400 |
| commit | 6ffc4200457e0616d51f3a7219bbd486d564a4e6 (patch) | |
| tree | 239860668019db4d223f453e9174b57c7cd1a63a /lib/optee | |
| parent | c5a6e8bd00cc7257541a904682206bdc0be2bab4 (diff) | |
optee: Add error printout
When encountering an error in OPTEE verification print out various details
of the OPTEE header to aid in further debugging of encountered errors.
Signed-off-by: Bryan O'Donoghue <[email protected]>
Cc: Harinarayan Bhatta <[email protected]>
Cc: Andrew F. Davis <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Kever Yang <[email protected]>
Cc: Philipp Tomsich <[email protected]>
Cc: Peng Fan <[email protected]>
Tested-by: Peng Fan <[email protected]>
Diffstat (limited to 'lib/optee')
| -rw-r--r-- | lib/optee/optee.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/lib/optee/optee.c b/lib/optee/optee.c index 365c078a51d..78a15e8a32f 100644 --- a/lib/optee/optee.c +++ b/lib/optee/optee.c @@ -8,6 +8,12 @@ #include <common.h> #include <tee/optee.h> +#define optee_hdr_err_msg \ + "OPTEE verification error:" \ + "\n\thdr=%p image=0x%08lx magic=0x%08x tzdram 0x%08lx-0x%08lx " \ + "\n\theader lo=0x%08x hi=0x%08x size=0x%08lx arch=0x%08x" \ + "\n\tuimage params 0x%08lx-0x%08lx\n" + int optee_verify_image(struct optee_header *hdr, unsigned long tzdram_start, unsigned long tzdram_len, unsigned long image_len) { @@ -42,10 +48,19 @@ int optee_verify_bootm_image(unsigned long image_addr, ret = optee_verify_image(hdr, tzdram_start, tzdram_len, image_len); if (ret) - return ret; + goto error; - if (image_load_addr + sizeof(*hdr) != hdr->init_load_addr_lo) + if (image_load_addr + sizeof(*hdr) != hdr->init_load_addr_lo) { ret = -EINVAL; + goto error; + } + + return ret; +error: + printf(optee_hdr_err_msg, hdr, image_addr, hdr->magic, tzdram_start, + tzdram_start + tzdram_len, hdr->init_load_addr_lo, + hdr->init_load_addr_hi, image_len, hdr->arch, image_load_addr, + image_load_addr + image_len); return ret; } |