mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-06-05 02:20:30 +00:00
arm-bsp/tc: upgrade version of optee
Signed-off-by: Davidson K <davidson.kumaresan@arm.com> Change-Id: Iacd32d18d5d2804e4050e4d1f8075efe0dd545fe Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Davidson K
Jon Mason
@@ -26,9 +26,9 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-arm64-ack"
|
||||
PREFERRED_VERSION_linux-arm64-ack ?= "5.10"
|
||||
|
||||
# OP-TEE
|
||||
PREFERRED_VERSION_optee-os ?= "3.14%"
|
||||
PREFERRED_VERSION_optee-client ?= "3.14%"
|
||||
PREFERRED_VERSION_optee-test ?= "3.14%"
|
||||
PREFERRED_VERSION_optee-os ?= "3.18%"
|
||||
PREFERRED_VERSION_optee-client ?= "3.18%"
|
||||
PREFERRED_VERSION_optee-test ?= "3.18%"
|
||||
|
||||
# Cannot use the default zImage on arm64
|
||||
KERNEL_IMAGETYPE = "Image"
|
||||
|
||||
+17
-19
@@ -1,7 +1,7 @@
|
||||
From 14b84786e85483bf3c737ef8b392204e307c0ff1 Mon Sep 17 00:00:00 2001
|
||||
From 34db1357ab3192f18629ceadf4ea33b948513fec Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Deprez <olivier.deprez@arm.com>
|
||||
Date: Mon, 16 Nov 2020 10:14:02 +0100
|
||||
Subject: [PATCH] WIP: Enable managed exit
|
||||
Subject: [PATCH 1/2] WIP: Enable managed exit
|
||||
|
||||
This change declares OP-TEE SP as supporting managed exit in response to
|
||||
a NS interrupt triggering while the SWd runs.
|
||||
@@ -27,14 +27,14 @@ Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
|
||||
core/arch/arm/kernel/boot.c | 12 ++++++++++++
|
||||
core/arch/arm/kernel/thread_a64.S | 11 ++++++++++-
|
||||
core/arch/arm/kernel/thread_spmc.c | 11 +++++++++++
|
||||
.../arm/plat-totalcompute/fdts/optee_sp_manifest.dts | 2 +-
|
||||
4 files changed, 34 insertions(+), 2 deletions(-)
|
||||
.../arm/plat-totalcompute/fdts/optee_sp_manifest.dts | 1 +
|
||||
4 files changed, 34 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/core/arch/arm/kernel/boot.c b/core/arch/arm/kernel/boot.c
|
||||
index 09c1b811..d130107f 100644
|
||||
index f173384d..466c042e 100644
|
||||
--- a/core/arch/arm/kernel/boot.c
|
||||
+++ b/core/arch/arm/kernel/boot.c
|
||||
@@ -1279,6 +1279,18 @@ static void init_secondary_helper(unsigned long nsec_entry)
|
||||
@@ -1350,6 +1350,18 @@ static void init_secondary_helper(unsigned long nsec_entry)
|
||||
init_vfp_sec();
|
||||
init_vfp_nsec();
|
||||
|
||||
@@ -54,10 +54,10 @@ index 09c1b811..d130107f 100644
|
||||
}
|
||||
|
||||
diff --git a/core/arch/arm/kernel/thread_a64.S b/core/arch/arm/kernel/thread_a64.S
|
||||
index 3e0f5115..63bf396a 100644
|
||||
index d6baee4d..1b0c8f37 100644
|
||||
--- a/core/arch/arm/kernel/thread_a64.S
|
||||
+++ b/core/arch/arm/kernel/thread_a64.S
|
||||
@@ -904,6 +904,14 @@ END_FUNC el0_sync_abort
|
||||
@@ -1087,6 +1087,14 @@ END_FUNC el0_sync_abort
|
||||
bl dcache_op_louis
|
||||
ic iallu
|
||||
#endif
|
||||
@@ -72,7 +72,7 @@ index 3e0f5115..63bf396a 100644
|
||||
/*
|
||||
* Mark current thread as suspended
|
||||
*/
|
||||
@@ -1021,8 +1029,9 @@ LOCAL_FUNC elx_irq , :
|
||||
@@ -1204,8 +1212,9 @@ LOCAL_FUNC elx_irq , :
|
||||
#endif
|
||||
END_FUNC elx_irq
|
||||
|
||||
@@ -84,10 +84,10 @@ index 3e0f5115..63bf396a 100644
|
||||
#else
|
||||
native_intr_handler fiq
|
||||
diff --git a/core/arch/arm/kernel/thread_spmc.c b/core/arch/arm/kernel/thread_spmc.c
|
||||
index bd7930e7..89ff82bc 100644
|
||||
index ea9e8f03..15577e7e 100644
|
||||
--- a/core/arch/arm/kernel/thread_spmc.c
|
||||
+++ b/core/arch/arm/kernel/thread_spmc.c
|
||||
@@ -1394,6 +1394,17 @@ static TEE_Result spmc_init(void)
|
||||
@@ -1518,6 +1518,17 @@ static TEE_Result spmc_init(void)
|
||||
my_endpoint_id = spmc_get_id();
|
||||
DMSG("My endpoint ID %#x", my_endpoint_id);
|
||||
|
||||
@@ -104,21 +104,19 @@ index bd7930e7..89ff82bc 100644
|
||||
+
|
||||
return TEE_SUCCESS;
|
||||
}
|
||||
#endif /*CFG_CORE_SEL2_SPMC*/
|
||||
#endif /* !defined(CFG_CORE_SEL1_SPMC) */
|
||||
diff --git a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
|
||||
index 4b8b3681..04847c4d 100644
|
||||
index 0bfe33f3..00cfa5b2 100644
|
||||
--- a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
|
||||
+++ b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
|
||||
@@ -23,7 +23,8 @@
|
||||
entrypoint-offset = <0x1000>;
|
||||
@@ -24,6 +24,7 @@
|
||||
xlat-granule = <0>; /* 4KiB */
|
||||
boot-order = <0>;
|
||||
- messaging-method = <0>; /* Direct messaging only */
|
||||
+ messaging-method = <3>; /* Direct request/response supported */
|
||||
messaging-method = <0x3>; /* Direct request/response supported */
|
||||
+ managed-exit; /* Managed exit supported */
|
||||
|
||||
|
||||
device-regions {
|
||||
compatible = "arm,ffa-manifest-device-regions";
|
||||
--
|
||||
2.29.2
|
||||
2.34.1
|
||||
|
||||
|
||||
-29
@@ -1,29 +0,0 @@
|
||||
From 3a240f6b6c58d70471fd0752b8854c43c7c4df72 Mon Sep 17 00:00:00 2001
|
||||
From: Usama Arif <usama.arif@arm.com>
|
||||
Date: Wed, 11 Aug 2021 11:00:52 +0100
|
||||
Subject: [PATCH 2/2] ffa: Update function ID according to FFA v1.1 spec
|
||||
|
||||
This updates function ID FFA_SECONDARY_EP_REGISTER_64.
|
||||
|
||||
Upstream-Status: Pending [Not submitted to upstream yet]
|
||||
Signed-off-by: Usama Arif <usama.arif@arm.com>
|
||||
---
|
||||
core/arch/arm/include/ffa.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/core/arch/arm/include/ffa.h b/core/arch/arm/include/ffa.h
|
||||
index 20a009ca..b0d68173 100644
|
||||
--- a/core/arch/arm/include/ffa.h
|
||||
+++ b/core/arch/arm/include/ffa.h
|
||||
@@ -69,7 +69,7 @@
|
||||
#define FFA_MEM_RECLAIM U(0x84000077)
|
||||
#define FFA_MEM_FRAG_RX U(0x8400007A)
|
||||
#define FFA_MEM_FRAG_TX U(0x8400007B)
|
||||
-#define FFA_SECONDARY_EP_REGISTER_64 U(0xC4000084)
|
||||
+#define FFA_SECONDARY_EP_REGISTER_64 U(0xC4000087)
|
||||
|
||||
/* Special value for traffic targeted to the Hypervisor or SPM */
|
||||
#define FFA_TARGET_INFO_MBZ U(0x0)
|
||||
--
|
||||
2.17.1
|
||||
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
From 35dba075593cb32c62b881e7763fcf0ea37908f7 Mon Sep 17 00:00:00 2001
|
||||
From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
|
||||
Date: Mon, 23 May 2022 11:32:41 +0100
|
||||
Subject: [PATCH 2/2] plat-totalcompute: fix TZDRAM start and size
|
||||
|
||||
- Fix TZDRAM_SIZE in TC platform
|
||||
- For CFG_CORE_SEL2_SPMC, manifest size is increased from 0x1000 to
|
||||
0x4000 for boot protocol support.
|
||||
|
||||
Upstream-Status: Pending [Not submitted to upstream yet]
|
||||
|
||||
Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
|
||||
Change-Id: Iff19c498e9edae961f469604d69419c1a32145f5
|
||||
---
|
||||
core/arch/arm/plat-totalcompute/conf.mk | 5 +++--
|
||||
core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts | 2 +-
|
||||
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/core/arch/arm/plat-totalcompute/conf.mk b/core/arch/arm/plat-totalcompute/conf.mk
|
||||
index b39ac0f0..2f6c0ee1 100644
|
||||
--- a/core/arch/arm/plat-totalcompute/conf.mk
|
||||
+++ b/core/arch/arm/plat-totalcompute/conf.mk
|
||||
@@ -32,8 +32,9 @@ ifeq ($(CFG_CORE_SEL1_SPMC),y)
|
||||
CFG_TZDRAM_START ?= 0xfd000000
|
||||
CFG_TZDRAM_SIZE ?= 0x02000000
|
||||
else ifeq ($(CFG_CORE_SEL2_SPMC),y)
|
||||
-CFG_TZDRAM_START ?= 0xfd281000
|
||||
-CFG_TZDRAM_SIZE ?= 0x01d7f000
|
||||
+CFG_TZDRAM_START ?= 0xfd284000
|
||||
+# TZDRAM size 0x1980000 - 0x4000 manifest size
|
||||
+CFG_TZDRAM_SIZE ?= 0x0197c000
|
||||
else
|
||||
CFG_TZDRAM_START ?= 0xff000000
|
||||
CFG_TZDRAM_SIZE ?= 0x01000000
|
||||
diff --git a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
|
||||
index 00cfa5b2..56e69f37 100644
|
||||
--- a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
|
||||
+++ b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
|
||||
@@ -20,7 +20,7 @@
|
||||
exception-level = <2>; /* S-EL1 */
|
||||
execution-state = <0>; /* AARCH64 */
|
||||
load-address = <0xfd280000>;
|
||||
- entrypoint-offset = <0x1000>;
|
||||
+ entrypoint-offset = <0x4000>;
|
||||
xlat-granule = <0>; /* 4KiB */
|
||||
boot-order = <0>;
|
||||
messaging-method = <0x3>; /* Direct request/response supported */
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
From 37fd6f3c18015bcad2c099bf9269e72140e55557 Mon Sep 17 00:00:00 2001
|
||||
From: Davidson K <davidson.kumaresan@arm.com>
|
||||
Date: Wed, 12 Jan 2022 17:14:03 +0530
|
||||
Subject: [PATCH] Fix optee UUID
|
||||
|
||||
Upstream-Status: Backport [https://github.com/OP-TEE/optee_os/commit/a9a8e483b6ff7f6e40c5ed95310a18e0bd1993c3#diff-2a310f8cc43d961b2efc05ac1619521653ba8977ff5e6dc5bb89754fd60fe954]
|
||||
Signed-off-by: Davidson K <davidson.kumaresan@arm.com>
|
||||
---
|
||||
core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
|
||||
index 04847c4d..3b76fc7d 100644
|
||||
--- a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
|
||||
+++ b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts
|
||||
@@ -14,7 +14,7 @@
|
||||
/* Properties */
|
||||
description = "op-tee";
|
||||
ffa-version = <0x00010000>; /* 31:16 - Major, 15:0 - Minor */
|
||||
- uuid = <0x486178e0 0xe7f811e3 0xbc5e0002 0xa5d5c51b>;
|
||||
+ uuid = <0xe0786148 0xe311f8e7 0x02005ebc 0x1bc5d5a5>;
|
||||
id = <1>;
|
||||
execution-ctx-count = <8>;
|
||||
exception-level = <2>; /* S-EL1 */
|
||||
--
|
||||
2.17.1
|
||||
|
||||
-60
@@ -1,60 +0,0 @@
|
||||
From 7fb6d720a285b6135a9247b2adde833ea90e2549 Mon Sep 17 00:00:00 2001
|
||||
From: Usama Arif <usama.arif@arm.com>
|
||||
Date: Mon, 27 Sep 2021 19:58:56 +0100
|
||||
Subject: [PATCH] plat-totalcompute: add support for higher DRAM
|
||||
|
||||
The new 6GB DRAM bank starts at 0x8080000000.
|
||||
|
||||
Signed-off-by: Usama Arif <usama.arif@arm.com>
|
||||
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
|
||||
|
||||
Upstream-Status: Backport [https://github.com/OP-TEE/optee_os/commit/6d8430f943e091282849b188fbc0847c159e5de4]
|
||||
Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
|
||||
---
|
||||
core/arch/arm/plat-totalcompute/conf.mk | 2 ++
|
||||
core/arch/arm/plat-totalcompute/main.c | 1 +
|
||||
core/arch/arm/plat-totalcompute/platform_config.h | 3 +++
|
||||
3 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/core/arch/arm/plat-totalcompute/conf.mk b/core/arch/arm/plat-totalcompute/conf.mk
|
||||
index 558b7889..e894b1e1 100644
|
||||
--- a/core/arch/arm/plat-totalcompute/conf.mk
|
||||
+++ b/core/arch/arm/plat-totalcompute/conf.mk
|
||||
@@ -24,6 +24,8 @@ platform-cflags-debug-info = -gdwarf-2
|
||||
platform-aflags-debug-info = -gdwarf-2
|
||||
endif
|
||||
|
||||
+$(call force,CFG_CORE_ARM64_PA_BITS,40)
|
||||
+
|
||||
ifneq (,$(filter ${PLATFORM_FLAVOR},tc0 tc1))
|
||||
CFG_TEE_CORE_NB_CORE = 8
|
||||
|
||||
diff --git a/core/arch/arm/plat-totalcompute/main.c b/core/arch/arm/plat-totalcompute/main.c
|
||||
index 42acf8dd..eab237bf 100644
|
||||
--- a/core/arch/arm/plat-totalcompute/main.c
|
||||
+++ b/core/arch/arm/plat-totalcompute/main.c
|
||||
@@ -27,6 +27,7 @@ register_phys_mem_pgdir(MEM_AREA_IO_SEC, GICD_BASE, GIC_DIST_REG_SIZE);
|
||||
#endif
|
||||
|
||||
register_ddr(DRAM0_BASE, DRAM0_SIZE);
|
||||
+register_ddr(DRAM1_BASE, DRAM1_SIZE);
|
||||
|
||||
#ifndef CFG_CORE_SEL2_SPMC
|
||||
void main_init_gic(void)
|
||||
diff --git a/core/arch/arm/plat-totalcompute/platform_config.h b/core/arch/arm/plat-totalcompute/platform_config.h
|
||||
index 4255abca..b474a899 100644
|
||||
--- a/core/arch/arm/plat-totalcompute/platform_config.h
|
||||
+++ b/core/arch/arm/plat-totalcompute/platform_config.h
|
||||
@@ -26,6 +26,9 @@
|
||||
#define DRAM0_BASE 0x80000000
|
||||
#define DRAM0_SIZE 0x7d000000
|
||||
|
||||
+#define DRAM1_BASE 0x8080000000ULL
|
||||
+#define DRAM1_SIZE 0x180000000ULL
|
||||
+
|
||||
#define TZCDRAM_BASE 0xff000000
|
||||
#define TZCDRAM_SIZE 0x01000000
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -1,17 +1,10 @@
|
||||
# Total Compute (tc) specific configuration for optee-os and optee-os-tadevkit
|
||||
|
||||
# Intermediate SHA with 3.14 baseline version
|
||||
# This has TC0 and TC1 platform support
|
||||
SRCREV = "e4f34e786135079160697d88212591105a65fbce"
|
||||
PV = "3.14.0+git${SRCPV}"
|
||||
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/tc:"
|
||||
SRC_URI:append:tc = " \
|
||||
file://sp_layout.json \
|
||||
file://0001-WIP-Enable-managed-exit.patch \
|
||||
file://0002-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch \
|
||||
file://0003-Fix-optee-UUID.patch \
|
||||
file://0004-plat-totalcompute-add-support-for-higher-DRAM.patch \
|
||||
file://0002-plat-totalcompute-fix-TZDRAM-start-and-size.patch \
|
||||
"
|
||||
|
||||
COMPATIBLE_MACHINE = "(tc?)"
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
# Machine specific configurations
|
||||
|
||||
MACHINE_OPTEE_OS_TADEVKIT_REQUIRE ?= ""
|
||||
MACHINE_OPTEE_OS_TADEVKIT_REQUIRE:tc = "optee-os-generic-tc.inc"
|
||||
|
||||
require ${MACHINE_OPTEE_OS_TADEVKIT_REQUIRE}
|
||||
@@ -2,5 +2,6 @@
|
||||
|
||||
MACHINE_OPTEE_OS_REQUIRE ?= ""
|
||||
MACHINE_OPTEE_OS_REQUIRE:n1sdp = "optee-os-n1sdp.inc"
|
||||
MACHINE_OPTEE_OS_REQUIRE:tc = "optee-os-tc.inc"
|
||||
|
||||
require ${MACHINE_OPTEE_OS_REQUIRE}
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
# Machine specific configurations
|
||||
|
||||
MACHINE_OPTEE_TEST_REQUIRE ?= ""
|
||||
MACHINE_OPTEE_TEST_REQUIRE:tc = "optee-test-tc.inc"
|
||||
|
||||
require ${MACHINE_OPTEE_TEST_REQUIRE}
|
||||
Reference in New Issue
Block a user