From 447b7059c97dd0655464f807418427b0ab806360 Mon Sep 17 00:00:00 2001 From: Ben Horgan Date: Fri, 14 Jan 2022 09:11:48 +0000 Subject: [PATCH] arm-bsp/optee-os: total-compute: Exchange patches to fix managed-exit Signed-off-by: Ben Horgan Change-Id: I1e47c7b87450258840c68e045194e07e66b35478 --- ...e-Specify-managed-exit-in-the-partit.patch | 29 +++++++++++++++++++ ...e-Update-messaging-method-for-manage.patch | 27 ----------------- .../optee/optee-os-generic-tc.inc | 2 +- 3 files changed, 30 insertions(+), 28 deletions(-) create mode 100644 meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-plat-totalcompute-Specify-managed-exit-in-the-partit.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0002-plat-totalcompute-Update-messaging-method-for-manage.patch diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-plat-totalcompute-Specify-managed-exit-in-the-partit.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-plat-totalcompute-Specify-managed-exit-in-the-partit.patch new file mode 100644 index 00000000..ff16e793 --- /dev/null +++ b/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-plat-totalcompute-Specify-managed-exit-in-the-partit.patch @@ -0,0 +1,29 @@ +From c68ac212ec130811662bb60344793b1442be7d34 Mon Sep 17 00:00:00 2001 +From: Ben Horgan +Date: Thu, 16 Dec 2021 14:48:08 +0000 +Subject: [PATCH] plat-totalcompute: Specify managed-exit in the partition + manifest + +Upstream-Status: Not suitable (Update to 0001-WIP-Enable-managed-exit.patch) +Signed-off-by: Ben Horgan +--- + core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts | 3 ++- + 1 file changed, 2 insertions(+), 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..1bb4cea8 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>; + xlat-granule = <0>; /* 4KiB */ + boot-order = <0>; +- messaging-method = <3>; /* Direct messaging and managed exit supported */ ++ messaging-method = <3>; /* Direct request/response supported */ ++ managed-exit; /* Managed exit supported */ + + device-regions { + compatible = "arm,ffa-manifest-device-regions"; +-- +2.17.1 + diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0002-plat-totalcompute-Update-messaging-method-for-manage.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0002-plat-totalcompute-Update-messaging-method-for-manage.patch deleted file mode 100644 index 7439927e..00000000 --- a/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0002-plat-totalcompute-Update-messaging-method-for-manage.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 31b4fb3fd52408d53ba5fd934f1506b01cda2e7a Mon Sep 17 00:00:00 2001 -From: Usama Arif -Date: Wed, 11 Aug 2021 11:51:38 +0100 -Subject: [PATCH] plat-totalcompute: Update messaging-method for managed exit - -Upstream-Status: Pending [Not submitted to upstream yet] -Signed-off-by: Usama Arif ---- - 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..2fb07862 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,7 @@ - entrypoint-offset = <0x1000>; - xlat-granule = <0>; /* 4KiB */ - boot-order = <0>; -- messaging-method = <3>; /* Direct messaging and managed exit supported */ -+ messaging-method = <11>; /* Direct messaging and managed exit supported */ - - device-regions { - compatible = "arm,ffa-manifest-device-regions"; --- -2.17.1 - diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc b/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc index da6a06f3..644af421 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc +++ b/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc @@ -9,8 +9,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/tc:" SRC_URI:append:tc = " \ file://sp_layout.json \ file://0001-WIP-Enable-managed-exit.patch \ - file://0002-plat-totalcompute-Update-messaging-method-for-manage.patch \ file://0003-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch \ + file://0001-plat-totalcompute-Specify-managed-exit-in-the-partit.patch \ " COMPATIBLE_MACHINE = "(tc?)"