arm/trusted-firmware-a: upgrade to v2.7
PATCH 1/1 arm/trusted-firmware-a: upgrade to v2.7
Upstream has version v2.7 released, upgrade recipe to pick up new version.
Drop local patches as they are already applied upstream, namely:
- build-deps-upgrade-to-mbed-TLS-2.28.0.patch is covered by upstream commit a93084be95 ("build(deps): upgrade to mbed TLS 2.28.0")
- ssl.patch is covered by upstream commit 0a956f8180 ("fix(fiptool):
respect OPENSSL_DIR")
Rename bbappends in meta-arm-bsp to match new PV.
---
...s_2.6.bbappend => tf-a-tests_2.7.bbappend} | 0
...append => trusted-firmware-a_2.7.bbappend} | 0
...uild-deps-upgrade-to-mbed-TLS-2.28.0.patch | 72 -------------------
.../trusted-firmware-a/files/ssl.patch | 52 --------------
.../{tf-a-tests_2.6.bb => tf-a-tests_2.7.bb} | 4 +-
.../trusted-firmware-a/trusted-firmware-a.inc | 4 +-
...are-a_2.6.bb => trusted-firmware-a_2.7.bb} | 4 +-
7 files changed, 5 insertions(+), 131 deletions(-)
rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.6.bbappend => tf-a-tests_2.7.bbappend} (100%)
rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.6.bbappend => trusted-firmware-a_2.7.bbappend} (100%)
delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/build-deps-upgrade-to-mbed-TLS-2.28.0.patch
delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/ssl.patch
rename meta-arm/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.6.bb => tf-a-tests_2.7.bb} (94%)
rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.6.bb => trusted-firmware-a_2.7.bb} (85%)meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.bbappend renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bbappend +0 -0
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bbappend renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bbappend +0 -0
meta-arm/recipes-bsp/trusted-firmware-a/files/build-deps-upgrade-to-mbed-TLS-2.28.0.patch deleted +0 -72
72 lines not on this page · raw message
meta-arm/recipes-bsp/trusted-firmware-a/files/ssl.patch deleted +0 -52
52 lines not on this page · raw message
meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bb +2 -2
@@ -8,8 +8,8 @@ inherit deploy COMPATIBLE_MACHINE ?= "invalid" SRC_URI = "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https;branch=master" -# post v2.6 snapshot -SRCREV ?= "af5a517ae9f295455122109100fe5d55668e8eaf" +# v2.7 snapshot +SRCREV ?= "5f591f67738a1bbe6b262c53d9dad46ed8bbcd67" PV .= "+git${SRCPV}" DEPENDS += "optee-os"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +1 -3
@@ -5,9 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit deploy -SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master \ - file://ssl.patch \ - file://build-deps-upgrade-to-mbed-TLS-2.28.0.patch" +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bb +2 -2
@@ -1,7 +1,7 @@ require trusted-firmware-a.inc -# TF-A v2.6 -SRCREV_tfa = "a1f02f4f3daae7e21ee58b4c93ec3e46b8f28d15" +# TF-A v2.7 +SRCREV_tfa = "35f4c7295bafeb32c8bcbdfb6a3f2e74a57e732b" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
Signature · 1 line
2.25.1
Quoted 7 lines · Andrey Zhizhikin
Upstream has version v2.7 released, upgrade recipe to pick up new version.
Drop local patches as they are already applied upstream, namely:
- build-deps-upgrade-to-mbed-TLS-2.28.0.patch is covered by upstream commita93084be95("build(deps): upgrade to mbed TLS 2.28.0")
Quoted 6 lines
- ssl.patch is covered by upstream commit
0a956f8180("fix(fiptool):
respectOPENSSL_DIR")Rename bbappends in meta-arm-bsp to match new PV.
Signed-off-by Andrey Zhizhikin <[email protected]>
Thank you for sending this patch out. I had one queued up internally which did the same thing, and had a few extra changes. I sent this out for review. Please take a look and verify it does everything you need. It passes our CI.
Welcome, and I look forward to more patches from you.
Thanks,
Jon
Quoted 214 lines
--- ...s_2.6.bbappend => tf-a-tests_2.7.bbappend} | 0 ...append => trusted-firmware-a_2.7.bbappend} | 0 ...uild-deps-upgrade-to-mbed-TLS-2.28.0.patch | 72 ------------------- .../trusted-firmware-a/files/ssl.patch | 52 -------------- .../{tf-a-tests_2.6.bb => tf-a-tests_2.7.bb} | 4 +- .../trusted-firmware-a/trusted-firmware-a.inc | 4 +- ...are-a_2.6.bb => trusted-firmware-a_2.7.bb} | 4 +- 7 files changed, 5 insertions(+), 131 deletions(-) rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.6.bbappend => tf-a-tests_2.7.bbappend} (100%) rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.6.bbappend => trusted-firmware-a_2.7.bbappend} (100%) delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/build-deps-upgrade-to-mbed-TLS-2.28.0.patch delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/ssl.patch rename meta-arm/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.6.bb => tf-a-tests_2.7.bb} (94%) rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.6.bb => trusted-firmware-a_2.7.bb} (85%)meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.bbappend renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bbappend +0
-0meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bbappend renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bbappend +0
-0meta-arm/recipes-bsp/trusted-firmware-a/files/build-deps-upgrade-to-mbed-TLS-2.28.0.patch deleted +0
-72@@ -1,72 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Emekcan Aras <[email protected]> - -From a93084be95634b66b917f1c8baf403067dc75c5d Mon Sep 17 00:00:00 2001 -From: Sandrine Bailleux <[email protected]> -Date: Thu, 21 Apr 2022 10:21:29 +0200 -Subject: [PATCH] build(deps): upgrade to mbed TLS 2.28.0 - -Upgrade to the latest and greatest 2.x release of Mbed TLS library -(i.e. v2.28.0) to take advantage of their bug fixes. - -Note that the Mbed TLS project published version 3.x some time -ago. However, as this is a major release with API breakages, upgrading -to 3.x might require some more involved changes in TF-A, which we are -not ready to do. We shall upgrade to mbed TLS 3.x after the v2.7 -release of TF-A. - -Actually, the upgrade this time simply boils down to including the new -source code module 'constant_time.c' into the firmware. - -To quote mbed TLS v2.28.0 release notes [1]: - - The mbedcrypto library includes a new source code module - constant_time.c, containing various functions meant to resist timing - side channel attacks. This module does not have a separate - configuration option, and functions from this module will be - included in the build as required. - -As a matter of fact, if one is attempting to link TF-A against mbed -TLS v2.28.0 without the present patch, one gets some linker errors -due to missing symbols from this new module. - -Apart from this, none of the items listed in mbed TLS release -notes [1] directly affect TF-A. Special note on the following one: - - Fix a bug in mbedtls_gcm_starts() when the bit length of the iv - exceeds 2^32. - -In TF-A, we do use mbedtls_gcm_starts() when the firmware decryption -feature is enabled with AES-GCM as the authenticated decryption -algorithm (DECRYPTION_SUPPORT=aes_gcm). However, the iv_len variable -which gets passed to mbedtls_gcm_starts() is an unsigned int, i.e. a -32-bit value which by definition is always less than 2**32. Therefore, -we are immune to this bug. - -With this upgrade, the size of BL1 and BL2 binaries does not appear to -change on a standard sample test build (with trusted boot and measured -boot enabled). - -[1] https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.0 - -Change-Id: Icd5dbf527395e9e22c8fd6b77427188bd7237fd6 -Signed-off-by: Sandrine Bailleux <[email protected]> ---- - drivers/auth/mbedtls/mbedtls_common.mk | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/auth/mbedtls/mbedtls_common.mk b/drivers/auth/mbedtls/mbedtls_common.mk -index 0a4775d00..3eb41617f 100644 ---- a/drivers/auth/mbedtls/mbedtls_common.mk -+++ b/drivers/auth/mbedtls/mbedtls_common.mk -@@ -48,6 +48,7 @@ LIBMBEDTLS_SRCS := $(addprefix ${MBEDTLS_DIR}/library/, \ - rsa_internal.c \ - x509.c \ - x509_crt.c \ -+ constant_time.c \ - ) - - # The platform may define the variable 'TF_MBEDTLS_KEY_ALG' to select the key --- -2.25.1 -meta-arm/recipes-bsp/trusted-firmware-a/files/ssl.patch deleted +0
-52@@ -1,52 +0,0 @@ -fiptool: respect OPENSSL_DIR - -fiptool links to libcrypto, so as with the other tools it should respect -OPENSSL_DIR for include/library paths. - -Upstream-Status: Submitted -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/Makefile b/Makefile -index ec6f88585..2d3b9fc26 100644 ---- a/Makefile -+++ b/Makefile -@@ -1388,7 +1388,7 @@ fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME} - - ${FIPTOOL}: FORCE - ifdef UNIX_MK -- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} --no-print-directory -C ${FIPTOOLPATH} -+ ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} OPENSSL_DIR=${OPENSSL_DIR} --no-print-directory -C ${FIPTOOLPATH} - else - # Clear the MAKEFLAGS as we do not want - # to pass the gnumake flags to nmake. -diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile -index 11d2e7b0b..7c2a08379 100644 ---- a/tools/fiptool/Makefile -+++ b/tools/fiptool/Makefile -@@ -12,6 +12,8 @@ FIPTOOL ?= fiptool${BIN_EXT} - PROJECT := $(notdir ${FIPTOOL}) - OBJECTS := fiptool.o tbbr_config.o - V ?= 0 -+OPENSSL_DIR := /usr -+ - - override CPPFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE=700 - HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99 -@@ -20,7 +22,7 @@ ifeq (${DEBUG},1) - else - HOSTCCFLAGS += -O2 - endif --LDLIBS := -lcrypto -+LDLIBS := -L${OPENSSL_DIR}/lib -lcrypto - - ifeq (${V},0) - Q := @ -@@ -28,7 +30,7 @@ else - Q := - endif - --INCLUDE_PATHS := -I../../include/tools_share -+INCLUDE_PATHS := -I../../include/tools_share -I${OPENSSL_DIR}/include - - HOSTCC ?= gcc -meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bb +2
-2@@ -8,8 +8,8 @@ inherit deploy COMPATIBLE_MACHINE ?= "invalid" SRC_URI = "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https;branch=master" -# post v2.6 snapshot -SRCREV ?= "af5a517ae9f295455122109100fe5d55668e8eaf" +# v2.7 snapshot +SRCREV ?= "5f591f67738a1bbe6b262c53d9dad46ed8bbcd67" PV .= "+git${SRCPV}" DEPENDS += "optee-os"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +1
-3@@ -5,9 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit deploy -SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master \ - file://ssl.patch \ - file://build-deps-upgrade-to-mbed-TLS-2.28.0.patch" +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bb +2
-2@@ -1,7 +1,7 @@ require trusted-firmware-a.inc -# TF-A v2.6 -SRCREV_tfa = "a1f02f4f3daae7e21ee58b4c93ec3e46b8f28d15" +# TF-A v2.7 +SRCREV_tfa = "35f4c7295bafeb32c8bcbdfb6a3f2e74a57e732b" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"Signature · 1 line
2.25.1
Hello Jon,
Quoted 12 lines · Jon Mason
Quoted 10 lines · Andrey Zhizhikin
Upstream has version v2.7 released, upgrade recipe to pick up new version.
Drop local patches as they are already applied upstream, namely:
- build-deps-upgrade-to-mbed-TLS-2.28.0.patch is covered by upstream commita93084be95("build(deps): upgrade to mbed TLS 2.28.0")- ssl.patch is covered by upstream commit
0a956f8180("fix(fiptool):
respectOPENSSL_DIR")
Quoted 8 lines
Quoted 3 lines
Rename bbappends in meta-arm-bsp to match new PV.
Signed-off-by Andrey Zhizhikin <[email protected]>Thank you for sending this patch out. I had one queued up internally which did the same thing, and had a few extra changes. I sent this out for review. Please take a look and verify it does everything you need. It passes our CI.
No problem, thanks for following this one up!
I needed the v2.7 upgrade of TF-A because it have support for imx8mp-lpddr4-evk machine from meta-freescale layer.
I've introduced the possibility to use upstream TF-A in the layer, and in order to test the functionality this update was required.
I've verified your upgrade with imx8mm-lpddr4-evk and imx8mp-lpddr4-evk machines, and they are both operable with your new version.
Your version appears to be way better, as you've taken care of -tc patches and clang builds, which I did not include in simply due to the fact this was not used by machines I was working on.
Quoted 2 lines
Welcome, and I look forward to more patches from you.
Sure, thanks for the invite! :-)
Quoted 218 lines
Thanks,
JonQuoted 214 lines
--- ...s_2.6.bbappend => tf-a-tests_2.7.bbappend} | 0 ...append => trusted-firmware-a_2.7.bbappend} | 0 ...uild-deps-upgrade-to-mbed-TLS-2.28.0.patch | 72 ------------------- .../trusted-firmware-a/files/ssl.patch | 52 -------------- .../{tf-a-tests_2.6.bb => tf-a-tests_2.7.bb} | 4 +- .../trusted-firmware-a/trusted-firmware-a.inc | 4 +- ...are-a_2.6.bb => trusted-firmware-a_2.7.bb} | 4 +- 7 files changed, 5 insertions(+), 131 deletions(-) rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.6.bbappend => tf-a-tests_2.7.bbappend} (100%) rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.6.bbappend => trusted-firmware-a_2.7.bbappend} (100%) delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/build-deps-upgrade-to-mbed-TLS-2.28.0.patch delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/ssl.patch rename meta-arm/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.6.bb => tf-a-tests_2.7.bb} (94%) rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.6.bb => trusted-firmware-a_2.7.bb} (85%)meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.bbappend renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bbappend +0
-0meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bbappend renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bbappend +0
-0meta-arm/recipes-bsp/trusted-firmware-a/files/build-deps-upgrade-to-mbed-TLS-2.28.0.patch deleted +0
-72@@ -1,72 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Emekcan Aras <[email protected]> - -From a93084be95634b66b917f1c8baf403067dc75c5d Mon Sep 17 00:00:00 2001 -From: Sandrine Bailleux <[email protected]> -Date: Thu, 21 Apr 2022 10:21:29 +0200 -Subject: [PATCH] build(deps): upgrade to mbed TLS 2.28.0 - -Upgrade to the latest and greatest 2.x release of Mbed TLS library -(i.e. v2.28.0) to take advantage of their bug fixes. - -Note that the Mbed TLS project published version 3.x some time -ago. However, as this is a major release with API breakages, upgrading -to 3.x might require some more involved changes in TF-A, which we are -not ready to do. We shall upgrade to mbed TLS 3.x after the v2.7 -release of TF-A. - -Actually, the upgrade this time simply boils down to including the new -source code module 'constant_time.c' into the firmware. - -To quote mbed TLS v2.28.0 release notes [1]: - - The mbedcrypto library includes a new source code module - constant_time.c, containing various functions meant to resist timing - side channel attacks. This module does not have a separate - configuration option, and functions from this module will be - included in the build as required. - -As a matter of fact, if one is attempting to link TF-A against mbed -TLS v2.28.0 without the present patch, one gets some linker errors -due to missing symbols from this new module. - -Apart from this, none of the items listed in mbed TLS release -notes [1] directly affect TF-A. Special note on the following one: - - Fix a bug in mbedtls_gcm_starts() when the bit length of the iv - exceeds 2^32. - -In TF-A, we do use mbedtls_gcm_starts() when the firmware decryption -feature is enabled with AES-GCM as the authenticated decryption -algorithm (DECRYPTION_SUPPORT=aes_gcm). However, the iv_len variable -which gets passed to mbedtls_gcm_starts() is an unsigned int, i.e. a -32-bit value which by definition is always less than 2**32. Therefore, -we are immune to this bug. - -With this upgrade, the size of BL1 and BL2 binaries does not appear to -change on a standard sample test build (with trusted boot and measured -boot enabled). - -[1] https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.0 - -Change-Id: Icd5dbf527395e9e22c8fd6b77427188bd7237fd6 -Signed-off-by: Sandrine Bailleux <[email protected]> ---- - drivers/auth/mbedtls/mbedtls_common.mk | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/auth/mbedtls/mbedtls_common.mk b/drivers/auth/mbedtls/mbedtls_common.mk -index 0a4775d00..3eb41617f 100644 ---- a/drivers/auth/mbedtls/mbedtls_common.mk -+++ b/drivers/auth/mbedtls/mbedtls_common.mk -@@ -48,6 +48,7 @@ LIBMBEDTLS_SRCS := $(addprefix ${MBEDTLS_DIR}/library/, \ - rsa_internal.c \ - x509.c \ - x509_crt.c \ -+ constant_time.c \ - ) - - # The platform may define the variable 'TF_MBEDTLS_KEY_ALG' to select the key --- -2.25.1 -meta-arm/recipes-bsp/trusted-firmware-a/files/ssl.patch deleted +0
-52@@ -1,52 +0,0 @@ -fiptool: respect OPENSSL_DIR - -fiptool links to libcrypto, so as with the other tools it should respect -OPENSSL_DIR for include/library paths. - -Upstream-Status: Submitted -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/Makefile b/Makefile -index ec6f88585..2d3b9fc26 100644 ---- a/Makefile -+++ b/Makefile -@@ -1388,7 +1388,7 @@ fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME} - - ${FIPTOOL}: FORCE - ifdef UNIX_MK -- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} --no-print-directory -C ${FIPTOOLPATH} -+ ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} OPENSSL_DIR=${OPENSSL_DIR} --no-print-directory -C ${FIPTOOLPATH} - else - # Clear the MAKEFLAGS as we do not want - # to pass the gnumake flags to nmake. -diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile -index 11d2e7b0b..7c2a08379 100644 ---- a/tools/fiptool/Makefile -+++ b/tools/fiptool/Makefile -@@ -12,6 +12,8 @@ FIPTOOL ?= fiptool${BIN_EXT} - PROJECT := $(notdir ${FIPTOOL}) - OBJECTS := fiptool.o tbbr_config.o - V ?= 0 -+OPENSSL_DIR := /usr -+ - - override CPPFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE=700 - HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99 -@@ -20,7 +22,7 @@ ifeq (${DEBUG},1) - else - HOSTCCFLAGS += -O2 - endif --LDLIBS := -lcrypto -+LDLIBS := -L${OPENSSL_DIR}/lib -lcrypto - - ifeq (${V},0) - Q := @ -@@ -28,7 +30,7 @@ else - Q := - endif - --INCLUDE_PATHS := -I../../include/tools_share -+INCLUDE_PATHS := -I../../include/tools_share -I${OPENSSL_DIR}/include - - HOSTCC ?= gcc -meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bb +2
-2@@ -8,8 +8,8 @@ inherit deploy COMPATIBLE_MACHINE ?= "invalid" SRC_URI = "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https;branch=master" -# post v2.6 snapshot -SRCREV ?= "af5a517ae9f295455122109100fe5d55668e8eaf" +# v2.7 snapshot +SRCREV ?= "5f591f67738a1bbe6b262c53d9dad46ed8bbcd67" PV .= "+git${SRCPV}" DEPENDS += "optee-os"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +1
-3@@ -5,9 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit deploy -SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master \ - file://ssl.patch \ - file://build-deps-upgrade-to-mbed-TLS-2.28.0.patch" +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bb +2
-3@@ -1,7 +1,7 @@ require trusted-firmware-a.inc -# TF-A v2.6 -SRCREV_tfa = "a1f02f4f3daae7e21ee58b4c93ec3e46b8f28d15" +# TF-A v2.7 +SRCREV_tfa = "35f4c7295bafeb32c8bcbdfb6a3f2e74a57e732b" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" --2.25.1
Signature · 2 lines
Regards, Andrey.
Quoted 32 lines · Andrey Zhizhikin
Hello Jon,
Quoted 12 lines · Jon Mason
Quoted 10 lines · Andrey Zhizhikin
Upstream has version v2.7 released, upgrade recipe to pick up new version.
Drop local patches as they are already applied upstream, namely:
- build-deps-upgrade-to-mbed-TLS-2.28.0.patch is covered by upstream commita93084be95("build(deps): upgrade to mbed TLS 2.28.0")- ssl.patch is covered by upstream commit
0a956f8180("fix(fiptool):
respectOPENSSL_DIR")Quoted 8 lines
Quoted 3 lines
Rename bbappends in meta-arm-bsp to match new PV.
Signed-off-by Andrey Zhizhikin <[email protected]>Thank you for sending this patch out. I had one queued up internally which did the same thing, and had a few extra changes. I sent this out for review. Please take a look and verify it does everything you need. It passes our CI.
No problem, thanks for following this one up!
I needed the v2.7 upgrade of TF-A because it have support for
imx8mp-lpddr4-evkmachine from meta-freescale layer.I've introduced the possibility to use upstream TF-A in the layer, and in order to test the functionality this update was required.
Quoted 7 lines
I've verified your upgrade with
imx8mm-lpddr4-evkandimx8mp-lpddr4-evkmachines, and they are both operable with your new version.Your version appears to be way better, as you've taken care of
-tcpatches and clang builds, which I did not include in simply due to the fact this was not used by machines I was working on.
So much hair pulled out doing it (and there's not much left to pull). I would've pushed earlier, but I went down the rabbit hole of trying to get the latest mbedtls (3.1) working with it. I abandoned that and just pushed what I had once I saw someone actually wanted it :)
Quoted 231 lines
Quoted 3 lines
Welcome, and I look forward to more patches from you.
Sure, thanks for the invite! :-)
Quoted 218 lines
Thanks,
JonQuoted 214 lines
--- ...s_2.6.bbappend => tf-a-tests_2.7.bbappend} | 0 ...append => trusted-firmware-a_2.7.bbappend} | 0 ...uild-deps-upgrade-to-mbed-TLS-2.28.0.patch | 72 ------------------- .../trusted-firmware-a/files/ssl.patch | 52 -------------- .../{tf-a-tests_2.6.bb => tf-a-tests_2.7.bb} | 4 +- .../trusted-firmware-a/trusted-firmware-a.inc | 4 +- ...are-a_2.6.bb => trusted-firmware-a_2.7.bb} | 4 +- 7 files changed, 5 insertions(+), 131 deletions(-) rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.6.bbappend => tf-a-tests_2.7.bbappend} (100%) rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.6.bbappend => trusted-firmware-a_2.7.bbappend} (100%) delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/build-deps-upgrade-to-mbed-TLS-2.28.0.patch delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/ssl.patch rename meta-arm/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.6.bb => tf-a-tests_2.7.bb} (94%) rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.6.bb => trusted-firmware-a_2.7.bb} (85%)meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.bbappend renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bbappend +0
-0meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bbappend renamed from meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bbappend +0
-0meta-arm/recipes-bsp/trusted-firmware-a/files/build-deps-upgrade-to-mbed-TLS-2.28.0.patch deleted +0
-72@@ -1,72 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Emekcan Aras <[email protected]> - -From a93084be95634b66b917f1c8baf403067dc75c5d Mon Sep 17 00:00:00 2001 -From: Sandrine Bailleux <[email protected]> -Date: Thu, 21 Apr 2022 10:21:29 +0200 -Subject: [PATCH] build(deps): upgrade to mbed TLS 2.28.0 - -Upgrade to the latest and greatest 2.x release of Mbed TLS library -(i.e. v2.28.0) to take advantage of their bug fixes. - -Note that the Mbed TLS project published version 3.x some time -ago. However, as this is a major release with API breakages, upgrading -to 3.x might require some more involved changes in TF-A, which we are -not ready to do. We shall upgrade to mbed TLS 3.x after the v2.7 -release of TF-A. - -Actually, the upgrade this time simply boils down to including the new -source code module 'constant_time.c' into the firmware. - -To quote mbed TLS v2.28.0 release notes [1]: - - The mbedcrypto library includes a new source code module - constant_time.c, containing various functions meant to resist timing - side channel attacks. This module does not have a separate - configuration option, and functions from this module will be - included in the build as required. - -As a matter of fact, if one is attempting to link TF-A against mbed -TLS v2.28.0 without the present patch, one gets some linker errors -due to missing symbols from this new module. - -Apart from this, none of the items listed in mbed TLS release -notes [1] directly affect TF-A. Special note on the following one: - - Fix a bug in mbedtls_gcm_starts() when the bit length of the iv - exceeds 2^32. - -In TF-A, we do use mbedtls_gcm_starts() when the firmware decryption -feature is enabled with AES-GCM as the authenticated decryption -algorithm (DECRYPTION_SUPPORT=aes_gcm). However, the iv_len variable -which gets passed to mbedtls_gcm_starts() is an unsigned int, i.e. a -32-bit value which by definition is always less than 2**32. Therefore, -we are immune to this bug. - -With this upgrade, the size of BL1 and BL2 binaries does not appear to -change on a standard sample test build (with trusted boot and measured -boot enabled). - -[1] https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.0 - -Change-Id: Icd5dbf527395e9e22c8fd6b77427188bd7237fd6 -Signed-off-by: Sandrine Bailleux <[email protected]> ---- - drivers/auth/mbedtls/mbedtls_common.mk | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/auth/mbedtls/mbedtls_common.mk b/drivers/auth/mbedtls/mbedtls_common.mk -index 0a4775d00..3eb41617f 100644 ---- a/drivers/auth/mbedtls/mbedtls_common.mk -+++ b/drivers/auth/mbedtls/mbedtls_common.mk -@@ -48,6 +48,7 @@ LIBMBEDTLS_SRCS := $(addprefix ${MBEDTLS_DIR}/library/, \ - rsa_internal.c \ - x509.c \ - x509_crt.c \ -+ constant_time.c \ - ) - - # The platform may define the variable 'TF_MBEDTLS_KEY_ALG' to select the key --- -2.25.1 -meta-arm/recipes-bsp/trusted-firmware-a/files/ssl.patch deleted +0
-52@@ -1,52 +0,0 @@ -fiptool: respect OPENSSL_DIR - -fiptool links to libcrypto, so as with the other tools it should respect -OPENSSL_DIR for include/library paths. - -Upstream-Status: Submitted -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/Makefile b/Makefile -index ec6f88585..2d3b9fc26 100644 ---- a/Makefile -+++ b/Makefile -@@ -1388,7 +1388,7 @@ fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME} - - ${FIPTOOL}: FORCE - ifdef UNIX_MK -- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} --no-print-directory -C ${FIPTOOLPATH} -+ ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} OPENSSL_DIR=${OPENSSL_DIR} --no-print-directory -C ${FIPTOOLPATH} - else - # Clear the MAKEFLAGS as we do not want - # to pass the gnumake flags to nmake. -diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile -index 11d2e7b0b..7c2a08379 100644 ---- a/tools/fiptool/Makefile -+++ b/tools/fiptool/Makefile -@@ -12,6 +12,8 @@ FIPTOOL ?= fiptool${BIN_EXT} - PROJECT := $(notdir ${FIPTOOL}) - OBJECTS := fiptool.o tbbr_config.o - V ?= 0 -+OPENSSL_DIR := /usr -+ - - override CPPFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE=700 - HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99 -@@ -20,7 +22,7 @@ ifeq (${DEBUG},1) - else - HOSTCCFLAGS += -O2 - endif --LDLIBS := -lcrypto -+LDLIBS := -L${OPENSSL_DIR}/lib -lcrypto - - ifeq (${V},0) - Q := @ -@@ -28,7 +30,7 @@ else - Q := - endif - --INCLUDE_PATHS := -I../../include/tools_share -+INCLUDE_PATHS := -I../../include/tools_share -I${OPENSSL_DIR}/include - - HOSTCC ?= gcc -meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bb +2
-2@@ -8,8 +8,8 @@ inherit deploy COMPATIBLE_MACHINE ?= "invalid" SRC_URI = "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https;branch=master" -# post v2.6 snapshot -SRCREV ?= "af5a517ae9f295455122109100fe5d55668e8eaf" +# v2.7 snapshot +SRCREV ?= "5f591f67738a1bbe6b262c53d9dad46ed8bbcd67" PV .= "+git${SRCPV}" DEPENDS += "optee-os"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +1
-3@@ -5,9 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit deploy -SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master \ - file://ssl.patch \ - file://build-deps-upgrade-to-mbed-TLS-2.28.0.patch" +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.6.bb +2
-3@@ -1,7 +1,7 @@ require trusted-firmware-a.inc -# TF-A v2.6 -SRCREV_tfa = "a1f02f4f3daae7e21ee58b4c93ec3e46b8f28d15" +# TF-A v2.7 +SRCREV_tfa = "35f4c7295bafeb32c8bcbdfb6a3f2e74a57e732b" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" --2.25.1
Signature · 2 lines
Regards, Andrey.