dm: core: Add comments to ofnode_read_resource() functoins

[u-boot] / lib / optee / optee.c

diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index 365c078a51def7888cb2f0392b2a95b217d7f534..db92cd9af293ccf94b7c1aa0d316a0eb6f4501c9 100644 (file)
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -1,13 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 Linaro
  * Bryan O'Donoghue <bryan.odonoghue@linaro.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #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 +47,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;
 }