mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-30 12:30:14 +00:00
Code Issues Projects Releases Wiki Activity

arm-bsp/optee-os: N1SDP upgrade optee-os to 3.22

Browse Source 
Upgrade optee-os version for N1SDP platform
to 3.22

Signed-off-by: Mariam Elshakfy <mariam.elshakfy@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Mariam Elshakfy
2023-09-12 08:34:58 +01:00
committed by Jon Mason
parent 2d809a7c35
commit e828f3633f
5 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/conf/machine/n1sdp.conf
+1 -1
View File
@@ -32,7 +32,7 @@ EXTRA_IMAGEDEPENDS += "edk2-firmware"
PREFERRED_VERSION_edk2-firmware ?= "202305" PREFERRED_VERSION_edk2-firmware ?= "202305"
#optee #optee
PREFERRED_VERSION_optee-os ?= "3.20.%" PREFERRED_VERSION_optee-os ?= "3.22.%"
#grub-efi #grub-efi
EFI_PROVIDER ?= "grub-efi" EFI_PROVIDER ?= "grub-efi"
meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0002-plat-n1sdp-add-N1SDP-platform-support.patch
+9 -19
View File
@@ -1,14 +1,15 @@
Upstream-Status: Pending [Not submitted to upstream yet] From 33d86d23bcf2bbcb191e33e3130c3429650b9204 Mon Sep 17 00:00:00 2001
Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
From 22ba7c7789082dbc179921962cdcadece4499c89 Mon Sep 17 00:00:00 2001
From: Vishnu Banavath <vishnu.banavath@arm.com> From: Vishnu Banavath <vishnu.banavath@arm.com>
Date: Thu, 30 Jun 2022 18:36:26 +0100 Date: Thu, 30 Jun 2022 18:36:26 +0100
Subject: [PATCH] plat-n1sdp: add N1SDP platform support Subject: [PATCH] plat-n1sdp: add N1SDP platform support
Upstream-Status: Pending [Not submitted to upstream yet]
Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
These changes are to add N1SDP platform to optee-os These changes are to add N1SDP platform to optee-os
Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
Signed-off-by: Mariam Elshakfy <mariam.elshakfy@arm.com>
diff --git a/core/arch/arm/plat-n1sdp/conf.mk b/core/arch/arm/plat-n1sdp/conf.mk diff --git a/core/arch/arm/plat-n1sdp/conf.mk b/core/arch/arm/plat-n1sdp/conf.mk
new file mode 100644 new file mode 100644
@@ -59,10 +60,10 @@ index 00000000..06b4975a
+$(call force,CFG_CORE_ARM64_PA_BITS,36) +$(call force,CFG_CORE_ARM64_PA_BITS,36)
diff --git a/core/arch/arm/plat-n1sdp/main.c b/core/arch/arm/plat-n1sdp/main.c diff --git a/core/arch/arm/plat-n1sdp/main.c b/core/arch/arm/plat-n1sdp/main.c
new file mode 100644 new file mode 100644
index 00000000..cfb7f19b index 00000000..39360711
--- /dev/null --- /dev/null
+++ b/core/arch/arm/plat-n1sdp/main.c +++ b/core/arch/arm/plat-n1sdp/main.c
@@ -0,0 +1,63 @@ @@ -0,0 +1,53 @@
+// SPDX-License-Identifier: BSD-2-Clause +// SPDX-License-Identifier: BSD-2-Clause
+/* +/*
+ * Copyright (c) 2022, Arm Limited. + * Copyright (c) 2022, Arm Limited.
@@ -72,8 +73,6 @@ index 00000000..cfb7f19b
+#include <console.h> +#include <console.h>
+#include <drivers/gic.h> +#include <drivers/gic.h>
+#include <drivers/pl011.h> +#include <drivers/pl011.h>
+#include <drivers/tpm2_mmio.h>
+#include <drivers/tpm2_ptp_fifo.h>
+#include <drivers/tzc400.h> +#include <drivers/tzc400.h>
+#include <initcall.h> +#include <initcall.h>
+#include <keep.h> +#include <keep.h>
@@ -92,7 +91,6 @@ index 00000000..cfb7f19b
+#include <string.h> +#include <string.h>
+#include <trace.h> +#include <trace.h>
+ +
+static struct gic_data gic_data __nex_bss;
+static struct pl011_data console_data __nex_bss; +static struct pl011_data console_data __nex_bss;
+ +
+register_phys_mem_pgdir(MEM_AREA_IO_SEC, CONSOLE_UART_BASE, PL011_REG_SIZE); +register_phys_mem_pgdir(MEM_AREA_IO_SEC, CONSOLE_UART_BASE, PL011_REG_SIZE);
@@ -105,19 +103,12 @@ index 00000000..cfb7f19b
+ +
+void main_init_gic(void) +void main_init_gic(void)
+{ +{
+ gic_init_base_addr(&gic_data, GICC_BASE, + gic_init(GICC_BASE, GICD_BASE);
+ GICD_BASE);
+ itr_init(&gic_data.chip);
+} +}
+ +
+void main_secondary_init_gic(void) +void main_secondary_init_gic(void)
+{ +{
+ gic_cpu_init(&gic_data); + gic_cpu_init();
+}
+
+void itr_core_handler(void)
+{
+ gic_it_handle(&gic_data);
+} +}
+ +
+void console_init(void) +void console_init(void)
@@ -230,4 +221,3 @@ index 00000000..a0b49da1
+srcs-y += n1sdp_core_pos.S +srcs-y += n1sdp_core_pos.S
-- --
2.17.1 2.17.1
meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch
+3 -3
View File
@@ -14,19 +14,19 @@ diff --git a/core/arch/arm/kernel/spmc_sp_handler.c b/core/arch/arm/kernel/spmc_
index e0fa0aa6..c7a45387 100644 index e0fa0aa6..c7a45387 100644
--- a/core/arch/arm/kernel/spmc_sp_handler.c --- a/core/arch/arm/kernel/spmc_sp_handler.c
+++ b/core/arch/arm/kernel/spmc_sp_handler.c +++ b/core/arch/arm/kernel/spmc_sp_handler.c
@@ -1132,6 +1132,12 @@ void spmc_sp_msg_handler(struct thread_smc_args *args, @@ -1277,6 +1277,13 @@ void spmc_sp_msg_handler(struct thread_smc_args *args,
handle_mem_perm_set(args, caller_sp);
sp_enter(args, caller_sp); sp_enter(args, caller_sp);
break; break;
+ case 0xdeadbeef: + case 0xdeadbeef:
+ ts_push_current_session(&caller_sp->ts_sess); + ts_push_current_session(&caller_sp->ts_sess);
+ IMSG("%s", (char *)args->a1); + IMSG("%s", (char *)args->a1);
+ ts_pop_current_session(); + ts_pop_current_session();
+ sp_enter(args, caller_sp); + sp_enter(args, caller_sp);
+ break; + break;
+
default: default:
EMSG("Unhandled FFA function ID %#"PRIx32, EMSG("Unhandled FFA function ID %#"PRIx32,
(uint32_t)args->a0); (uint32_t)args->a0);
-- --
2.17.1 2.17.1
meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend
-1
View File
@@ -1,7 +1,6 @@
# Machine specific configurations # Machine specific configurations
MACHINE_OPTEE_OS_REQUIRE ?= "" MACHINE_OPTEE_OS_REQUIRE ?= ""
MACHINE_OPTEE_OS_REQUIRE:n1sdp = "optee-os-n1sdp.inc"
MACHINE_OPTEE_OS_REQUIRE:tc = "optee-os-tc.inc" MACHINE_OPTEE_OS_REQUIRE:tc = "optee-os-tc.inc"
require ${MACHINE_OPTEE_OS_REQUIRE} require ${MACHINE_OPTEE_OS_REQUIRE}
meta-arm-bsp/recipes-security/optee/optee-os_3.22.0.bbappend
+1
View File
@@ -2,5 +2,6 @@
MACHINE_OPTEE_OS_REQUIRE ?= "" MACHINE_OPTEE_OS_REQUIRE ?= ""
MACHINE_OPTEE_OS_REQUIRE:corstone1000 = "optee-os-corstone1000-common.inc" MACHINE_OPTEE_OS_REQUIRE:corstone1000 = "optee-os-corstone1000-common.inc"
MACHINE_OPTEE_OS_REQUIRE:n1sdp = "optee-os-n1sdp.inc"
require ${MACHINE_OPTEE_OS_REQUIRE} require ${MACHINE_OPTEE_OS_REQUIRE}