[PATCH 0/2] aarch64: update test images with new trusted firmware

[PATCH 0/2] aarch64: update test images with new trusted firmware

[Pierrick Bouvier]

The FEAT_MEC series [1] introduces FEAT_TCR2 and FEAT_SCTLR2.
TF-A needs to be aware of that change to allow accesses to those registers, and
thus must be patched [2] to enable this for QEMU platforms.

Concerned test images need to be updated to allow them to boot.

[1] https://lore.kernel.org/qemu-devel/20250714155836.1514748-1-richard.henderson@linaro.org/
[2] https://git.codelinaro.org/linaro/dcap/tf-a/trusted-firmware-a/-/commit/c8836cec14213bf92dae79d353bc345254a0a31e

Note: [2] will be upstreamed in TF-A once associated series on QEMU side is
merged.

Pierrick Bouvier (2):
  tests/functional/test_aarch64_device_passthrough: update image
  tests/functional/test_aarch64_rme: update image

 tests/functional/test_aarch64_device_passthrough.py | 9 +++++----
 tests/functional/test_aarch64_rme_sbsaref.py        | 9 +++++----
 tests/functional/test_aarch64_rme_virt.py           | 9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

-- 
2.47.2

[PATCH 1/2] tests/functional/test_aarch64_device_passthrough: update image

[Pierrick Bouvier]

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.bouvier@linaro.org>
---
 tests/functional/test_aarch64_device_passthrough.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/functional/test_aarch64_device_passthrough.py b/tests/functional/test_aarch64_device_passthrough.py
index 1f3f158a9ff..73bb0df8aba 100755
--- a/tests/functional/test_aarch64_device_passthrough.py
+++ b/tests/functional/test_aarch64_device_passthrough.py
@@ -77,15 +77,16 @@
 
 class Aarch64DevicePassthrough(QemuSystemTest):
 
-    # https://github.com/pbo-linaro/qemu-linux-stack
+    # https://github.com/pbo-linaro/qemu-linux-stack/tree/device_passthrough
+    # $ ./build.sh && ./archive_artifacts.sh out.tar.xz
     #
     # Linux kernel is compiled with defconfig +
     # IOMMUFD + VFIO_DEVICE_CDEV + ARM_SMMU_V3_IOMMUFD
     # https://docs.kernel.org/driver-api/vfio.html#vfio-device-cde
     ASSET_DEVICE_PASSTHROUGH_STACK = Asset(
-        ('https://fileserver.linaro.org/s/fx5DXxBYme8dw2G/'
-         'download/device_passthrough.tar.xz'),
-         '812750b664d61c2986f2b149939ae28cafbd60d53e9c7e4b16e97143845e196d')
+        ('https://fileserver.linaro.org/s/bz9cjSGPgWJ2iQT/'
+         'download/device_passthrough_v2.tar.xz'),
+         '5e892ee9ea4d1348e673524485ecfb960f748dfdd76dbc396347b1781a4f4252')
 
     # This tests the device passthrough implementation, by booting a VM
     # supporting it with two nvme disks attached, and launching a nested VM
-- 
2.47.2

[PATCH 2/2] tests/functional/test_aarch64_rme: update image

[Pierrick Bouvier]

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.bouvier@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

Re: [PATCH 1/2] tests/functional/test_aarch64_device_passthrough: update image

[Manos Pitsidianakis]

On Wed, Jul 16, 2025 at 12:25 AM Pierrick Bouvier
<pierrick.bouvier@linaro.org> wrote:
>
> 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.bouvier@linaro.org>
> ---
>  tests/functional/test_aarch64_device_passthrough.py | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/tests/functional/test_aarch64_device_passthrough.py b/tests/functional/test_aarch64_device_passthrough.py
> index 1f3f158a9ff..73bb0df8aba 100755
> --- a/tests/functional/test_aarch64_device_passthrough.py
> +++ b/tests/functional/test_aarch64_device_passthrough.py
> @@ -77,15 +77,16 @@
>
>  class Aarch64DevicePassthrough(QemuSystemTest):
>
> -    # https://github.com/pbo-linaro/qemu-linux-stack
> +    # https://github.com/pbo-linaro/qemu-linux-stack/tree/device_passthrough
> +    # $ ./build.sh && ./archive_artifacts.sh out.tar.xz
>      #
>      # Linux kernel is compiled with defconfig +
>      # IOMMUFD + VFIO_DEVICE_CDEV + ARM_SMMU_V3_IOMMUFD
>      # https://docs.kernel.org/driver-api/vfio.html#vfio-device-cde
>      ASSET_DEVICE_PASSTHROUGH_STACK = Asset(
> -        ('https://fileserver.linaro.org/s/fx5DXxBYme8dw2G/'
> -         'download/device_passthrough.tar.xz'),
> -         '812750b664d61c2986f2b149939ae28cafbd60d53e9c7e4b16e97143845e196d')
> +        ('https://fileserver.linaro.org/s/bz9cjSGPgWJ2iQT/'
> +         'download/device_passthrough_v2.tar.xz'),
> +         '5e892ee9ea4d1348e673524485ecfb960f748dfdd76dbc396347b1781a4f4252')
>
>      # This tests the device passthrough implementation, by booting a VM
>      # supporting it with two nvme disks attached, and launching a nested VM
> --
> 2.47.2
>
>

Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Tested-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>

Re: [PATCH 2/2] tests/functional/test_aarch64_rme: update image

[Manos Pitsidianakis]

On Wed, Jul 16, 2025 at 12:25 AM Pierrick Bouvier
<pierrick.bouvier@linaro.org> wrote:
>
> 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.bouvier@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
>
>

Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Tested-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>

Re: [PATCH 0/2] aarch64: update test images with new trusted firmware

[Richard Henderson]

On 7/15/25 15:23, Pierrick Bouvier wrote:
> The FEAT_MEC series [1] introduces FEAT_TCR2 and FEAT_SCTLR2.
> TF-A needs to be aware of that change to allow accesses to those registers, and
> thus must be patched [2] to enable this for QEMU platforms.
> 
> Concerned test images need to be updated to allow them to boot.
> 
> [1] https://lore.kernel.org/qemu-devel/20250714155836.1514748-1-richard.henderson@linaro.org/
> [2] https://git.codelinaro.org/linaro/dcap/tf-a/trusted-firmware-a/-/commit/c8836cec14213bf92dae79d353bc345254a0a31e
> 
> Note: [2] will be upstreamed in TF-A once associated series on QEMU side is
> merged.
> 
> Pierrick Bouvier (2):
>    tests/functional/test_aarch64_device_passthrough: update image
>    tests/functional/test_aarch64_rme: update image
> 
>   tests/functional/test_aarch64_device_passthrough.py | 9 +++++----
>   tests/functional/test_aarch64_rme_sbsaref.py        | 9 +++++----
>   tests/functional/test_aarch64_rme_virt.py           | 9 +++++----
>   3 files changed, 15 insertions(+), 12 deletions(-)
> 

Thanks.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Richard Henderson <richard.henderson@linaro.org>

and queued with FEAT_MEC.  I'll re-post at some point closer to opening of the 10.2 tree.


r~

Re: [PATCH 0/2] aarch64: update test images with new trusted firmware

[Pierrick Bouvier]

On 7/16/25 9:40 AM, Richard Henderson wrote:
> On 7/15/25 15:23, Pierrick Bouvier wrote:
>> The FEAT_MEC series [1] introduces FEAT_TCR2 and FEAT_SCTLR2.
>> TF-A needs to be aware of that change to allow accesses to those registers, and
>> thus must be patched [2] to enable this for QEMU platforms.
>>
>> Concerned test images need to be updated to allow them to boot.
>>
>> [1] https://lore.kernel.org/qemu-devel/20250714155836.1514748-1-richard.henderson@linaro.org/
>> [2] https://git.codelinaro.org/linaro/dcap/tf-a/trusted-firmware-a/-/commit/c8836cec14213bf92dae79d353bc345254a0a31e
>>
>> Note: [2] will be upstreamed in TF-A once associated series on QEMU side is
>> merged.
>>
>> Pierrick Bouvier (2):
>>     tests/functional/test_aarch64_device_passthrough: update image
>>     tests/functional/test_aarch64_rme: update image
>>
>>    tests/functional/test_aarch64_device_passthrough.py | 9 +++++----
>>    tests/functional/test_aarch64_rme_sbsaref.py        | 9 +++++----
>>    tests/functional/test_aarch64_rme_virt.py           | 9 +++++----
>>    3 files changed, 15 insertions(+), 12 deletions(-)
>>
> 
> Thanks.
> 
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Tested-by: Richard Henderson <richard.henderson@linaro.org>
> 
> and queued with FEAT_MEC.  I'll re-post at some point closer to opening of the 10.2 tree.
>

Do you plan to merge FEAT_MEC for 10.1, or prefer to wait for 10.2?

> 
> r~

Re: [PATCH 0/2] aarch64: update test images with new trusted firmware

[Richard Henderson]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

On Wed, 16 July 2025, 10:50 Pierrick Bouvier, <pierrick.bouvier@linaro.org>
wrote:

> Do you plan to merge FEAT_MEC for 10.1, or prefer to wait for 10.2?
>

We have missed the soft freeze window. It must wait for 10.2 now.


r~

>

[-- Attachment #2: Type: text/html, Size: 803 bytes --]

Re: [PATCH 0/2] aarch64: update test images with new trusted firmware

[Pierrick Bouvier]

On 7/16/25 11:13 AM, Richard Henderson wrote:
> On Wed, 16 July 2025, 10:50 Pierrick Bouvier, 
> <pierrick.bouvier@linaro.org <mailto:pierrick.bouvier@linaro.org>> wrote:
> 
>     Do you plan to merge FEAT_MEC for 10.1, or prefer to wait for 10.2?
> 
> 
> We have missed the soft freeze window. It must wait for 10.2 now.
> 

Oh right, I thought it was end of this week, but saw it was yesterday.

> 
> r~
> 

Re: [PATCH 0/2] aarch64: update test images with new trusted firmware

[Pierrick Bouvier]

On 7/15/25 2:23 PM, Pierrick Bouvier wrote:
> The FEAT_MEC series [1] introduces FEAT_TCR2 and FEAT_SCTLR2.
> TF-A needs to be aware of that change to allow accesses to those registers, and
> thus must be patched [2] to enable this for QEMU platforms.
> 
> Concerned test images need to be updated to allow them to boot.
> 
> [1] https://lore.kernel.org/qemu-devel/20250714155836.1514748-1-richard.henderson@linaro.org/
> [2] https://git.codelinaro.org/linaro/dcap/tf-a/trusted-firmware-a/-/commit/c8836cec14213bf92dae79d353bc345254a0a31e
> 
> Note: [2] will be upstreamed in TF-A once associated series on QEMU side is
> merged.
> 
> Pierrick Bouvier (2):
>    tests/functional/test_aarch64_device_passthrough: update image
>    tests/functional/test_aarch64_rme: update image
> 
>   tests/functional/test_aarch64_device_passthrough.py | 9 +++++----
>   tests/functional/test_aarch64_rme_sbsaref.py        | 9 +++++----
>   tests/functional/test_aarch64_rme_virt.py           | 9 +++++----
>   3 files changed, 15 insertions(+), 12 deletions(-)
> 

Superseded this with v2:
https://lore.kernel.org/qemu-devel/20250719035838.2284029-1-pierrick.bouvier@linaro.org/T/#t

Regards,
Pierrick