From b3c60cd3fa274e7829aefbedb6db8a1cb9c8f9e6 Mon Sep 17 00:00:00 2001 From: Xueliang Zhong Date: Fri, 31 Mar 2023 19:14:34 +0000 Subject: [PATCH] arm-bsp/optee-os: N1SDP support for optee-os 3.20 This patch adds optee-os 3.20 support on N1SDP, the optee-os 3.20 bbappend file is also added. Signed-off-by: Xueliang Zhong Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/n1sdp.conf | 2 +- .../files/optee-os/n1sdp/0004-Handle-logging-syscall.patch | 4 ++-- meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend | 1 - meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf index 0e047e8d..ef90c639 100644 --- a/meta-arm-bsp/conf/machine/n1sdp.conf +++ b/meta-arm-bsp/conf/machine/n1sdp.conf @@ -31,7 +31,7 @@ EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" EXTRA_IMAGEDEPENDS += "edk2-firmware" #optee -PREFERRED_VERSION_optee-os ?= "3.18.%" +PREFERRED_VERSION_optee-os ?= "3.20.%" #grub-efi EFI_PROVIDER ?= "grub-efi" diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch index 356be9e0..67d98725 100644 --- a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch +++ b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch @@ -15,8 +15,8 @@ diff --git a/core/arch/arm/kernel/spmc_sp_handler.c b/core/arch/arm/kernel/spmc_ index e0fa0aa6..c7a45387 100644 --- a/core/arch/arm/kernel/spmc_sp_handler.c +++ b/core/arch/arm/kernel/spmc_sp_handler.c -@@ -1004,6 +1004,12 @@ void spmc_sp_msg_handler(struct thread_smc_args *args, - ffa_mem_reclaim(args, caller_sp); +@@ -1132,6 +1132,12 @@ void spmc_sp_msg_handler(struct thread_smc_args *args, + handle_mem_perm_set(args, caller_sp); sp_enter(args, caller_sp); break; + case 0xdeadbeef: diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend index bc933dd5..e276fb86 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend +++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend @@ -1,7 +1,6 @@ # Machine specific configurations 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} diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend index e732c80f..b5493e5e 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend +++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend @@ -2,5 +2,6 @@ MACHINE_OPTEE_OS_REQUIRE ?= "" MACHINE_OPTEE_OS_REQUIRE:corstone1000 = "optee-os-corstone1000-common.inc" +MACHINE_OPTEE_OS_REQUIRE:n1sdp = "optee-os-n1sdp.inc" require ${MACHINE_OPTEE_OS_REQUIRE}