[PATCH][HONISTER 0/5] : backport: "corstone1000: psa-arch-tests "

[PATCH][HONISTER 0/5] : backport: "corstone1000: psa-arch-tests "

[abdellatif.elkhlifi]

From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>

Backporting the features already merged with master.

Abdellatif El Khlifi (4):
  arm/secure-partitions: remove the use of EXTRA_OEMAKE
  arm/psa-arch-tests: introduce the recipe
  kas: corstone1000: update meta-arm-image SHA
  kas: corstone1000: update for new Kas include semantics in kas folder

Emekcan Aras (1):
  arm-bsp/psa-arch-tests: corstone1000: build the test applications

 kas/corstone1000-base.yml                     |  4 +-
 kas/corstone1000-fvp.yml                      |  4 +-
 kas/corstone1000-mps3.yml                     |  4 +-
 .../psa-arch-tests-corstone1000.inc           | 43 ++++++++++++
 ...arch-test-sysroot_compiler_flags_fix.patch | 68 +++++++++++++++++++
 .../psa-arch-tests_%.bbappend                 |  6 ++
 .../trusted-services/psa-arch-tests_git.bb    | 26 +++++++
 .../trusted-services/secure-partitions.inc    |  3 -
 8 files changed, 149 insertions(+), 9 deletions(-)
 create mode 100644 meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests-corstone1000.inc
 create mode 100644 meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests/corstone1000/0001-psa-arch-test-sysroot_compiler_flags_fix.patch
 create mode 100644 meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests_%.bbappend
 create mode 100644 meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb

-- 
2.17.1

[PATCH][HONISTER 1/5] arm/secure-partitions: remove the use of EXTRA_OEMAKE

[abdellatif.elkhlifi]

From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>

EXTRA_OEMAKE is not needed since we are using CMake.

Change-Id: Ifc0dcc9313fe4e473cbba8eb3b716e11cf8e45ee
Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
---
 .../recipes-security/trusted-services/secure-partitions.inc    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-arm/recipes-security/trusted-services/secure-partitions.inc b/meta-arm/recipes-security/trusted-services/secure-partitions.inc
index 1c7aba8..84409c2 100644
--- a/meta-arm/recipes-security/trusted-services/secure-partitions.inc
+++ b/meta-arm/recipes-security/trusted-services/secure-partitions.inc
@@ -21,7 +21,4 @@ LD[unexport] = "1"
 SECURITY_LDFLAGS = ""
 TARGET_LDFLAGS = "-Wl,--build-id=none -Wl,--hash-style=both"
 
-EXTRA_OEMAKE += "HOST_PREFIX=${HOST_PREFIX}"
-EXTRA_OEMAKE += "CROSS_COMPILE64=${HOST_PREFIX}"
-
 do_configure[cleandirs] = "${B}"
-- 
2.17.1

[PATCH][HONISTER 2/5] arm/psa-arch-tests: introduce the recipe

[abdellatif.elkhlifi]

From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>

This commit adds a recipe for psa-arch-tests linux
userspace application.

Included tests are; crypto, protected_storage,
internal_trusted_storage and attestation.

Change-Id: I6285aa2a6ae8fdd25f4327f1d301c59a88bce775
Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
---
 .../trusted-services/psa-arch-tests_git.bb    | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb

diff --git a/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb b/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb
new file mode 100644
index 0000000..ff89b06
--- /dev/null
+++ b/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb
@@ -0,0 +1,26 @@
+SUMMARY = "PSA arch test application"
+
+require secure-partitions.inc
+
+LIC_FILES_CHKSUM += "file://../psa-arch-tests/LICENSE.md;md5=2a944942e1496af1886903d274dedb13"
+SRC_URI_PSA = "git://github.com/ARM-software/psa-arch-tests.git;protocol=https;branch=master;name=psa;destsuffix=git/psa-arch-tests"
+SRC_URI:append = " ${SRC_URI_PSA}"
+
+SRCREV_FORMAT="ts_psa"
+SRCREV_psa = "6e1549dde62d12c92fc2df90ebbbe2d2d77cc76a"
+PV = "0.0+git${SRCREV_psa}"
+
+PSA_APPLICATION_NAME = "psa-api-test"
+TS_ENVIRONMENT_LINUX = "arm-linux"
+
+PSA_API_TESTS += "deployments/psa-api-test/protected_storage/${TS_ENVIRONMENT_LINUX}"
+PSA_API_TESTS += "deployments/psa-api-test/internal_trusted_storage/${TS_ENVIRONMENT_LINUX}"
+PSA_API_TESTS += "deployments/psa-api-test/initial_attestation/${TS_ENVIRONMENT_LINUX}"
+PSA_API_TESTS += "deployments/psa-api-test/crypto/${TS_ENVIRONMENT_LINUX}"
+
+EXTRA_OECMAKE += "-DCMAKE_POSITION_INDEPENDENT_CODE=True \
+                 -DCMAKE_SYSTEM_NAME=Linux \
+                 -DCMAKE_SYSTEM_PROCESSOR=arm \
+                "
+
+do_deploy[noexec] = "1"
-- 
2.17.1

[PATCH][HONISTER 3/5] arm-bsp/psa-arch-tests: corstone1000: build the test applications

[abdellatif.elkhlifi]

From: Emekcan Aras <Emekcan.Aras@arm.com>

This commit adds support for building/installing the test
application.

Also fixing CMake issues on the current trusted-service CMake source files.

Change-Id: Iae0fc9bf9362cf5b7d65cd7b9f0445f62f3b83eb
Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
---
 .../psa-arch-tests-corstone1000.inc           | 43 ++++++++++++
 ...arch-test-sysroot_compiler_flags_fix.patch | 68 +++++++++++++++++++
 .../psa-arch-tests_%.bbappend                 |  6 ++
 3 files changed, 117 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests-corstone1000.inc
 create mode 100644 meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests/corstone1000/0001-psa-arch-test-sysroot_compiler_flags_fix.patch
 create mode 100644 meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests_%.bbappend

diff --git a/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests-corstone1000.inc b/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests-corstone1000.inc
new file mode 100644
index 0000000..f1aea12
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests-corstone1000.inc
@@ -0,0 +1,43 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/psa-arch-tests/corstone1000:"
+
+DEPENDS += "cmake-native"
+
+export CMAKE_BUILD_PARALLEL_LEVEL
+CMAKE_BUILD_PARALLEL_LEVEL = "${@oe.utils.parallel_make(d, True)}"
+
+COMPATIBLE_MACHINE = "corstone1000"
+
+SRC_URI:append = "\
+    file://0001-psa-arch-test-sysroot_compiler_flags_fix.patch \
+    "
+
+FILES:${PN} += "${libdir}/libts.so*  ${libdir}/deployments  ${bindir}/psa-*"
+FILES:${PN}-dev = "${includedir}/deployments/psa-api-test/"
+
+INSANE_SKIP:${PN} += "rpaths"
+
+do_configure() {
+    for PSA_API_TEST in ${PSA_API_TESTS}; do
+        cmake \
+        -DSYSROOT_YOCTO=${RECIPE_SYSROOT} \
+        -S ${S}/$PSA_API_TEST -B "${B}/$PSA_API_TEST"
+    done
+}
+
+do_compile() {
+    for PSA_API_TEST in ${PSA_API_TESTS}; do
+        cmake --build "${B}/$PSA_API_TEST"
+    done
+}
+
+do_install() {
+    for PSA_API_TEST in ${PSA_API_TESTS}; do
+        install -d -m 0755 ${D}${libdir}/${PSA_API_TEST}
+        install -d -m 0755 ${D}${includedir}/${PSA_API_TEST}
+        install -m 0755 ${B}/${PSA_API_TEST}/libts_install/arm-linux/lib/*.so* ${D}${libdir}
+	install -d -m 0755 ${B}/${PSA_API_TEST}/libts_install/arm-linux/include ${D}${includedir}/${PSA_API_TEST}
+	psafile_fullpath=`ls ${B}/${PSA_API_TEST}/psa-*`
+	psafile_filename="`basename -s .bin ${psafile_fullpath}`"
+        install -D -p -m 0755 ${psafile_fullpath} ${D}/${bindir}/${psafile_filename}
+    done
+}
\ No newline at end of file
diff --git a/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests/corstone1000/0001-psa-arch-test-sysroot_compiler_flags_fix.patch b/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests/corstone1000/0001-psa-arch-test-sysroot_compiler_flags_fix.patch
new file mode 100644
index 0000000..e9ce0c5
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests/corstone1000/0001-psa-arch-test-sysroot_compiler_flags_fix.patch
@@ -0,0 +1,68 @@
+Upstream-Status: Inappropriate [Not for upstreaming in the original repo]
+Signed-off-by: Emekcan Aras <Emekcan.Aras@arm.com>
+
+From 340ef6788d2803543b15235bf16a79cbc02235bd Mon Sep 17 00:00:00 2001
+From: Emekcan Aras <Emekcan.Aras@arm.com>
+Date: Mon, 6 Dec 2021 10:21:59 +0000
+
+[PATCH] arm-bsp/psa-arch-test: Integrate psa-arch-test
+
+Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
+---
+ deployments/libts/libts-import.cmake         | 4 +++-
+ external/MbedTLS/MbedTLS.cmake               | 1 +
+ external/psa_arch_tests/psa_arch_tests.cmake | 1 +
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/deployments/libts/libts-import.cmake b/deployments/libts/libts-import.cmake
+index 792ba86..e3793e8 100644
+--- a/deployments/libts/libts-import.cmake
++++ b/deployments/libts/libts-import.cmake
+@@ -19,7 +19,6 @@ if(NOT DEFINED PROCESSOR_COUNT)
+ 	ProcessorCount(PROCESSOR_COUNT)
+ 	set(PROCESSOR_COUNT ${PROCESSOR_COUNT} CACHE STRING "Number of cores to use for parallel builds.")
+ endif()
+-
+ set(LIBTS_INSTALL_PATH "${CMAKE_CURRENT_BINARY_DIR}/libts_install" CACHE PATH "libts installation directory")
+ set(LIBTS_PACKAGE_PATH "${LIBTS_INSTALL_PATH}/lib/cmake" CACHE PATH "libts CMake package directory")
+ set(LIBTS_SOURCE_DIR "${TS_ROOT}/deployments/libts/${TS_ENV}" CACHE PATH "libts source directory")
+@@ -27,9 +26,12 @@ set(LIBTS_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/_deps/libts-build" CACHE PATH
+ 
+ file(MAKE_DIRECTORY ${LIBTS_BINARY_DIR})
+ 
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot=${SYSROOT_YOCTO}")
++
+ #Configure the library
+ execute_process(COMMAND
+ 	${CMAKE_COMMAND}
++		-DCMAKE_SYSROOT=${SYSROOT_YOCTO}
+ 		-DCMAKE_INSTALL_PREFIX=${LIBTS_INSTALL_PATH}
+ 		-GUnix\ Makefiles
+ 		${LIBTS_SOURCE_DIR}
+diff --git a/external/MbedTLS/MbedTLS.cmake b/external/MbedTLS/MbedTLS.cmake
+index 3cbaed1..8c53f88 100644
+--- a/external/MbedTLS/MbedTLS.cmake
++++ b/external/MbedTLS/MbedTLS.cmake
+@@ -59,6 +59,7 @@ set(PSA_CRYPTO_API_INCLUDE "${MBEDTLS_INSTALL_PATH}/include" CACHE STRING "PSA C
+ #Configure the library
+ execute_process(COMMAND
+ 	${CMAKE_COMMAND}
++		-DCMAKE_SYSROOT=${SYSROOT_YOCTO}
+ 		-DENABLE_PROGRAMS=OFF
+ 		-DENABLE_TESTING=OFF
+ 		-DUNSAFE_BUILD=ON
+diff --git a/external/psa_arch_tests/psa_arch_tests.cmake b/external/psa_arch_tests/psa_arch_tests.cmake
+index e6ab73f..af00cfc 100644
+--- a/external/psa_arch_tests/psa_arch_tests.cmake
++++ b/external/psa_arch_tests/psa_arch_tests.cmake
+@@ -52,6 +52,7 @@ string(REPLACE ";" " " PSA_ARCH_TEST_EXTERNAL_DEFS "${PSA_ARCH_TEST_EXTERNAL_DEF
+ # Configure the psa-arch-test library
+ execute_process(COMMAND
+ 	${CMAKE_COMMAND}
++			-DCMAKE_SYSROOT=${SYSROOT_YOCTO}
+ 			-DTOOLCHAIN=INHERIT
+ 			-DCMAKE_TOOLCHAIN_FILE=${TS_EXTERNAL_LIB_TOOLCHAIN_FILE}
+ 			-DPSA_INCLUDE_PATHS=${PSA_ARCH_TESTS_EXTERNAL_INCLUDE_PATHS}
+-- 
+2.25.1
+
diff --git a/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests_%.bbappend b/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests_%.bbappend
new file mode 100644
index 0000000..e517cd6
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests_%.bbappend
@@ -0,0 +1,6 @@
+# Machine specific configurations
+
+MACHINE_PSA_REQUIRE ?= ""
+MACHINE_PSA_REQUIRE:corstone1000 = "psa-arch-tests-corstone1000.inc"
+
+require ${MACHINE_PSA_REQUIRE}
-- 
2.17.1

[PATCH][HONISTER 4/5] kas: corstone1000: update meta-arm-image SHA

[abdellatif.elkhlifi]

From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>

Aligning to the last meta-arm-image version to
add psa-arch-tests to the rootfs.

Change-Id: I40e945f814df4b6f7c30772d3dd6f91e6b6fcafc
Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
---
 kas/corstone1000-base.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kas/corstone1000-base.yml b/kas/corstone1000-base.yml
index eb6d84c..fc7271a 100644
--- a/kas/corstone1000-base.yml
+++ b/kas/corstone1000-base.yml
@@ -31,7 +31,7 @@ repos:
 
   meta-arm-image:
      url: https://git.gitlab.arm.com/arm-reference-solutions/meta-arm-image.git
-     refspec: 4512b434d5cde8881473c4caa724a26cd517a604
+     refspec: aeb0571e8bc935f3f8b15c3b27ab4275e2069b5b
 
 local_conf_header:
   base: |
-- 
2.17.1

[PATCH][HONISTER 5/5] kas: corstone1000: update for new Kas include semantics in kas folder

[abdellatif.elkhlifi]

From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>

With Kas 2.6 included YAML files need to be relative to the repository,
not the including file:

https://kas.readthedocs.io/en/latest/format-changelog.html#version-11

Change-Id: I851c9137d1f70f754d1a70a1fc14828c39ff3de7
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
---
 kas/corstone1000-base.yml | 2 +-
 kas/corstone1000-fvp.yml  | 4 ++--
 kas/corstone1000-mps3.yml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kas/corstone1000-base.yml b/kas/corstone1000-base.yml
index fc7271a..0e6f97a 100644
--- a/kas/corstone1000-base.yml
+++ b/kas/corstone1000-base.yml
@@ -1,5 +1,5 @@
 header:
-  version: 9
+  version: 11
 
 distro: poky-tiny
 
diff --git a/kas/corstone1000-fvp.yml b/kas/corstone1000-fvp.yml
index ac1920c..2ea7fdc 100644
--- a/kas/corstone1000-fvp.yml
+++ b/kas/corstone1000-fvp.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
   includes:
-    - corstone1000-base.yml
+    - kas/corstone1000-base.yml
 
 repos:
   run-scripts:
diff --git a/kas/corstone1000-mps3.yml b/kas/corstone1000-mps3.yml
index 06e5962..53be438 100644
--- a/kas/corstone1000-mps3.yml
+++ b/kas/corstone1000-mps3.yml
@@ -1,6 +1,6 @@
 header:
-  version: 9
+  version: 11
   includes:
-    - corstone1000-base.yml
+    - kas/corstone1000-base.yml
 
 machine: corstone1000-mps3
-- 
2.17.1

Re: [PATCH][HONISTER 0/5] : backport: "corstone1000: psa-arch-tests "

[Jon Mason]

On Mon, 13 Dec 2021 18:17:57 +0000, abdellatif.elkhlifi@arm.com wrote:
> From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
> 
> Backporting the features already merged with master.
> 
> Abdellatif El Khlifi (4):
>   arm/secure-partitions: remove the use of EXTRA_OEMAKE
>   arm/psa-arch-tests: introduce the recipe
>   kas: corstone1000: update meta-arm-image SHA
>   kas: corstone1000: update for new Kas include semantics in kas folder
> 
> [...]

Applied, thanks!

[1/5] arm/secure-partitions: remove the use of EXTRA_OEMAKE
      commit: a68fa362d2349111801d170847e423301cbc21dc
[2/5] arm/psa-arch-tests: introduce the recipe
      commit: 0acbf59a8e6cde6ba3fc92a9f040340162d41b41
[3/5] arm-bsp/psa-arch-tests: corstone1000: build the test applications
      commit: a56fdf433329c25c898cf884a3567a0dfbfdf040
[4/5] kas: corstone1000: update meta-arm-image SHA
      commit: 1e3cea589d24397fd084c3218a5402569405b222
[5/5] kas: corstone1000: update for new Kas include semantics in kas folder
      commit: 42347ebaa2e121f9e5c6b796d18222aa58792a27

Best regards,
-- 
Jon Mason <jon.mason@arm.com>