TF-A needs to be patched to enable support for FEAT_TCR2 and
FEAT_SCTLR2. This new image contains updated firmware.
Signed-off-by: Pierrick Bouvier <pierrick.bouv...@linaro.org>
---
tests/functional/test_aarch64_rme_sbsaref.py | 9 +++++----
tests/functional/test_aarch64_rme_virt.py | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/tests/functional/test_aarch64_rme_sbsaref.py
b/tests/functional/test_aarch64_rme_sbsaref.py
index 746770e776d..70737d3d599 100755
--- a/tests/functional/test_aarch64_rme_sbsaref.py
+++ b/tests/functional/test_aarch64_rme_sbsaref.py
@@ -21,10 +21,11 @@ class Aarch64RMESbsaRefMachine(QemuSystemTest):
# Stack is built with OP-TEE build environment from those instructions:
# https://linaro.atlassian.net/wiki/spaces/QEMU/pages/29051027459/
# https://github.com/pbo-linaro/qemu-rme-stack
+ # ./container.sh ./build_sbsa.sh && ./archive_artifacts.sh sbsa sbsa.tar.xz
ASSET_RME_STACK_SBSA = Asset(
- ('https://fileserver.linaro.org/s/KJyeBxL82mz2r7F/'
- 'download/rme-stack-op-tee-4.2.0-cca-v4-sbsa.tar.gz'),
- 'dd9ab28ec869bdf3b5376116cb3689103b43433fd5c4bca0f4a8d8b3c104999e')
+ ('https://fileserver.linaro.org/s/gW3mmtC4ZQaxNJ2/'
+ 'download/sbsa_cca_v10.tar.xz'),
+ 'b6ec3435a459eb298f221beb5073e485f290d38055d0aafbcff7d8e7c334aa73')
# This tests the FEAT_RME cpu implementation, by booting a VM supporting
it,
# and launching a nested VM using it.
@@ -38,7 +39,7 @@ def test_aarch64_rme_sbsaref(self):
stack_path_tar_gz = self.ASSET_RME_STACK_SBSA.fetch()
self.archive_extract(stack_path_tar_gz, format="tar")
- rme_stack = self.scratch_file('rme-stack-op-tee-4.2.0-cca-v4-sbsa')
+ rme_stack = self.scratch_file('.')
pflash0 = os.path.join(rme_stack, 'images', 'SBSA_FLASH0.fd')
pflash1 = os.path.join(rme_stack, 'images', 'SBSA_FLASH1.fd')
virtual = os.path.join(rme_stack, 'images', 'disks', 'virtual')
diff --git a/tests/functional/test_aarch64_rme_virt.py
b/tests/functional/test_aarch64_rme_virt.py
index 8452d27928f..fcc321b6006 100755
--- a/tests/functional/test_aarch64_rme_virt.py
+++ b/tests/functional/test_aarch64_rme_virt.py
@@ -49,10 +49,11 @@ class Aarch64RMEVirtMachine(QemuSystemTest):
# Stack is built with OP-TEE build environment from those instructions:
# https://linaro.atlassian.net/wiki/spaces/QEMU/pages/29051027459/
# https://github.com/pbo-linaro/qemu-rme-stack
+ # ./container.sh ./build_virt.sh && ./archive_artifacts.sh virt virt.tar.xz
ASSET_RME_STACK_VIRT = Asset(
- ('https://fileserver.linaro.org/s/iaRsNDJp2CXHMSJ/'
- 'download/rme-stack-op-tee-4.2.0-cca-v4-qemu_v8.tar.gz'),
- '1851adc232b094384d8b879b9a2cfff07ef3d6205032b85e9b3a4a9ae6b0b7ad')
+ ('https://fileserver.linaro.org/s/YpLmzLNL6BAxYL8/'
+ 'download/virt_cca_v10.tar.xz'),
+ 'bc432c92d62f3cd3542a943cd5a6329b2464c986f8f5dc48f727a0e5386a0e95')
# This tests the FEAT_RME cpu implementation, by booting a VM supporting
it,
# and launching a nested VM using it.
@@ -66,7 +67,7 @@ def test_aarch64_rme_virt(self):
stack_path_tar_gz = self.ASSET_RME_STACK_VIRT.fetch()
self.archive_extract(stack_path_tar_gz, format="tar")
- rme_stack = self.scratch_file('rme-stack-op-tee-4.2.0-cca-v4-qemu_v8')
+ rme_stack = self.scratch_file('.')
kernel = os.path.join(rme_stack, 'out', 'bin', 'Image')
bios = os.path.join(rme_stack, 'out', 'bin', 'flash.bin')
drive = os.path.join(rme_stack, 'out-br', 'images', 'rootfs.ext4')
--
2.47.2
