optee: upgrade to version 4.4.0.imx
Update to 4.4.0 version following 'lf-6.6.52_2.2.0' NXP release. This has not been released in meta-freescale yet, so reuse 4.2.0 recipes and apply the changes from meta-imx commit 900356ea1bf71854053266eec4b92adf4552624c. https://onedigi.atlassian.net/browse/DEL-9417 Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
This commit is contained in:
Gonzalo Ruiz
parent
18295f6df0
commit
b53810551e
|
|
@ -310,12 +310,12 @@ PREFERRED_VERSION_vulkan-tools:imxvulkan ??= "1.3.275.0.imx"
|
||||||
PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx"
|
PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx"
|
||||||
|
|
||||||
# Use i.MX optee Version
|
# Use i.MX optee Version
|
||||||
PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.2.0.imx"
|
PREFERRED_VERSION_optee-os:mx8-nxp-bsp ??= "4.4.0.imx"
|
||||||
PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.2.0.imx"
|
PREFERRED_VERSION_optee-os:mx9-nxp-bsp ??= "4.4.0.imx"
|
||||||
PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.2.0.imx"
|
PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "4.4.0.imx"
|
||||||
PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.2.0.imx"
|
PREFERRED_VERSION_optee-client:mx9-nxp-bsp ??= "4.4.0.imx"
|
||||||
PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.2.0.imx"
|
PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "4.4.0.imx"
|
||||||
PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.2.0.imx"
|
PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "4.4.0.imx"
|
||||||
|
|
||||||
# Optee runtime packages to install
|
# Optee runtime packages to install
|
||||||
OPTEE_PKGS ??= "optee-client optee-os"
|
OPTEE_PKGS ??= "optee-client optee-os"
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
# Copyright (C) 2025, Digi International Inc.
|
||||||
|
|
||||||
|
#
|
||||||
|
# Reuse meta-freescale's optee-client_4.2.0.imx.bb
|
||||||
|
#
|
||||||
|
require recipes-security/optee-imx/optee-client_4.2.0.imx.bb
|
||||||
|
|
||||||
|
SRCBRANCH = "lf-6.6.52_2.2.0"
|
||||||
|
SRCREV = "d221676a58b305bddbf97db00395205b3038de8e"
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
# Copyright (C) 2024, Digi International Inc.
|
# Copyright (C) 2024, 2025, Digi International Inc.
|
||||||
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
|
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
|
||||||
|
|
||||||
SRC_URI += "${@oe.utils.vartrue('TRUSTFENCE_FILE_BASED_ENCRYPT', 'file://tee-supplicant', '', d)}"
|
SRC_URI += "${@oe.utils.vartrue('TRUSTFENCE_FILE_BASED_ENCRYPT', 'file://tee-supplicant', '', d)}"
|
||||||
|
|
@ -0,0 +1,245 @@
|
||||||
|
From ef83625c9a5f50610e25aa860c4b9c5e64723a66 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Emekcan Aras <emekcan.aras@arm.com>
|
||||||
|
Date: Wed, 21 Dec 2022 10:55:58 +0000
|
||||||
|
Subject: [PATCH 1/4] core: Define section attributes for clang
|
||||||
|
|
||||||
|
Clang's attribute section is not same as gcc, here we need to add flags
|
||||||
|
to sections so they can be eventually collected by linker into final
|
||||||
|
output segments. Only way to do so with clang is to use
|
||||||
|
|
||||||
|
pragma clang section ...
|
||||||
|
|
||||||
|
The behavious is described here [1], this allows us to define names bss
|
||||||
|
sections. This was not an issue until clang-15 where LLD linker starts
|
||||||
|
to detect the section flags before merging them and throws the following
|
||||||
|
errors
|
||||||
|
|
||||||
|
| ld.lld: error: section type mismatch for .nozi.kdata_page
|
||||||
|
| >>> /mnt/b/yoe/master/build/tmp/work/qemuarm64-yoe-linux/optee-os-tadevkit/3.17.0-r0/build/core/arch/arm/kernel/thread.o:(.nozi.kdata_page): SHT_PROGBITS
|
||||||
|
| >>> output section .nozi: SHT_NOBITS
|
||||||
|
|
|
||||||
|
| ld.lld: error: section type mismatch for .nozi.mmu.l2
|
||||||
|
| >>> /mnt/b/yoe/master/build/tmp/work/qemuarm64-yoe-linux/optee-os-tadevkit/3.17.0-r0/build/core/arch/arm/mm/core_mmu_lpae.o:(.nozi.mmu.l2): SHT_PROGBITS
|
||||||
|
| >>> output section .nozi: SHT_NOBITS
|
||||||
|
|
||||||
|
These sections should be carrying SHT_NOBITS but so far it was not
|
||||||
|
possible to do so, this patch tries to use clangs pragma to get this
|
||||||
|
going and match the functionality with gcc.
|
||||||
|
|
||||||
|
[1] https://intel.github.io/llvm-docs/clang/LanguageExtensions.html#specifying-section-names-for-global-objects-pragma-clang-section
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
|
||||||
|
---
|
||||||
|
|
||||||
|
core/arch/arm/kernel/thread.c | 19 +++++++++++++++--
|
||||||
|
core/arch/arm/mm/core_mmu_lpae.c | 35 +++++++++++++++++++++++++++----
|
||||||
|
core/arch/arm/mm/core_mmu_v7.c | 36 +++++++++++++++++++++++++++++---
|
||||||
|
core/kernel/thread.c | 13 +++++++++++-
|
||||||
|
core/mm/pgt_cache.c | 12 ++++++++++-
|
||||||
|
5 files changed, 104 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/core/arch/arm/kernel/thread.c b/core/arch/arm/kernel/thread.c
|
||||||
|
index 66833b3a0..b3eb9cf9a 100644
|
||||||
|
--- a/core/arch/arm/kernel/thread.c
|
||||||
|
+++ b/core/arch/arm/kernel/thread.c
|
||||||
|
@@ -45,15 +45,30 @@ static size_t thread_user_kcode_size __nex_bss;
|
||||||
|
#if defined(CFG_CORE_UNMAP_CORE_AT_EL0) && \
|
||||||
|
defined(CFG_CORE_WORKAROUND_SPECTRE_BP_SEC) && defined(ARM64)
|
||||||
|
long thread_user_kdata_sp_offset __nex_bss;
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#ifndef CFG_VIRTUALIZATION
|
||||||
|
+#pragma clang section bss=".nozi.kdata_page"
|
||||||
|
+#else
|
||||||
|
+#pragma clang section bss=".nex_nozi.kdata_page"
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
static uint8_t thread_user_kdata_page[
|
||||||
|
ROUNDUP(sizeof(struct thread_core_local) * CFG_TEE_CORE_NB_CORE,
|
||||||
|
SMALL_PAGE_SIZE)]
|
||||||
|
__aligned(SMALL_PAGE_SIZE)
|
||||||
|
+#ifndef __clang__
|
||||||
|
#ifndef CFG_NS_VIRTUALIZATION
|
||||||
|
- __section(".nozi.kdata_page");
|
||||||
|
+ __section(".nozi.kdata_page")
|
||||||
|
#else
|
||||||
|
- __section(".nex_nozi.kdata_page");
|
||||||
|
+ __section(".nex_nozi.kdata_page")
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
+ ;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* reset BSS section to default ( .bss ) */
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=""
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef ARM32
|
||||||
|
diff --git a/core/arch/arm/mm/core_mmu_lpae.c b/core/arch/arm/mm/core_mmu_lpae.c
|
||||||
|
index 4c8b85e39..1885e1d3f 100644
|
||||||
|
--- a/core/arch/arm/mm/core_mmu_lpae.c
|
||||||
|
+++ b/core/arch/arm/mm/core_mmu_lpae.c
|
||||||
|
@@ -234,19 +234,46 @@ typedef uint16_t l1_idx_t;
|
||||||
|
typedef uint64_t base_xlat_tbls_t[CFG_TEE_CORE_NB_CORE][NUM_BASE_LEVEL_ENTRIES];
|
||||||
|
typedef uint64_t xlat_tbl_t[XLAT_TABLE_ENTRIES];
|
||||||
|
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=".nozi.mmu.base_table"
|
||||||
|
+#endif
|
||||||
|
static base_xlat_tbls_t base_xlation_table[NUM_BASE_TABLES]
|
||||||
|
__aligned(NUM_BASE_LEVEL_ENTRIES * XLAT_ENTRY_SIZE)
|
||||||
|
- __section(".nozi.mmu.base_table");
|
||||||
|
+#ifndef __clang__
|
||||||
|
+ __section(".nozi.mmu.base_table")
|
||||||
|
+#endif
|
||||||
|
+;
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=""
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=".nozi.mmu.l2"
|
||||||
|
+#endif
|
||||||
|
static xlat_tbl_t xlat_tables[MAX_XLAT_TABLES]
|
||||||
|
- __aligned(XLAT_TABLE_SIZE) __section(".nozi.mmu.l2");
|
||||||
|
+ __aligned(XLAT_TABLE_SIZE)
|
||||||
|
+#ifndef __clang__
|
||||||
|
+ __section(".nozi.mmu.l2")
|
||||||
|
+#endif
|
||||||
|
+;
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=""
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#define XLAT_TABLES_SIZE (sizeof(xlat_tbl_t) * MAX_XLAT_TABLES)
|
||||||
|
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=".nozi.mmu.l2"
|
||||||
|
+#endif
|
||||||
|
/* MMU L2 table for TAs, one for each thread */
|
||||||
|
static xlat_tbl_t xlat_tables_ul1[CFG_NUM_THREADS]
|
||||||
|
- __aligned(XLAT_TABLE_SIZE) __section(".nozi.mmu.l2");
|
||||||
|
-
|
||||||
|
+#ifndef __clang__
|
||||||
|
+ __aligned(XLAT_TABLE_SIZE) __section(".nozi.mmu.l2")
|
||||||
|
+#endif
|
||||||
|
+;
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=""
|
||||||
|
+#endif
|
||||||
|
/*
|
||||||
|
* TAs page table entry inside a level 1 page table.
|
||||||
|
*
|
||||||
|
diff --git a/core/arch/arm/mm/core_mmu_v7.c b/core/arch/arm/mm/core_mmu_v7.c
|
||||||
|
index 61e703da8..1960c08ca 100644
|
||||||
|
--- a/core/arch/arm/mm/core_mmu_v7.c
|
||||||
|
+++ b/core/arch/arm/mm/core_mmu_v7.c
|
||||||
|
@@ -204,16 +204,46 @@ typedef uint32_t l1_xlat_tbl_t[NUM_L1_ENTRIES];
|
||||||
|
typedef uint32_t l2_xlat_tbl_t[NUM_L2_ENTRIES];
|
||||||
|
typedef uint32_t ul1_xlat_tbl_t[NUM_UL1_ENTRIES];
|
||||||
|
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=".nozi.mmu.l1"
|
||||||
|
+#endif
|
||||||
|
static l1_xlat_tbl_t main_mmu_l1_ttb
|
||||||
|
- __aligned(L1_ALIGNMENT) __section(".nozi.mmu.l1");
|
||||||
|
+ __aligned(L1_ALIGNMENT)
|
||||||
|
+#ifndef __clang__
|
||||||
|
+ __section(".nozi.mmu.l1")
|
||||||
|
+#endif
|
||||||
|
+;
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=""
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* L2 MMU tables */
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=".nozi.mmu.l2"
|
||||||
|
+#endif
|
||||||
|
static l2_xlat_tbl_t main_mmu_l2_ttb[MAX_XLAT_TABLES]
|
||||||
|
- __aligned(L2_ALIGNMENT) __section(".nozi.mmu.l2");
|
||||||
|
+ __aligned(L2_ALIGNMENT)
|
||||||
|
+#ifndef __clang__
|
||||||
|
+ __section(".nozi.mmu.l2")
|
||||||
|
+#endif
|
||||||
|
+;
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=""
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* MMU L1 table for TAs, one for each thread */
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=".nozi.mmu.ul1"
|
||||||
|
+#endif
|
||||||
|
static ul1_xlat_tbl_t main_mmu_ul1_ttb[CFG_NUM_THREADS]
|
||||||
|
- __aligned(UL1_ALIGNMENT) __section(".nozi.mmu.ul1");
|
||||||
|
+ __aligned(UL1_ALIGNMENT)
|
||||||
|
+#ifndef __clang__
|
||||||
|
+ __section(".nozi.mmu.ul1")
|
||||||
|
+#endif
|
||||||
|
+;
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=""
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
struct mmu_partition {
|
||||||
|
l1_xlat_tbl_t *l1_table;
|
||||||
|
diff --git a/core/kernel/thread.c b/core/kernel/thread.c
|
||||||
|
index 2a1f22dce..5516b6771 100644
|
||||||
|
--- a/core/kernel/thread.c
|
||||||
|
+++ b/core/kernel/thread.c
|
||||||
|
@@ -39,13 +39,24 @@ static uint32_t end_canary_value = 0xababab00;
|
||||||
|
name[stack_num][sizeof(name[stack_num]) / sizeof(uint32_t) - 1]
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#define DO_PRAGMA(x) _Pragma (#x)
|
||||||
|
+
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#define DECLARE_STACK(name, num_stacks, stack_size, linkage) \
|
||||||
|
+DO_PRAGMA (clang section bss=".nozi_stack." #name) \
|
||||||
|
+linkage uint32_t name[num_stacks] \
|
||||||
|
+ [ROUNDUP(stack_size + STACK_CANARY_SIZE + STACK_CHECK_EXTRA, \
|
||||||
|
+ STACK_ALIGNMENT) / sizeof(uint32_t)] \
|
||||||
|
+ __attribute__((aligned(STACK_ALIGNMENT))); \
|
||||||
|
+DO_PRAGMA(clang section bss="")
|
||||||
|
+#else
|
||||||
|
#define DECLARE_STACK(name, num_stacks, stack_size, linkage) \
|
||||||
|
linkage uint32_t name[num_stacks] \
|
||||||
|
[ROUNDUP(stack_size + STACK_CANARY_SIZE + STACK_CHECK_EXTRA, \
|
||||||
|
STACK_ALIGNMENT) / sizeof(uint32_t)] \
|
||||||
|
__attribute__((section(".nozi_stack." # name), \
|
||||||
|
aligned(STACK_ALIGNMENT)))
|
||||||
|
-
|
||||||
|
+#endif
|
||||||
|
#define GET_STACK(stack) ((vaddr_t)(stack) + STACK_SIZE(stack))
|
||||||
|
|
||||||
|
DECLARE_STACK(stack_tmp, CFG_TEE_CORE_NB_CORE, STACK_TMP_SIZE,
|
||||||
|
diff --git a/core/mm/pgt_cache.c b/core/mm/pgt_cache.c
|
||||||
|
index 79553c6d2..b9efdf427 100644
|
||||||
|
--- a/core/mm/pgt_cache.c
|
||||||
|
+++ b/core/mm/pgt_cache.c
|
||||||
|
@@ -410,8 +410,18 @@ void pgt_init(void)
|
||||||
|
* has a large alignment, while .bss has a small alignment. The current
|
||||||
|
* link script is optimized for small alignment in .bss
|
||||||
|
*/
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=".nozi.mmu.l2"
|
||||||
|
+#endif
|
||||||
|
static uint8_t pgt_tables[PGT_CACHE_SIZE][PGT_SIZE]
|
||||||
|
- __aligned(PGT_SIZE) __section(".nozi.pgt_cache");
|
||||||
|
+ __aligned(PGT_SIZE)
|
||||||
|
+#ifndef __clang__
|
||||||
|
+ __section(".nozi.pgt_cache")
|
||||||
|
+#endif
|
||||||
|
+ ;
|
||||||
|
+#ifdef __clang__
|
||||||
|
+#pragma clang section bss=""
|
||||||
|
+#endif
|
||||||
|
size_t n;
|
||||||
|
|
||||||
|
for (n = 0; n < ARRAY_SIZE(pgt_tables); n++) {
|
||||||
|
--
|
||||||
|
2.43.2
|
||||||
|
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
From 2ba573c9763329fbfdfacc8393d565ab747cac4d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Brett Warren <brett.warren@arm.com>
|
||||||
|
Date: Wed, 23 Sep 2020 09:27:34 +0100
|
||||||
|
Subject: [PATCH 2/4] optee: enable clang support
|
||||||
|
|
||||||
|
When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used
|
||||||
|
to provide a sysroot wasn't included, which results in not locating
|
||||||
|
compiler-rt. This is mitigated by including the variable as ammended.
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
|
||||||
|
Signed-off-by: Brett Warren <brett.warren@arm.com>
|
||||||
|
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
|
||||||
|
---
|
||||||
|
|
||||||
|
mk/clang.mk | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/mk/clang.mk b/mk/clang.mk
|
||||||
|
index a045beee8..1ebe2f702 100644
|
||||||
|
--- a/mk/clang.mk
|
||||||
|
+++ b/mk/clang.mk
|
||||||
|
@@ -30,7 +30,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \
|
||||||
|
|
||||||
|
# Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of
|
||||||
|
# libgcc for clang
|
||||||
|
-libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
|
||||||
|
+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \
|
||||||
|
-rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null)
|
||||||
|
|
||||||
|
# Core ASLR relies on the executable being ready to run from its preferred load
|
||||||
|
--
|
||||||
|
2.43.2
|
||||||
|
|
||||||
|
|
@ -0,0 +1,133 @@
|
||||||
|
From 6f738803a59613ec4a683ddbc1747ebffd75a4e6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jerome Forissier <jerome.forissier@linaro.org>
|
||||||
|
Date: Tue, 23 Aug 2022 12:31:46 +0000
|
||||||
|
Subject: [PATCH 3/4] arm32: libutils, libutee, ta: add .note.GNU-stack section
|
||||||
|
to
|
||||||
|
|
||||||
|
.S files
|
||||||
|
|
||||||
|
When building for arm32 with GNU binutils 2.39, the linker outputs
|
||||||
|
warnings when linking Trusted Applications:
|
||||||
|
|
||||||
|
arm-unknown-linux-uclibcgnueabihf-ld.bfd: warning: utee_syscalls_a32.o: missing .note.GNU-stack section implies executable stack
|
||||||
|
arm-unknown-linux-uclibcgnueabihf-ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
|
||||||
|
|
||||||
|
We could silence the warning by adding the '-z execstack' option to the
|
||||||
|
TA link flags, like we did in the parent commit for the TEE core and
|
||||||
|
ldelf. Indeed, ldelf always allocates a non-executable piece of memory
|
||||||
|
for the TA to use as a stack.
|
||||||
|
|
||||||
|
However it seems preferable to comply with the common ELF practices in
|
||||||
|
this case. A better fix is therefore to add the missing .note.GNU-stack
|
||||||
|
sections in the assembler files.
|
||||||
|
|
||||||
|
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
|
||||||
|
|
||||||
|
Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
|
||||||
|
Upstream-Status: Backport [https://github.com/OP-TEE/optee_os/pull/5499]
|
||||||
|
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
|
||||||
|
---
|
||||||
|
|
||||||
|
lib/libutee/arch/arm/utee_syscalls_a32.S | 2 ++
|
||||||
|
lib/libutils/ext/arch/arm/atomic_a32.S | 2 ++
|
||||||
|
lib/libutils/ext/arch/arm/mcount_a32.S | 2 ++
|
||||||
|
lib/libutils/isoc/arch/arm/arm32_aeabi_divmod_a32.S | 2 ++
|
||||||
|
lib/libutils/isoc/arch/arm/arm32_aeabi_ldivmod_a32.S | 2 ++
|
||||||
|
lib/libutils/isoc/arch/arm/setjmp_a32.S | 2 ++
|
||||||
|
ta/arch/arm/ta_entry_a32.S | 2 ++
|
||||||
|
7 files changed, 14 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/lib/libutee/arch/arm/utee_syscalls_a32.S b/lib/libutee/arch/arm/utee_syscalls_a32.S
|
||||||
|
index 2dea83ab8..668b65a86 100644
|
||||||
|
--- a/lib/libutee/arch/arm/utee_syscalls_a32.S
|
||||||
|
+++ b/lib/libutee/arch/arm/utee_syscalls_a32.S
|
||||||
|
@@ -9,6 +9,8 @@
|
||||||
|
|
||||||
|
.section .note.GNU-stack,"",%progbits
|
||||||
|
|
||||||
|
+ .section .note.GNU-stack,"",%progbits
|
||||||
|
+
|
||||||
|
.section .text
|
||||||
|
.balign 4
|
||||||
|
.code 32
|
||||||
|
diff --git a/lib/libutils/ext/arch/arm/atomic_a32.S b/lib/libutils/ext/arch/arm/atomic_a32.S
|
||||||
|
index 2be73ffad..87ddf1065 100644
|
||||||
|
--- a/lib/libutils/ext/arch/arm/atomic_a32.S
|
||||||
|
+++ b/lib/libutils/ext/arch/arm/atomic_a32.S
|
||||||
|
@@ -7,6 +7,8 @@
|
||||||
|
|
||||||
|
.section .note.GNU-stack,"",%progbits
|
||||||
|
|
||||||
|
+ .section .note.GNU-stack,"",%progbits
|
||||||
|
+
|
||||||
|
/* uint32_t atomic_inc32(uint32_t *v); */
|
||||||
|
FUNC atomic_inc32 , :
|
||||||
|
ldrex r1, [r0]
|
||||||
|
diff --git a/lib/libutils/ext/arch/arm/mcount_a32.S b/lib/libutils/ext/arch/arm/mcount_a32.S
|
||||||
|
index 54dc3c02d..2f24632b8 100644
|
||||||
|
--- a/lib/libutils/ext/arch/arm/mcount_a32.S
|
||||||
|
+++ b/lib/libutils/ext/arch/arm/mcount_a32.S
|
||||||
|
@@ -9,6 +9,8 @@
|
||||||
|
|
||||||
|
.section .note.GNU-stack,"",%progbits
|
||||||
|
|
||||||
|
+ .section .note.GNU-stack,"",%progbits
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Convert return address to call site address by subtracting the size of the
|
||||||
|
* mcount call instruction (blx __gnu_mcount_nc).
|
||||||
|
diff --git a/lib/libutils/isoc/arch/arm/arm32_aeabi_divmod_a32.S b/lib/libutils/isoc/arch/arm/arm32_aeabi_divmod_a32.S
|
||||||
|
index 37ae9ec6f..bc6c48b1a 100644
|
||||||
|
--- a/lib/libutils/isoc/arch/arm/arm32_aeabi_divmod_a32.S
|
||||||
|
+++ b/lib/libutils/isoc/arch/arm/arm32_aeabi_divmod_a32.S
|
||||||
|
@@ -7,6 +7,8 @@
|
||||||
|
|
||||||
|
.section .note.GNU-stack,"",%progbits
|
||||||
|
|
||||||
|
+ .section .note.GNU-stack,"",%progbits
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* signed ret_idivmod_values(signed quot, signed rem);
|
||||||
|
* return quotient and remaining the EABI way (regs r0,r1)
|
||||||
|
diff --git a/lib/libutils/isoc/arch/arm/arm32_aeabi_ldivmod_a32.S b/lib/libutils/isoc/arch/arm/arm32_aeabi_ldivmod_a32.S
|
||||||
|
index 5c3353e2c..9fb5e0283 100644
|
||||||
|
--- a/lib/libutils/isoc/arch/arm/arm32_aeabi_ldivmod_a32.S
|
||||||
|
+++ b/lib/libutils/isoc/arch/arm/arm32_aeabi_ldivmod_a32.S
|
||||||
|
@@ -7,6 +7,8 @@
|
||||||
|
|
||||||
|
.section .note.GNU-stack,"",%progbits
|
||||||
|
|
||||||
|
+ .section .note.GNU-stack,"",%progbits
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* __value_in_regs lldiv_t __aeabi_ldivmod( long long n, long long d)
|
||||||
|
*/
|
||||||
|
diff --git a/lib/libutils/isoc/arch/arm/setjmp_a32.S b/lib/libutils/isoc/arch/arm/setjmp_a32.S
|
||||||
|
index f8a0b70df..37d7cb88e 100644
|
||||||
|
--- a/lib/libutils/isoc/arch/arm/setjmp_a32.S
|
||||||
|
+++ b/lib/libutils/isoc/arch/arm/setjmp_a32.S
|
||||||
|
@@ -53,6 +53,8 @@
|
||||||
|
|
||||||
|
.section .note.GNU-stack,"",%progbits
|
||||||
|
|
||||||
|
+ .section .note.GNU-stack,"",%progbits
|
||||||
|
+
|
||||||
|
/* Arm/Thumb interworking support:
|
||||||
|
|
||||||
|
The interworking scheme expects functions to use a BX instruction
|
||||||
|
diff --git a/ta/arch/arm/ta_entry_a32.S b/ta/arch/arm/ta_entry_a32.S
|
||||||
|
index cd9a12f9d..ccdc19928 100644
|
||||||
|
--- a/ta/arch/arm/ta_entry_a32.S
|
||||||
|
+++ b/ta/arch/arm/ta_entry_a32.S
|
||||||
|
@@ -7,6 +7,8 @@
|
||||||
|
|
||||||
|
.section .note.GNU-stack,"",%progbits
|
||||||
|
|
||||||
|
+ .section .note.GNU-stack,"",%progbits
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* This function is the bottom of the user call stack. Mark it as such so that
|
||||||
|
* the unwinding code won't try to go further down.
|
||||||
|
--
|
||||||
|
2.43.2
|
||||||
|
|
||||||
|
|
@ -0,0 +1,67 @@
|
||||||
|
From a63f82f74e015eb662242cdb51ef814e3f576829 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jerome Forissier <jerome.forissier@linaro.org>
|
||||||
|
Date: Fri, 5 Aug 2022 09:48:03 +0200
|
||||||
|
Subject: [PATCH 4/4] core: link: add --no-warn-rwx-segments
|
||||||
|
|
||||||
|
Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
|
||||||
|
Upstream-Status: Backport [https://github.com/OP-TEE/optee_os/pull/5474]
|
||||||
|
|
||||||
|
binutils ld.bfd generates one RWX LOAD segment by merging several sections
|
||||||
|
with mixed R/W/X attributes (.text, .rodata, .data). After version 2.38 it
|
||||||
|
also warns by default when that happens [1], which breaks the build due to
|
||||||
|
--fatal-warnings. The RWX segment is not a problem for the TEE core, since
|
||||||
|
that information is not used to set memory permissions. Therefore, silence
|
||||||
|
the warning.
|
||||||
|
|
||||||
|
Link: [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107
|
||||||
|
Link: https://sourceware.org/bugzilla/show_bug.cgi?id=29448
|
||||||
|
Reported-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
|
||||||
|
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
|
||||||
|
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
|
||||||
|
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
|
||||||
|
---
|
||||||
|
|
||||||
|
core/arch/arm/kernel/link.mk | 6 ++++--
|
||||||
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/core/arch/arm/kernel/link.mk b/core/arch/arm/kernel/link.mk
|
||||||
|
index 49e9f4fa1..9e1cc172f 100644
|
||||||
|
--- a/core/arch/arm/kernel/link.mk
|
||||||
|
+++ b/core/arch/arm/kernel/link.mk
|
||||||
|
@@ -37,6 +37,7 @@ link-ldflags += --sort-section=alignment
|
||||||
|
link-ldflags += --fatal-warnings
|
||||||
|
link-ldflags += --gc-sections
|
||||||
|
link-ldflags += $(link-ldflags-common)
|
||||||
|
+link-ldflags += $(call ld-option,--no-warn-rwx-segments)
|
||||||
|
|
||||||
|
link-ldadd = $(LDADD)
|
||||||
|
link-ldadd += $(ldflags-external)
|
||||||
|
@@ -61,6 +62,7 @@ link-script-cppflags := \
|
||||||
|
$(cppflagscore))
|
||||||
|
|
||||||
|
ldargs-all_objs := -T $(link-script-dummy) --no-check-sections \
|
||||||
|
+ $(call ld-option,--no-warn-rwx-segments) \
|
||||||
|
$(link-ldflags-common) \
|
||||||
|
$(link-objs) $(link-ldadd) $(libgcccore)
|
||||||
|
cleanfiles += $(link-out-dir)/all_objs.o
|
||||||
|
@@ -75,7 +77,7 @@ $(link-out-dir)/unpaged_entries.txt: $(link-out-dir)/all_objs.o
|
||||||
|
$(AWK) '/ ____keep_pager/ { printf "-u%s ", $$3 }' > $@
|
||||||
|
|
||||||
|
unpaged-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections \
|
||||||
|
- $(link-ldflags-common)
|
||||||
|
+ $(link-ldflags-common) $(call ld-option,--no-warn-rwx-segments)
|
||||||
|
unpaged-ldadd := $(objs) $(link-ldadd) $(libgcccore)
|
||||||
|
cleanfiles += $(link-out-dir)/unpaged.o
|
||||||
|
$(link-out-dir)/unpaged.o: $(link-out-dir)/unpaged_entries.txt
|
||||||
|
@@ -104,7 +106,7 @@ $(link-out-dir)/init_entries.txt: $(link-out-dir)/all_objs.o
|
||||||
|
$(AWK) '/ ____keep_init/ { printf "-u%s ", $$3 }' > $@
|
||||||
|
|
||||||
|
init-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections \
|
||||||
|
- $(link-ldflags-common)
|
||||||
|
+ $(link-ldflags-common) $(call ld-option,--no-warn-rwx-segments)
|
||||||
|
init-ldadd := $(link-objs-init) $(link-out-dir)/version.o $(link-ldadd) \
|
||||||
|
$(libgcccore)
|
||||||
|
cleanfiles += $(link-out-dir)/init.o
|
||||||
|
--
|
||||||
|
2.43.2
|
||||||
|
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
# Copyright (C) 2025, Digi International Inc.
|
||||||
|
|
||||||
|
#
|
||||||
|
# Reuse meta-freescale's optee-os_4.2.0.imx.bb
|
||||||
|
#
|
||||||
|
require recipes-security/optee-imx/optee-os_4.2.0.imx.bb
|
||||||
|
|
||||||
|
SRCBRANCH = "lf-6.6.52_2.2.0"
|
||||||
|
SRCREV = "60beb308810f9561a67fdb435388a64c85eb6dcb"
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
# Copyright (C) 2024, Digi International Inc.
|
# Copyright (C) 2024, 2025, Digi International Inc.
|
||||||
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
|
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
|
||||||
|
|
||||||
SRC_URI += "file://environment.d-optee-sdk.sh"
|
SRC_URI += "file://environment.d-optee-sdk.sh"
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
# Copyright (C) 2025, Digi International Inc.
|
||||||
|
|
||||||
|
#
|
||||||
|
# Reuse meta-freescale's optee-test_4.2.0.imx.bb
|
||||||
|
#
|
||||||
|
require recipes-security/optee-imx/optee-test_4.2.0.imx.bb
|
||||||
|
|
||||||
|
# The BSD and GPL license files are now included in the source
|
||||||
|
# https://github.com/OP-TEE/optee_test/commit/a748f5fcd9ec8a574dc86a5aa56d05bc6ac174e7
|
||||||
|
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560 \
|
||||||
|
file://LICENSE-BSD;md5=dca16d6efa93b55d0fd662ae5cd6feeb \
|
||||||
|
file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d"
|
||||||
|
|
||||||
|
SRCBRANCH = "lf-6.6.52_2.2.0"
|
||||||
|
SRCREV = "dafc98ed8364d7281a9a7f0788dd0a2067844a59"
|
||||||
Loading…
Reference in New Issue