Merge tag 'xilinx-for-v2021.01-v2' of https://gitlab.denx.de/u-boot/custodians/u...

[pandora-u-boot.git] / common / spl / spl_atf.c

diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index 4715f9d..9bd25f6 100644 (file)
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -11,27 +11,21 @@
 
 #include <common.h>
 #include <atf_common.h>
+#include <cpu_func.h>
 #include <errno.h>
+#include <image.h>
+#include <log.h>
 #include <spl.h>
+#include <asm/cache.h>
 
 static struct bl2_to_bl31_params_mem bl31_params_mem;
 static struct bl31_params *bl2_to_bl31_params;
 
-/**
- * bl2_plat_get_bl31_params() - prepare params for bl31.
- *
- * This function assigns a pointer to the memory that the platform has kept
- * aside to pass platform specific and trusted firmware related information
- * to BL31. This memory is allocated by allocating memory to
- * bl2_to_bl31_params_mem structure which is a superset of all the
- * structure whose information is passed to BL31
- * NOTE: This function should be called only once and should be done
- * before generating params to BL31
- *
- * @return bl31 params structure pointer
- */
-static struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl33_entry)
+__weak struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl32_entry,
+                                                   uintptr_t bl33_entry,
+                                                   uintptr_t fdt_addr)
 {
+       struct entry_point_info *bl32_ep_info;
        struct entry_point_info *bl33_ep_info;
 
        /*
@@ -49,16 +43,21 @@ static struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl33_entry)
        SET_PARAM_HEAD(bl2_to_bl31_params->bl31_image_info,
                       ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0);
 
-       /* Fill BL32 related information if it exists */
+       /* Fill BL32 related information */
        bl2_to_bl31_params->bl32_ep_info = &bl31_params_mem.bl32_ep_info;
-       SET_PARAM_HEAD(bl2_to_bl31_params->bl32_ep_info, ATF_PARAM_EP,
-                      ATF_VERSION_1, 0);
+       bl32_ep_info = &bl31_params_mem.bl32_ep_info;
+       SET_PARAM_HEAD(bl32_ep_info, ATF_PARAM_EP, ATF_VERSION_1,
+                      ATF_EP_SECURE);
+
+       /* secure payload is optional, so set pc to 0 if absent */
+       bl32_ep_info->args.arg3 = fdt_addr;
+       bl32_ep_info->pc = bl32_entry ? bl32_entry : 0;
+       bl32_ep_info->spsr = SPSR_64(MODE_EL1, MODE_SP_ELX,
+                                    DISABLE_ALL_EXECPTIONS);
+
        bl2_to_bl31_params->bl32_image_info = &bl31_params_mem.bl32_image_info;
        SET_PARAM_HEAD(bl2_to_bl31_params->bl32_image_info,
                       ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0);
-#ifndef BL32_BASE
-       bl2_to_bl31_params->bl32_ep_info->pc = 0;
-#endif /* BL32_BASE */
 
        /* Fill BL33 related information */
        bl2_to_bl31_params->bl33_ep_info = &bl31_params_mem.bl33_ep_info;
@@ -86,13 +85,14 @@ static inline void raw_write_daif(unsigned int daif)
 
 typedef void (*atf_entry_t)(struct bl31_params *params, void *plat_params);
 
-static void bl31_entry(uintptr_t bl31_entry, uintptr_t bl33_entry,
-                      uintptr_t fdt_addr)
+static void bl31_entry(uintptr_t bl31_entry, uintptr_t bl32_entry,
+                      uintptr_t bl33_entry, uintptr_t fdt_addr)
 {
        struct bl31_params *bl31_params;
        atf_entry_t  atf_entry = (atf_entry_t)bl31_entry;
 
-       bl31_params = bl2_plat_get_bl31_params(bl33_entry);
+       bl31_params = bl2_plat_get_bl31_params(bl32_entry, bl33_entry,
+                                              fdt_addr);
 
        raw_write_daif(SPSR_EXCEPTION_MASK);
        dcache_disable();
@@ -100,9 +100,9 @@ static void bl31_entry(uintptr_t bl31_entry, uintptr_t bl33_entry,
        atf_entry((void *)bl31_params, (void *)fdt_addr);
 }
 
-static int spl_fit_images_find_uboot(void *blob)
+static int spl_fit_images_find(void *blob, int os)
 {
-       int parent, node, ndepth;
+       int parent, node, ndepth = 0;
        const void *data;
 
        if (!blob)
@@ -122,7 +122,7 @@ static int spl_fit_images_find_uboot(void *blob)
                if (!data)
                        continue;
 
-               if (genimg_get_os_id(data) == IH_OS_U_BOOT)
+               if (genimg_get_os_id(data) == os)
                        return node;
        };
 
@@ -132,10 +132,11 @@ static int spl_fit_images_find_uboot(void *blob)
 uintptr_t spl_fit_images_get_entry(void *blob, int node)
 {
        ulong  val;
+       int ret;
 
-       val = fdt_getprop_u32(blob, node, "entry-point");
-       if (val == FDT_ERROR)
-               val = fdt_getprop_u32(blob, node, "load-addr");
+       ret = fit_image_get_entry(blob, node, &val);
+       if (ret)
+               ret = fit_image_get_load(blob, node, &val);
 
        debug("%s: entry point 0x%lx\n", __func__, val);
        return val;
@@ -143,11 +144,21 @@ uintptr_t spl_fit_images_get_entry(void *blob, int node)
 
 void spl_invoke_atf(struct spl_image_info *spl_image)
 {
+       uintptr_t  bl32_entry = 0;
        uintptr_t  bl33_entry = CONFIG_SYS_TEXT_BASE;
        void *blob = spl_image->fdt_addr;
        uintptr_t platform_param = (uintptr_t)blob;
        int node;
 
+       /*
+        * Find the OP-TEE binary (in /fit-images) load address or
+        * entry point (if different) and pass it as the BL3-2 entry
+        * point, this is optional.
+        */
+       node = spl_fit_images_find(blob, IH_OS_TEE);
+       if (node >= 0)
+               bl32_entry = spl_fit_images_get_entry(blob, node);
+
        /*
         * Find the U-Boot binary (in /fit-images) load addreess or
         * entry point (if different) and pass it as the BL3-3 entry
@@ -155,7 +166,7 @@ void spl_invoke_atf(struct spl_image_info *spl_image)
         * This will need to be extended to support Falcon mode.
         */
 
-       node = spl_fit_images_find_uboot(blob);
+       node = spl_fit_images_find(blob, IH_OS_U_BOOT);
        if (node >= 0)
                bl33_entry = spl_fit_images_get_entry(blob, node);
 
@@ -172,5 +183,6 @@ void spl_invoke_atf(struct spl_image_info *spl_image)
         * We don't provide a BL3-2 entry yet, but this will be possible
         * using similar logic.
         */
-       bl31_entry(spl_image->entry_point, bl33_entry, platform_param);
+       bl31_entry(spl_image->entry_point, bl32_entry,
+                  bl33_entry, platform_param);
 }