From 12711d573479519dbabac2452aa132a95d5d7d10 Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Tue, 30 Apr 2024 16:46:52 +0100 Subject: [PATCH] arm-bsp: corstone1000: Enable SMM gateway authenticated variables This change enables the SMM gateway authenticated variables feature implementation for Corstone1000 Signed-off-by: Harsimran Singh Tungal Signed-off-by: Jon Mason --- .../0002-increase-tzdram-size.patch | 28 +++++++++++++++++++ .../optee/optee-os-corstone1000-common.inc | 1 + .../ts-sp-smm-gateway_%.bbappend | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0002-increase-tzdram-size.patch diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0002-increase-tzdram-size.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0002-increase-tzdram-size.patch new file mode 100644 index 00000000..c499a163 --- /dev/null +++ b/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0002-increase-tzdram-size.patch @@ -0,0 +1,28 @@ +From 1410d9e9c3e73b1319b98be67ad00c7630c4cb2e Mon Sep 17 00:00:00 2001 +From: Emekcan Aras +Date: Wed, 3 Apr 2024 16:05:07 +0100 +Subject: [PATCH] increase tzdram size + +Upstream-Status: Pending +Signed-off-by: Emekcan Aras +Signed-off-by: Harsimran Singh Tungal +--- + core/arch/arm/plat-corstone1000/conf.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/arch/arm/plat-corstone1000/conf.mk b/core/arch/arm/plat-corstone1000/conf.mk +index 98347b143..c2dd71f05 100644 +--- a/core/arch/arm/plat-corstone1000/conf.mk ++++ b/core/arch/arm/plat-corstone1000/conf.mk +@@ -34,7 +34,7 @@ CFG_TEE_CORE_NB_CORE ?= 1 + CFG_TZDRAM_START ?= 0x02002000 + + # TEE_RAM (OPTEE kernel + DATA) + TA_RAM = 3MB +-CFG_TZDRAM_SIZE ?= 0x300000 ++CFG_TZDRAM_SIZE ?= 0x340000 + CFG_SHMEM_START ?= 0x86000000 + CFG_SHMEM_SIZE ?= 0x00200000 + +-- +2.25.1 + diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc index a883c345..260abc05 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc +++ b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc @@ -1,6 +1,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/corstone1000:" SRC_URI:append = " \ file://0001-Handle-logging-syscall.patch \ + file://0002-increase-tzdram-size.patch \ " COMPATIBLE_MACHINE = "corstone1000" diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-sp-smm-gateway_%.bbappend b/meta-arm-bsp/recipes-security/trusted-services/ts-sp-smm-gateway_%.bbappend index f584f81b..931d567f 100644 --- a/meta-arm-bsp/recipes-security/trusted-services/ts-sp-smm-gateway_%.bbappend +++ b/meta-arm-bsp/recipes-security/trusted-services/ts-sp-smm-gateway_%.bbappend @@ -2,6 +2,8 @@ require ts-arm-platforms.inc EXTRA_OECMAKE:append:corstone1000 = " -DMM_COMM_BUFFER_ADDRESS="0x00000000 0x81FFF000" \ -DMM_COMM_BUFFER_PAGE_COUNT="1" \ + -DUEFI_AUTH_VAR=ON \ + -DUEFI_INTERNAL_CRYPTO=ON \ " EXTRA_OECMAKE:append:fvp-base = " -DMM_COMM_BUFFER_ADDRESS="0x00000000 0x81000000" \