Skip to contentSkip to conversation

stm32mp: Enable OP-TEE and TZC support in SPL

PATCH Superseded Alexandru Gagniuc 3 participants 11 messages Mar 15, 2021 – Apr 7, 2021

Subsystems (3)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v2 cover stm32mp: Enable OP-TEE and TZC support in SPL

The purpose of this series is to allow booting an OP-TEE image from SPL, by corectly configuring the TrustZone (TZC) memory regions.

Although TZC400 is a generic silicon logic that could apply to other mach- families, support is currently restricted to stm32mp. I have neither a feasible way nor interest in validating this for other chips. It's fairly trivial to move the code from mach- to arch/, should another use case arise.

The configuration of the memory regions is devicetree-driven, so there isn't much to hardcode, However the delineation between OP-TEE secure memory and shared memory is not given in the devicetree. This is the one thing that has to be hardcoded.

Although a variable CONFIG_OPTEE_TZDRAM_SIZE exists which advertises to do exactly the above, it is not suitable. This variable is used in u-boot proper, and is dependent on lib/optee being enabled. CONFIG_SPL_OPTEE, used herein, is independent of lib/optee. Thus, CONFIG_OPTEE_TZDRAM_SIZE is not guaranteed to exist

Changes since v1:
- Removed "Weak functions are stupid" comment
- Addressed blank line complaints from checkpatch

Alexandru Gagniuc (5):
spl: mmc: Support OP-TEE payloads in Falcon mode
spl: Introduce spl_board_prepare_for_optee() hook
arm: stm32mp: Implement support for TZC 400 controller
stm32mp1: spl: Configure TrustZone controller for OP-TEE
ARM: dts: stm32mp: Add OP-TEE reserved memory to SPL dtb

 arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi |   3 +
 arch/arm/mach-stm32mp/Makefile           |   1 +
 arch/arm/mach-stm32mp/include/mach/tzc.h |  33 ++++++
 arch/arm/mach-stm32mp/spl.c              |  84 ++++++++++++++
 arch/arm/mach-stm32mp/tzc400.c           | 133 +++++++++++++++++++++++
 common/spl/spl.c                         |   5 +
 common/spl/spl_mmc.c                     |   6 +-
 include/spl.h                            |  14 +++
 8 files changed, 277 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/mach-stm32mp/include/mach/tzc.h
 create mode 100644 arch/arm/mach-stm32mp/tzc400.c
Signature · 3 lines
2.26.2

q
#1 lore raw

PATCH v2 1/5 spl: mmc: Support OP-TEE payloads in Falcon mode

In general, Falcon mode means we're booting a linux kernel directly. With FIT images, however, an OP-TEE secure kernel can be booted before linux. Thus, if the next stage is an IH_OS_TEE, this isn't necessarily a problem.

Of course, a general solution would involve mmc_load_image_raw_os() only loading the binary, and leaving the decision of suitability to someone else. However, a rework of the boot flow is beyond the scope of this patch. Accept IH_OS_TEE as a valid OS value.

---
 common/spl/spl_mmc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
common/spl/spl_mmc.c +4 -2
index add2785b4e..bab558d055 100644
@@ -230,8 +230,10 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
 	if (ret)
 		return ret;
 
-	if (spl_image->os != IH_OS_LINUX) {
-		puts("Expected Linux image is not found. Trying to start U-boot\n");
+	if (spl_image->os != IH_OS_LINUX && spl_image->os != IH_OS_TEE) {
+		puts("Expected OS image is not found. Instead found ");
+		puts(genimg_get_os_name(spl_image->os));
+		puts(". Trying to start U-boot\n");
 		return -ENOENT;
 	}
 
Signature · 1 line
2.26.2
#2 lore raw

PATCH v2 1/5 spl: mmc: Support OP-TEE payloads in Falcon mode

Hi,

Quoted 23 lines · Alexandru Gagniuc

In general, Falcon mode means we're booting a linux kernel directly. With FIT images, however, an OP-TEE secure kernel can be booted before linux. Thus, if the next stage is an IH_OS_TEE, this isn't necessarily a problem.

Of course, a general solution would involve mmc_load_image_raw_os() only loading the binary, and leaving the decision of suitability to someone else. However, a rework of the boot flow is beyond the scope of this patch. Accept IH_OS_TEE as a valid OS value.

---
  common/spl/spl_mmc.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
common/spl/spl_mmc.c +0 -0
index add2785b4e..bab558d055 100644
@@ -230,8 +230,10 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
  	if (ret)
  		return ret;

common/spl/spl_mmc.c static int mmc_load_image_raw_os(struct spl_image_info *spl_image, · line 239

Quoted 10 lines
common/spl/spl_mmc.c +4 -2
 
-	if (spl_image->os != IH_OS_LINUX) {
-		puts("Expected Linux image is not found. Trying to start U-boot\n");
+	if (spl_image->os != IH_OS_LINUX && spl_image->os != IH_OS_TEE) {
+		puts("Expected OS image is not found. Instead found ");
+		puts(genimg_get_os_name(spl_image->os));
+		puts(". Trying to start U-boot\n");
  		return -ENOENT;
  	}
 

Thanks
Patrick

#3 lore raw

PATCH v2 2/5 spl: Introduce spl_board_prepare_for_optee() hook

In reply to Alexandru Gagniuc

OP-TEE requires some particular setup, which is not needed for linux or other payloads. Add a hook for platform-specific code to perform any OP-TEE related configuration and initialization.

A weak function is used because it is symmetrical to other spl_board_prepare_for_*() implementations. A solution to avoid the use of weak functions would trivially apply to all these implementations. However, re-designing this is beyond the scope of this patch.

---
 common/spl/spl.c |  5 +++++
 include/spl.h    | 14 ++++++++++++++
 2 files changed, 19 insertions(+)
common/spl/spl.c +5 -0
index e3d84082f4..bf4629588e 100644
@@ -161,6 +161,10 @@ __weak void spl_board_prepare_for_linux(void)
 	/* Nothing to do! */
 }
 
+__weak void spl_board_prepare_for_optee(void *fdt)
+{
+}
+
 __weak void spl_board_prepare_for_boot(void)
 {
 	/* Nothing to do! */
@@ -706,6 +710,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 #if CONFIG_IS_ENABLED(OPTEE)
 	case IH_OS_TEE:
 		debug("Jumping to U-Boot via OP-TEE\n");
+		spl_board_prepare_for_optee(spl_image.fdt_addr);
 		spl_optee_entry(NULL, NULL, spl_image.fdt_addr,
 				(void *)spl_image.entry_point);
 		break;
include/spl.h +14 -0
index 0d134587de..939b77972a 100644
@@ -387,6 +387,20 @@ int spl_parse_image_header(struct spl_image_info *spl_image,
 			   const struct image_header *header);
 
 void spl_board_prepare_for_linux(void);
+
+/**
+ * spl_board_prepare_for_optee() - Prepare board for an OPTEE payload
+ *
+ * Prepares the board for booting an OP-TEE payload. Initialization is platform
+ * specific, and may include configuring the TrustZone memory, and other
+ * initialization steps required by OP-TEE.
+ * Note that @fdt is not used directly by OP-TEE. OP-TEE passes this @fdt to
+ * its normal world target. This target is not guaranteed to be u-boot, so @fdt
+ * changes that would normally be done by u-boot should be done in this step.
+ *
+ * @fdt: Devicetree that will be passed on, or NULL
+ */
+void spl_board_prepare_for_optee(void *fdt);
 void spl_board_prepare_for_boot(void);
 int spl_board_ubi_load_image(u32 boot_device);
 int spl_board_boot_device(u32 boot_device);
Signature · 1 line
2.26.2
#4 lore raw

PATCH v2 2/5 spl: Introduce spl_board_prepare_for_optee() hook

Hi,

Quoted 9 lines · Alexandru Gagniuc

OP-TEE requires some particular setup, which is not needed for linux or other payloads. Add a hook for platform-specific code to perform any OP-TEE related configuration and initialization.

A weak function is used because it is symmetrical to other spl_board_prepare_for_*() implementations. A solution to avoid the use of weak functions would trivially apply to all these implementations. However, re-designing this is beyond the scope of this patch.

Quoted 8 lines
---
  common/spl/spl.c |  5 +++++
  include/spl.h    | 14 ++++++++++++++
  2 files changed, 19 insertions(+)

Thanks
Patrick

#5 lore raw

PATCH v2 3/5 arm: stm32mp: Implement support for TZC 400 controller

In reply to Alexandru Gagniuc

The purpose of this change is to allow configuring TrustZone (TZC) memory permissions. For example, OP-TEE expects TZC regions to be configured in a very particular way. The API presented here is intended to allow exactly that.

UCLASS support is not implemented, because it would not be too useful. Changing TZC permissions needs to be done with care, so as not to cut off access to memory we are currently using. One place where we can use this is at the end of SPL, right before jumping to OP-TEE.

---
 arch/arm/mach-stm32mp/Makefile           |   1 +
 arch/arm/mach-stm32mp/include/mach/tzc.h |  33 ++++++
 arch/arm/mach-stm32mp/tzc400.c           | 133 +++++++++++++++++++++++
 3 files changed, 167 insertions(+)
 create mode 100644 arch/arm/mach-stm32mp/include/mach/tzc.h
 create mode 100644 arch/arm/mach-stm32mp/tzc400.c
arch/arm/mach-stm32mp/Makefile +1 -0
index c8aa24d489..1b878c5a85 100644
@@ -10,6 +10,7 @@ obj-y += bsec.o
 
 ifdef CONFIG_SPL_BUILD
 obj-y += spl.o
+obj-y += tzc400.o
 else
 obj-$(CONFIG_CMD_STM32PROG) += cmd_stm32prog/
 obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o
arch/arm/mach-stm32mp/include/mach/tzc.h new file +33 -0
new file mode 100644
index 0000000000..16db55c464
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Simple API for configuring TrustZone memory regions
+ *
+ * The premise is that the desired TZC layout is known beforehand, and it can
+ * be configured in one step. tzc_configure() provides this functionality.
+ */
+#ifndef MACH_TZC_H
+#define MACH_TZC_H
+
+#include <linux/types.h>
+
+enum tzc_sec_mode {
+	TZC_ATTR_SEC_NONE = 0,
+	TZC_ATTR_SEC_R = 1,
+	TZC_ATTR_SEC_W = 2,
+	TZC_ATTR_SEC_RW	 = 3
+};
+
+struct tzc_region {
+	uintptr_t base;
+	uintptr_t top;
+	enum tzc_sec_mode sec_mode;
+	uint16_t nsec_id;
+	uint16_t filters_mask;
+};
+
+int tzc_configure(uintptr_t tzc, const struct tzc_region *cfg);
+int tzc_disable_filters(uintptr_t tzc, uint16_t filters_mask);
+int tzc_enable_filters(uintptr_t tzc, uint16_t filters_mask);
+void tzc_dump_config(uintptr_t tzc);
+
+#endif /* MACH_TZC_H */
arch/arm/mach-stm32mp/tzc400.c new file +133 -0

133 lines not on this page · raw message

Signature · 1 line
2.26.2
#6 lore raw

PATCH v2 3/5 arm: stm32mp: Implement support for TZC 400 controller

Hi

Quoted 37 lines · Alexandru Gagniuc

The purpose of this change is to allow configuring TrustZone (TZC) memory permissions. For example, OP-TEE expects TZC regions to be configured in a very particular way. The API presented here is intended to allow exactly that.

UCLASS support is not implemented, because it would not be too useful. Changing TZC permissions needs to be done with care, so as not to cut off access to memory we are currently using. One place where we can use this is at the end of SPL, right before jumping to OP-TEE.

---
  arch/arm/mach-stm32mp/Makefile           |   1 +
  arch/arm/mach-stm32mp/include/mach/tzc.h |  33 ++++++
  arch/arm/mach-stm32mp/tzc400.c           | 133 +++++++++++++++++++++++
  3 files changed, 167 insertions(+)

create mode 100644 arch/arm/mach-stm32mp/include/mach/tzc.h create mode 100644 arch/arm/mach-stm32mp/tzc400.c

arch/arm/mach-stm32mp/Makefile +1 -0
index c8aa24d489..1b878c5a85 100644
@@ -10,6 +10,7 @@ obj-y += bsec.o
 
  ifdef CONFIG_SPL_BUILD
  obj-y += spl.o
+obj-y += tzc400.o
  else
  obj-$(CONFIG_CMD_STM32PROG) += cmd_stm32prog/
  obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o
arch/arm/mach-stm32mp/include/mach/tzc.h new file +0 -0
new file mode 100644
index 0000000000..16db55c464

arch/arm/mach-stm32mp/include/mach/tzc.h line 7

Quoted 7 lines
arch/arm/mach-stm32mp/include/mach/tzc.h new file +7 -0
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Simple API for configuring TrustZone memory regions
+ *
+ * The premise is that the desired TZC layout is known beforehand, and it can
+ * be configured in one step. tzc_configure() provides this functionality.
+ */

As we activate LOG feature, can you add the define:

#define LOG_CATEGORY LOGC_ARCH

Quoted 24 lines
arch/arm/mach-stm32mp/include/mach/tzc.h new file +24 -0
+#ifndef MACH_TZC_H
+#define MACH_TZC_H
+
+#include <linux/types.h>
+
+enum tzc_sec_mode {
+	TZC_ATTR_SEC_NONE = 0,
+	TZC_ATTR_SEC_R = 1,
+	TZC_ATTR_SEC_W = 2,
+	TZC_ATTR_SEC_RW	 = 3
+};
+
+struct tzc_region {
+	uintptr_t base;
+	uintptr_t top;
+	enum tzc_sec_mode sec_mode;
+	uint16_t nsec_id;
+	uint16_t filters_mask;
+};
+
+int tzc_configure(uintptr_t tzc, const struct tzc_region *cfg);
+int tzc_disable_filters(uintptr_t tzc, uint16_t filters_mask);
+int tzc_enable_filters(uintptr_t tzc, uint16_t filters_mask);
+void tzc_dump_config(uintptr_t tzc);

(...)

Quoted 15 lines
arch/arm/mach-stm32mp/include/mach/tzc.h new file +15 -0
+
+void tzc_dump_config(uintptr_t tzc)
+{
+	uint32_t build_config, base, top, attr, nsaid;
+	int num_regions, i;
+	uintptr_t region;
+
+	build_config = tzc_read(tzc, TZC_BUILD_CONFIG);
+	num_regions = ((build_config >> 0) & 0x1f) + 1;
+
+	for (i = 0; i < num_regions; i++) {
+		region = tzc + TZC_REGION0_OFFSET + i * TZC_REGION_CFG_SIZE;
+
+		base = tzc_read(region, TZC_REGION_BASE);
+		top = tzc_read(region, TZC_REGION_TOP);

arch/arm/mach-stm32mp/include/mach/tzc.h

Quoted 10 lines
arch/arm/mach-stm32mp/include/mach/tzc.h new file +10 -0
+		attr = tzc_read(region, TZC_REGION_ATTRIBUTE);
+		nsaid = tzc_read(region, TZC_REGION_ACCESS);
+
+		if (attr == 0 && nsaid == 0)
+			continue;
+
+		pr_info("TZC region %u: %08x->%08x - filters 0x%x\n",
+			i, base, top, (attr >> 0) & 0xf);
+		pr_info("\t Secure access %s NSAID %08x\n",
+			sec_access_str_from_attr(attr), nsaid);

Can you use "log_info" instead of "pr_info" here....

arch/arm/mach-stm32mp/include/mach/tzc.h

Quoted 2 lines
arch/arm/mach-stm32mp/include/mach/tzc.h new file +2 -0
+	}
+}

except this 2 minors comment, Ok with the path

Patrick

#7 lore raw

PATCH v2 4/5 stm32mp1: spl: Configure TrustZone controller for OP-TEE

In reply to Alexandru Gagniuc

OP-TEE is very particular about how the TZC should be configured. When booting an OP-TEE payload, an incorrect TZC configuration will result in a panic.

Most information can be derived from the SPL devicetree. The only information we don't have is the split between TZDRAM and shared memory. This has to be hardcoded. The rest of the configuration is fairly easy, and only requires 3 TZC regions. Configure them.

---
 arch/arm/mach-stm32mp/spl.c | 84 +++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
arch/arm/mach-stm32mp/spl.c +84 -0
index b53659a698..64882c67e3 100644
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <mach/tzc.h>
 #include <linux/libfdt.h>
 
 u32 spl_boot_device(void)
@@ -92,6 +93,89 @@ __weak int board_early_init_f(void)
 	return 0;
 }
 
+uint32_t stm32mp_get_dram_size(void)
+{
+	uint32_t ram_size = 0;
+	struct udevice *dev;
+	ofnode node;
+
+	if (uclass_get_device(UCLASS_RAM, 0, &dev))
+		return 0;
+
+	dev_for_each_subnode(node, dev) {
+		ram_size = ofnode_read_u32_default(node, "st,mem-size", 0);
+		if (ram_size)
+			break;
+	}
+
+	return ram_size;
+}
+
+uint32_t optee_get_reserved_memory_base(void)
+{
+	ofnode node;
+	fdt_addr_t start;
+
+	node = ofnode_path("/reserved-memory/optee");
+	if (!ofnode_valid(node))
+		return 0;
+
+	start = ofnode_get_addr(node);
+	return (start < 0) ? 0 : (uintptr_t)start;
+}
+
+#define CFG_TZDRAM_SIZE		0x01e00000
+#define STM32_TZC_NSID_ALL		0xffff
+#define STM32_TZC_FILTER_ALL		3
+
+void stm32_init_tzc_for_optee(void)
+{
+	const uint32_t dram_size = stm32mp_get_dram_size();
+	const uintptr_t dram_top = STM32_DDR_BASE + (dram_size - 1);
+	uint32_t optee_base = optee_get_reserved_memory_base();
+	uint32_t tee_shmem_base = optee_base + CFG_TZDRAM_SIZE;
+	const uintptr_t tzc = STM32_TZC_BASE;
+
+	if (dram_size == 0)
+		panic("Cannot determine DRAM size from devicetree\n");
+
+	const struct tzc_region optee_config[] = {
+		{
+			.base = STM32_DDR_BASE,
+			.top = optee_base - 1,
+			.sec_mode = TZC_ATTR_SEC_NONE,
+			.nsec_id = STM32_TZC_NSID_ALL,
+			.filters_mask = STM32_TZC_FILTER_ALL,
+		}, {
+			.base = optee_base,
+			.top = tee_shmem_base - 1,
+			.sec_mode = TZC_ATTR_SEC_RW,
+			.nsec_id = 0,
+			.filters_mask = STM32_TZC_FILTER_ALL,
+		}, {
+			.base = tee_shmem_base,
+			.top = dram_top,
+			.sec_mode = TZC_ATTR_SEC_NONE,
+			.nsec_id = STM32_TZC_NSID_ALL,
+			.filters_mask = STM32_TZC_FILTER_ALL,
+		}, {
+			.top = 0,
+		}
+	};
+
+	flush_dcache_all();
+
+	tzc_configure(tzc, optee_config);
+	tzc_dump_config(tzc);
+
+	dcache_disable();
+}
+
+void spl_board_prepare_for_optee(void *fdt)
+{
+	stm32_init_tzc_for_optee();
+}
+
 void board_init_f(ulong dummy)
 {
 	struct udevice *dev;
Signature · 1 line
2.26.2
#8 lore raw

PATCH v2 4/5 stm32mp1: spl: Configure TrustZone controller for OP-TEE

Hi,

Quoted 37 lines · Alexandru Gagniuc

OP-TEE is very particular about how the TZC should be configured. When booting an OP-TEE payload, an incorrect TZC configuration will result in a panic.

Most information can be derived from the SPL devicetree. The only information we don't have is the split between TZDRAM and shared memory. This has to be hardcoded. The rest of the configuration is fairly easy, and only requires 3 TZC regions. Configure them.

---
  arch/arm/mach-stm32mp/spl.c | 84 +++++++++++++++++++++++++++++++++++++
  1 file changed, 84 insertions(+)
arch/arm/mach-stm32mp/spl.c +8 -0
index b53659a698..64882c67e3 100644
@@ -16,6 +16,7 @@
  #include <asm/global_data.h>
  #include <asm/io.h>
  #include <asm/arch/sys_proto.h>
+#include <mach/tzc.h>
  #include <linux/libfdt.h>
 
  u32 spl_boot_device(void)
@@ -92,6 +93,89 @@ __weak int board_early_init_f(void)
  	return 0;
  }
 
+uint32_t stm32mp_get_dram_size(void)
+{
+	uint32_t ram_size = 0;
+	struct udevice *dev;
+	ofnode node;
+
+	if (uclass_get_device(UCLASS_RAM, 0, &dev))

arch/arm/mach-stm32mp/spl.c __weak int board_early_init_f(void) · line 112

Quoted 10 lines
arch/arm/mach-stm32mp/spl.c +10 -0
+		return 0;
+
+	dev_for_each_subnode(node, dev) {
+		ram_size = ofnode_read_u32_default(node, "st,mem-size", 0);
+		if (ram_size)
+			break;
+	}
+
+	return ram_size;
+}

no need to parse the device tree here, information is available in uclas API

see dram_init() in dram_init.c

uint32_t stm32mp_get_dram_size(void)
{

??? struct ram_info ram;

    if (uclass_get_device(UCLASS_RAM, 0, &dev))
	return 0;

??? ret = ram_get_info(dev, &ram);

??? if (ret)

??? ??? return 0;

??? return ram.size;
}

Quoted 4 lines
arch/arm/mach-stm32mp/spl.c +4 -0
+uint32_t optee_get_reserved_memory_base(void)
+{
+	ofnode node;
+	fdt_addr_t start;

arch/arm/mach-stm32mp/spl.c __weak int board_early_init_f(void) · line 127

Quoted 10 lines
arch/arm/mach-stm32mp/spl.c +10 -0
+
+	node = ofnode_path("/reserved-memory/optee");
+	if (!ofnode_valid(node))
+		return 0;
+
+	start = ofnode_get_addr(node);
+	return (start < 0) ? 0 : (uintptr_t)start;
+}
+
+#define CFG_TZDRAM_SIZE		0x01e00000

=> TEE reserved size should be get from device

??? reserved-memory {
??? ??? optee at de000000 {
??? ??? ??? reg = <0xde000000 0x02000000>;
??? ??? ??? no-map;
??? ??? };
??? };

??? start = ofnode_get_addr_size(node, "reg", &size)

Then only the size of the shared memory is hardcoded

#define CFG_SHMEM_SIZE 0x200000

arch/arm/mach-stm32mp/spl.c __weak int board_early_init_f(void) · line 136

Quoted 9 lines
arch/arm/mach-stm32mp/spl.c +9 -0
+#define STM32_TZC_NSID_ALL		0xffff
+#define STM32_TZC_FILTER_ALL		3
+
+void stm32_init_tzc_for_optee(void)
+{
+	const uint32_t dram_size = stm32mp_get_dram_size();
+	const uintptr_t dram_top = STM32_DDR_BASE + (dram_size - 1);
+	uint32_t optee_base = optee_get_reserved_memory_base();
+	uint32_t tee_shmem_base = optee_base + CFG_TZDRAM_SIZE;

uint32_t tee_shmem_base = optee_base + optee_size + CFG_SHMEM_SIZE;

Quoted 35 lines
arch/arm/mach-stm32mp/spl.c +35 -0
+	const uintptr_t tzc = STM32_TZC_BASE;
+
+	if (dram_size == 0)
+		panic("Cannot determine DRAM size from devicetree\n");
+
+	const struct tzc_region optee_config[] = {
+		{
+			.base = STM32_DDR_BASE,
+			.top = optee_base - 1,
+			.sec_mode = TZC_ATTR_SEC_NONE,
+			.nsec_id = STM32_TZC_NSID_ALL,
+			.filters_mask = STM32_TZC_FILTER_ALL,
+		}, {
+			.base = optee_base,
+			.top = tee_shmem_base - 1,
+			.sec_mode = TZC_ATTR_SEC_RW,
+			.nsec_id = 0,
+			.filters_mask = STM32_TZC_FILTER_ALL,
+		}, {
+			.base = tee_shmem_base,
+			.top = dram_top,
+			.sec_mode = TZC_ATTR_SEC_NONE,
+			.nsec_id = STM32_TZC_NSID_ALL,
+			.filters_mask = STM32_TZC_FILTER_ALL,
+		}, {
+			.top = 0,
+		}
+	};
+
+	flush_dcache_all();
+
+	tzc_configure(tzc, optee_config);
+	tzc_dump_config(tzc);
+
+	dcache_disable();

arch/arm/mach-stm32mp/spl.c __weak int board_early_init_f(void) · line 181

Quoted 10 lines
arch/arm/mach-stm32mp/spl.c +7 -0
+}
+
+void spl_board_prepare_for_optee(void *fdt)
+{
+	stm32_init_tzc_for_optee();
+}
+
  void board_init_f(ulong dummy)
  {
  	struct udevice *dev;

Regards,

Patrick

#9 lore raw

PATCH v2 5/5 ARM: dts: stm32mp: Add OP-TEE reserved memory to SPL dtb

In reply to Alexandru Gagniuc

Add the "/reserved-memory/optee" node to the SPL devicetree. The purpose is to allow configuring TZC regions when booting OP-TEE.

---
 arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 3 +++
 1 file changed, 3 insertions(+)
arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi +3 -0
index 6787619290..9c4100c39c 100644
@@ -30,9 +30,12 @@
 	};
 
 	reserved-memory {
+		u-boot,dm-pre-reloc;
+
 		optee at de000000 {
 			reg = <0xde000000 0x02000000>;
 			no-map;
+			u-boot,dm-pre-reloc;
 		};
 	};
 
Signature · 1 line
2.26.2
#10 lore raw

PATCH v2 5/5 ARM: dts: stm32mp: Add OP-TEE reserved memory to SPL dtb

Quoted 9 lines · Alexandru Gagniuc

Add the "/reserved-memory/optee" node to the SPL devicetree. The purpose is to allow configuring TZC regions when booting OP-TEE.

---
 arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 3 +++
 1 file changed, 3 insertions(+)