From 6bfd024269c3888dffef7540b0618b04ee3308ea Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Thu, 8 Feb 2024 09:39:58 +0000 Subject: [PATCH] arm-bsp/tf-a-tests: fix corstone1000 The tftf tests are getting stuck on nanbield for corstone1000 due to incompatible optee version. The optee version on nanbield needs to be upgraded to fix the tftf tests. To avoid that upgrade on the release branch, some tftf tests are skipped for corstone1000 platform to make the tftf tests work. Signed-off-by: Harsimran Singh Tungal --- .../0001-corstone1000-skip-tftf-tests.patch | 33 +++++++++++++++++++ .../trusted-firmware-a/tf-a-tests_%.bbappend | 5 +++ 2 files changed, 38 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/0001-corstone1000-skip-tftf-tests.patch diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/0001-corstone1000-skip-tftf-tests.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/0001-corstone1000-skip-tftf-tests.patch new file mode 100644 index 00000000..341d2802 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/0001-corstone1000-skip-tftf-tests.patch @@ -0,0 +1,33 @@ +From 27300daa2397c89e13aa648db30aa5c6acb06bcc Mon Sep 17 00:00:00 2001 +From: Harsimran Singh Tungal +Date: Fri, 2 Feb 2024 11:58:33 +0000 +Subject: [PATCH] corstone1000: skip tftf tests + +Skip some tests for platform corstone1000 which make the tftf tests +hanged when use with optee v3.22 + +Upstream-Status: Pending +Signed-off-by: Harsimran Singh Tungal +--- + plat/arm/corstone1000/tests_to_skip.txt | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/plat/arm/corstone1000/tests_to_skip.txt b/plat/arm/corstone1000/tests_to_skip.txt +index fdab230..c5eaac0 100644 +--- a/plat/arm/corstone1000/tests_to_skip.txt ++++ b/plat/arm/corstone1000/tests_to_skip.txt +@@ -13,3 +13,11 @@ Timer framework Validation/Verify the timer interrupt generation + CPU Hotplug/CPU hotplug + PSCI CPU Suspend + PSCI STAT/for valid composite state CPU suspend ++FF-A Direct messaging/FF-A Request SP-to-SP direct messaging ++FF-A Direct messaging/FF-A Request SP-to-SP direct messaging deadlock ++FF-A Memory Sharing/Share Memory with Secure World ++FF-A Memory Sharing/Request Donate Memory SP-to-SP ++FF-A Memory Sharing/Request Share Memory SP-to-VM ++SIMD,SVE Registers context/Check that SIMD registers context is preserved ++FF-A Interrupt/Test NS interrupts ++SMMUv3 tests +-- +2.34.1 + diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_%.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_%.bbappend index eef21b93..d047a1eb 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_%.bbappend @@ -1,9 +1,14 @@ # Machine specific TFAs +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + COMPATIBLE_MACHINE:corstone1000 = "corstone1000" SRCREV:corstone1000 = "5f591f67738a1bbe6b262c53d9dad46ed8bbcd67" EXTRA_OEMAKE:append:corstone1000 = " DEBUG=0" EXTRA_OEMAKE:append:corstone1000 = " LOG_LEVEL=30" TFTF_MODE:corstone1000 = "release" +SRC_URI:append:corstone1000 = " \ + file://0001-corstone1000-skip-tftf-tests.patch \ + " COMPATIBLE_MACHINE:n1sdp = "n1sdp"