board: sl28: add ATF support (bl31)

Add support to load the bl31 part of the ARM Trusted Firmware by the
SPL.

Signed-off-by: Michael Walle <michael@walle.cc>

diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
index 87e14d6ae68c5c624085286c293c366101599305..54ef0b4258dc4c6707e89bbd91d685f5a75fc3b0 100644 (file)
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
@@ -16,7 +16,7 @@
                ethernet3 = &enetc6;
        };
 
-       binman {
+       binman: binman {
                filename = "u-boot.rom";
                pad-byte = <0xff>;
 
@@ -99,6 +99,45 @@
        };
 };
 
+#ifdef CONFIG_SL28_SPL_LOADS_ATF_BL31
+&binman {
+       fit {
+               images {
+                       bl31 {
+                               description = "ARM Trusted Firmware (bl31)";
+                               type = "firmware";
+                               arch = "arm";
+                               os = "arm-trusted-firmware";
+                               compression = "none";
+                               load = <CONFIG_SL28_BL31_ENTRY_ADDR>;
+                               entry = <CONFIG_SL28_BL31_ENTRY_ADDR>;
+
+                               blob-ext {
+                                       filename = "bl31.bin";
+                               };
+                       };
+               };
+
+               configurations {
+                       conf-1 {
+                               firmware = "bl31";
+                               loadables = "uboot";
+                       };
+
+                       conf-2 {
+                               firmware = "bl31";
+                               loadables = "uboot";
+                       };
+
+                       conf-3 {
+                               firmware = "bl31";
+                               loadables = "uboot";
+                       };
+               };
+       };
+};
+#endif
+
 &i2c0 {
        rtc: rtc@32 {
        };

diff --git a/board/kontron/sl28/Kconfig b/board/kontron/sl28/Kconfig
index cdec39be018bf21f0ee91240644db5f3f840b180..aba49fc11586eed03eda6a8303816331b8019bb1 100644 (file)
--- a/board/kontron/sl28/Kconfig
+++ b/board/kontron/sl28/Kconfig
@@ -15,4 +15,14 @@ config SYS_CONFIG_NAME
 config SYS_TEXT_BASE
        default 0x96000000
 
+config SL28_SPL_LOADS_ATF_BL31
+       bool "SPL loads BL31 of the ARM Trusted Firmware"
+       select SPL_ATF
+       select SPL_ATF_LOAD_IMAGE_V2
+       select ARMV8_SEC_FIRMWARE_SUPPORT
+       select SEC_FIRMWARE_ARMV8_PSCI
+       help
+         Enable this to load a BL31 image by the SPL. You have to
+         provde a bl31.bin in u-boot's root directory.
+
 endif

diff --git a/board/kontron/sl28/Makefile b/board/kontron/sl28/Makefile
index 74d8012f0faf3510b05b87ac083481b1d448e618..5d220f07447e4c3b516664ff0e5e512fcebff2c8 100644 (file)
--- a/board/kontron/sl28/Makefile
+++ b/board/kontron/sl28/Makefile
@@ -5,4 +5,8 @@ obj-y += sl28.o cmds.o
 endif
 
 obj-y += common.o ddr.o
-obj-$(CONFIG_SPL_BUILD) += spl.o
+
+ifdef CONFIG_SPL_BUILD
+obj-y += spl.o
+obj-$(CONFIG_SPL_ATF) += spl_atf.o
+endif

diff --git a/board/kontron/sl28/spl_atf.c b/board/kontron/sl28/spl_atf.c
new file mode 100644 (file)
index 0000000..5438b52
--- /dev/null
+++ b/board/kontron/sl28/spl_atf.c
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * LS1028A TF-A calling support
+ *
+ * Copyright (c) 2020 Michael Walle <michael@walle.cc>
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <atf_common.h>
+#include <spl.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct region_info {
+       u64 addr;
+       u64 size;
+};
+
+struct dram_regions_info {
+       u64 num_dram_regions;
+       u64 total_dram_size;
+       struct region_info region[CONFIG_NR_DRAM_BANKS];
+};
+
+struct bl_params *bl2_plat_get_bl31_params_v2(uintptr_t bl32_entry,
+                                             uintptr_t bl33_entry,
+                                             uintptr_t fdt_addr)
+{
+       static struct dram_regions_info dram_regions_info = { 0 };
+       struct bl_params *bl_params;
+       struct bl_params_node *node;
+       void *dcfg_ccsr = (void *)DCFG_BASE;
+       int i;
+
+       dram_regions_info.num_dram_regions = CONFIG_NR_DRAM_BANKS;
+       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+               dram_regions_info.region[i].addr = gd->bd->bi_dram[i].start;
+               dram_regions_info.region[i].size = gd->bd->bi_dram[i].size;
+               dram_regions_info.total_dram_size += gd->bd->bi_dram[i].size;
+       }
+
+       bl_params = bl2_plat_get_bl31_params_v2_default(bl32_entry, bl33_entry,
+                                                       fdt_addr);
+
+       for_each_bl_params_node(bl_params, node) {
+               if (node->image_id == ATF_BL31_IMAGE_ID) {
+                       node->ep_info->args.arg3 = (uintptr_t)&dram_regions_info;
+                       node->ep_info->args.arg4 = in_le32(dcfg_ccsr + DCFG_PORSR1);
+               }
+       }
+
+       return bl_params;
+}