[PATCH 0/3] tests/avocado: update sbsa-ref firmware to latest

[PATCH 0/3] tests/avocado: update sbsa-ref firmware to latest

[Marcin Juszkiewicz]

Updating sbsa-ref firmware for QEMU CI was manual task. Now it is
replaced by CI job run on CodeLinaro Gitlab instance.

This patchset updates to current state:

- Trusted Firmware v2.10.2 (latest LTS)
- Tianocore EDK2 stable202402 (latest release)

And Tianocore EDK2-platforms commit 085c2fb (edk2-platforms does not
have releases).

Firmware images were built using Debian 'bookworm' cross gcc 12.2.0
compiler.

And while I am in that file I dropped use of 'virtio-rng-pci' device as
sbsa-ref is supposed to emulate physical hardware.

OpenBSD updated to 7.4 version.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
Marcin Juszkiewicz (3):
      tests/avocado: update sbsa-ref firmware
      tests/avocado: drop virtio-rng from sbsa-ref tests
      tests/avocado: use OpenBSD 7.4 for sbsa-ref

 tests/avocado/machine_aarch64_sbsaref.py | 74 +++++++++++++++-----------------
 1 file changed, 34 insertions(+), 40 deletions(-)
---
base-commit: 0748129684be2773117b0b8fc3c60161abdb7bb8
change-id: 20240313-sbsa-ref-firmware-update-7579d9f6d59b

Best regards,
-- 
Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

[PATCH 1/3] tests/avocado: update sbsa-ref firmware

[Marcin Juszkiewicz]

We now have CI job to build those and publish in space with
readable urls.

Firmware is built using Debian 'bookworm' cross toolchain (gcc 12.2.0).

Used versions:

- Trusted Firmware v2.10.2
- Tianocore EDK2 stable202402
- Tianocore EDK2 Platforms code commit 085c2fb

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 tests/avocado/machine_aarch64_sbsaref.py | 40 +++++++++++++++++---------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
index 528c7d2934..cbab793455 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -1,6 +1,6 @@
 # Functional test that boots a Linux kernel and checks the console
 #
-# SPDX-FileCopyrightText: 2023 Linaro Ltd.
+# SPDX-FileCopyrightText: 2023-2024 Linaro Ltd.
 # SPDX-FileContributor: Philippe Mathieu-Daudé <philmd@linaro.org>
 # SPDX-FileContributor: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
 #
@@ -32,34 +32,36 @@ def fetch_firmware(self):
         """
         Flash volumes generated using:
 
-        - Fedora GNU Toolchain version 13.2.1 20230728 (Red Hat 13.2.1-1)
+        Toolchain from Debian:
+        aarch64-linux-gnu-gcc (Debian 12.2.0-14) 12.2.0
 
-        - Trusted Firmware-A
-          https://github.com/ARM-software/arm-trusted-firmware/tree/7c3ff62d
+        Used components:
+
+        - Trusted Firmware 2.10.2
+        - Tianocore EDK2 stable202402
+        - Tianocore EDK2-platforms commit 085c2fb
 
-        - Tianocore EDK II
-          https://github.com/tianocore/edk2/tree/0f9283429dd4
-          https://github.com/tianocore/edk2/tree/ad1c0394b177
-          https://github.com/tianocore/edk2-platforms/tree/d03a60523a60
         """
 
         # Secure BootRom (TF-A code)
         fs0_xz_url = (
-            "https://fileserver.linaro.org/s/rE43RJyTfxPtBkc/"
-            "download/SBSA_FLASH0.fd.xz"
+            "https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/"
+            "20240313-116475/edk2/SBSA_FLASH0.fd.xz"
         )
-        fs0_xz_hash = "cdb8e4ffdaaa79292b7b465693f9e5fae6b7062d"
-        tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash)
+        fs0_xz_hash = "637593749cc307dea7dc13265c32e5d020267552f22b18a31850b8429fc5e159"
+        tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash,
+                                      algorithm='sha256')
         archive.extract(tar_xz_path, self.workdir)
         fs0_path = os.path.join(self.workdir, "SBSA_FLASH0.fd")
 
         # Non-secure rom (UEFI and EFI variables)
         fs1_xz_url = (
-            "https://fileserver.linaro.org/s/AGWPDXbcqJTKS4R/"
-            "download/SBSA_FLASH1.fd.xz"
+            "https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/"
+            "20240313-116475/edk2/SBSA_FLASH1.fd.xz"
         )
-        fs1_xz_hash = "411155ae6984334714dff08d5d628178e790c875"
-        tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash)
+        fs1_xz_hash = "cb0a5e8cf5e303c5d3dc106cfd5943ffe9714b86afddee7164c69ee1dd41991c"
+        tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash,
+                                      algorithm='sha256')
         archive.extract(tar_xz_path, self.workdir)
         fs1_path = os.path.join(self.workdir, "SBSA_FLASH1.fd")
 
@@ -96,15 +98,15 @@ def test_sbsaref_edk2_firmware(self):
 
         # AP Trusted ROM
         wait_for_console_pattern(self, "Booting Trusted Firmware")
-        wait_for_console_pattern(self, "BL1: v2.9(release):v2.9")
+        wait_for_console_pattern(self, "BL1: v2.10.2(release):")
         wait_for_console_pattern(self, "BL1: Booting BL2")
 
         # Trusted Boot Firmware
-        wait_for_console_pattern(self, "BL2: v2.9(release)")
+        wait_for_console_pattern(self, "BL2: v2.10.2(release)")
         wait_for_console_pattern(self, "Booting BL31")
 
         # EL3 Runtime Software
-        wait_for_console_pattern(self, "BL31: v2.9(release)")
+        wait_for_console_pattern(self, "BL31: v2.10.2(release)")
 
         # Non-trusted Firmware
         wait_for_console_pattern(self, "UEFI firmware (version 1.0")

-- 
2.44.0

Re: [PATCH 1/3] tests/avocado: update sbsa-ref firmware

[Philippe Mathieu-Daudé]

On 13/3/24 11:08, Marcin Juszkiewicz wrote:
> We now have CI job to build those and publish in space with
> readable urls.
> 
> Firmware is built using Debian 'bookworm' cross toolchain (gcc 12.2.0).
> 
> Used versions:
> 
> - Trusted Firmware v2.10.2
> - Tianocore EDK2 stable202402
> - Tianocore EDK2 Platforms code commit 085c2fb
> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
>   tests/avocado/machine_aarch64_sbsaref.py | 40 +++++++++++++++++---------------
>   1 file changed, 21 insertions(+), 19 deletions(-)

Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>

[PATCH 2/3] tests/avocado: drop virtio-rng from sbsa-ref tests

[Marcin Juszkiewicz]

sbsa-ref is supposed to emulate real hardware so virtio-rng-pci
does not fit here

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 tests/avocado/machine_aarch64_sbsaref.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
index cbab793455..259225f15f 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -132,10 +132,6 @@ def boot_alpine_linux(self, cpu):
             cpu,
             "-drive",
             f"file={iso_path},format=raw",
-            "-device",
-            "virtio-rng-pci,rng=rng0",
-            "-object",
-            "rng-random,id=rng0,filename=/dev/urandom",
         )
 
         self.vm.launch()
@@ -179,10 +175,6 @@ def boot_openbsd73(self, cpu):
             cpu,
             "-drive",
             f"file={img_path},format=raw",
-            "-device",
-            "virtio-rng-pci,rng=rng0",
-            "-object",
-            "rng-random,id=rng0,filename=/dev/urandom",
         )
 
         self.vm.launch()

-- 
2.44.0

[PATCH 3/3] tests/avocado: use OpenBSD 7.4 for sbsa-ref

[Marcin Juszkiewicz]

7.4 was released in October 2023, time to update before 7.3 gets dropped.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 tests/avocado/machine_aarch64_sbsaref.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
index 259225f15f..94c9f81d72 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -159,14 +159,14 @@ def test_sbsaref_alpine_linux_max(self):
     # This tests the whole boot chain from EFI to Userspace
     # We only boot a whole OS for the current top level CPU and GIC
     # Other test profiles should use more minimal boots
-    def boot_openbsd73(self, cpu):
+    def boot_openbsd(self, cpu):
         self.fetch_firmware()
 
         img_url = (
-            "https://cdn.openbsd.org/pub/OpenBSD/7.3/arm64/miniroot73.img"
+            "https://cdn.openbsd.org/pub/OpenBSD/7.4/arm64/miniroot74.img"
         )
 
-        img_hash = "7fc2c75401d6f01fbfa25f4953f72ad7d7c18650056d30755c44b9c129b707e5"
+        img_hash = "7b08b2ce081cff6408d183f7152ddcfd2779912104866e4fdf6ae2d864b51142"
         img_path = self.fetch_asset(img_url, algorithm="sha256", asset_hash=img_hash)
 
         self.vm.set_console()
@@ -180,23 +180,23 @@ def boot_openbsd73(self, cpu):
         self.vm.launch()
         wait_for_console_pattern(self,
                                  "Welcome to the OpenBSD/arm64"
-                                 " 7.3 installation program.")
+                                 " 7.4 installation program.")
 
-    def test_sbsaref_openbsd73_cortex_a57(self):
+    def test_sbsaref_openbsd_cortex_a57(self):
         """
-        :avocado: tags=cpu:cortex-a57
+        :avocado: tags=cpu:cortex-a57,os:openbsd
         """
-        self.boot_openbsd73("cortex-a57")
+        self.boot_openbsd("cortex-a57")
 
-    def test_sbsaref_openbsd73_neoverse_n1(self):
+    def test_sbsaref_openbsd_neoverse_n1(self):
         """
-        :avocado: tags=cpu:neoverse-n1
+        :avocado: tags=cpu:neoverse-n1,os:openbsd
         """
-        self.boot_openbsd73("neoverse-n1")
+        self.boot_openbsd("neoverse-n1")
 
-    def test_sbsaref_openbsd73_max(self):
+    def test_sbsaref_openbsd_max(self):
         """
-        :avocado: tags=cpu:max
+        :avocado: tags=cpu:max,os:openbsd
         """
-        self.boot_openbsd73("max")
+        self.boot_openbsd("max")
 

-- 
2.44.0

Re: [PATCH 3/3] tests/avocado: use OpenBSD 7.4 for sbsa-ref

[Philippe Mathieu-Daudé]

Hi Marcin,

On 13/3/24 11:08, Marcin Juszkiewicz wrote:
> 7.4 was released in October 2023, time to update before 7.3 gets dropped.
> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
>   tests/avocado/machine_aarch64_sbsaref.py | 26 +++++++++++++-------------
>   1 file changed, 13 insertions(+), 13 deletions(-)


> @@ -180,23 +180,23 @@ def boot_openbsd73(self, cpu):
>           self.vm.launch()
>           wait_for_console_pattern(self,
>                                    "Welcome to the OpenBSD/arm64"
> -                                 " 7.3 installation program.")
> +                                 " 7.4 installation program.")
>   
> -    def test_sbsaref_openbsd73_cortex_a57(self):
> +    def test_sbsaref_openbsd_cortex_a57(self):
>           """
> -        :avocado: tags=cpu:cortex-a57
> +        :avocado: tags=cpu:cortex-a57,os:openbsd

IIRC for some reason we must use one tag per line... Even if
named 'tags', this is handled as a single tag, so we couldn't
filter on "os:openbsd". We need:

   :avocado: tags=cpu:cortex-a57
   :avocado: tags=os:openbsd

>           """
> -        self.boot_openbsd73("cortex-a57")
> +        self.boot_openbsd("cortex-a57")

Re: [PATCH 3/3] tests/avocado: use OpenBSD 7.4 for sbsa-ref

[Marcin Juszkiewicz]

W dniu 13.03.2024 o 12:44, Philippe Mathieu-Daudé pisze:
>> -        :avocado: tags=cpu:cortex-a57
>> +        :avocado: tags=cpu:cortex-a57,os:openbsd
> 
> IIRC for some reason we must use one tag per line... Even if
> named 'tags', this is handled as a single tag, so we couldn't
> filter on "os:openbsd". We need:
> 
>    :avocado: tags=cpu:cortex-a57
>    :avocado: tags=os:openbsd

OK. It worked when I tested this way:

$ make check-avocado AVOCADO_TAGS='machine:sbsa-ref,os:openbsd'
[..]
  (1/3) tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_cortex_a57: PASS (16.18 s)
  (2/3) tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_neoverse_n1: PASS (16.06 s)

$ make check-avocado AVOCADO_TAGS='os:openbsd'
[..]
  (1/3) tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_cortex_a57: PASS (16.18 s)
  (2/3) tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_neoverse_n1: PASS (16.06 s)

Re: [PATCH 3/3] tests/avocado: use OpenBSD 7.4 for sbsa-ref

[Philippe Mathieu-Daudé]

On 13/3/24 14:39, Marcin Juszkiewicz wrote:
> W dniu 13.03.2024 o 12:44, Philippe Mathieu-Daudé pisze:
>>> -        :avocado: tags=cpu:cortex-a57
>>> +        :avocado: tags=cpu:cortex-a57,os:openbsd
>>
>> IIRC for some reason we must use one tag per line... Even if
>> named 'tags', this is handled as a single tag, so we couldn't
>> filter on "os:openbsd". We need:
>>
>>    :avocado: tags=cpu:cortex-a57
>>    :avocado: tags=os:openbsd
> 
> OK. It worked when I tested this way:
> 
> $ make check-avocado AVOCADO_TAGS='machine:sbsa-ref,os:openbsd'
> [..]
>   (1/3) 
> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_cortex_a57: PASS (16.18 s)
>   (2/3) 
> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_neoverse_n1: PASS (16.06 s)
> 
> $ make check-avocado AVOCADO_TAGS='os:openbsd'

Oh great news, TIL!

> [..]
>   (1/3) 
> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_cortex_a57: PASS (16.18 s)
>   (2/3) 
> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_neoverse_n1: PASS (16.06 s)
> 

Re: [PATCH 3/3] tests/avocado: use OpenBSD 7.4 for sbsa-ref

[Philippe Mathieu-Daudé]

On 13/3/24 16:06, Philippe Mathieu-Daudé wrote:
> On 13/3/24 14:39, Marcin Juszkiewicz wrote:
>> W dniu 13.03.2024 o 12:44, Philippe Mathieu-Daudé pisze:
>>>> -        :avocado: tags=cpu:cortex-a57
>>>> +        :avocado: tags=cpu:cortex-a57,os:openbsd
>>>
>>> IIRC for some reason we must use one tag per line... Even if
>>> named 'tags', this is handled as a single tag, so we couldn't
>>> filter on "os:openbsd". We need:
>>>
>>>    :avocado: tags=cpu:cortex-a57
>>>    :avocado: tags=os:openbsd
>>
>> OK. It worked when I tested this way:
>>
>> $ make check-avocado AVOCADO_TAGS='machine:sbsa-ref,os:openbsd'
>> [..]
>>   (1/3) 
>> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_cortex_a57: PASS (16.18 s)
>>   (2/3) 
>> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_neoverse_n1: PASS (16.06 s)
>>
>> $ make check-avocado AVOCADO_TAGS='os:openbsd'
> 
> Oh great news, TIL!

Still thinking a bit about it, using one line for one tag
reduce patch churn when adding/removing tags, and eases
rebasing / cherry-picking.

Re: [PATCH 0/3] tests/avocado: update sbsa-ref firmware to latest

[Philippe Mathieu-Daudé]

Hi Marcin,

On 13/3/24 11:08, Marcin Juszkiewicz wrote:
> Updating sbsa-ref firmware for QEMU CI was manual task. Now it is
> replaced by CI job run on CodeLinaro Gitlab instance.
> 
> This patchset updates to current state:
> 
> - Trusted Firmware v2.10.2 (latest LTS)
> - Tianocore EDK2 stable202402 (latest release)
> 
> And Tianocore EDK2-platforms commit 085c2fb (edk2-platforms does not
> have releases).
> 
> Firmware images were built using Debian 'bookworm' cross gcc 12.2.0
> compiler.
> 
> And while I am in that file I dropped use of 'virtio-rng-pci' device as
> sbsa-ref is supposed to emulate physical hardware.
> 
> OpenBSD updated to 7.4 version.
> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
> Marcin Juszkiewicz (3):
>        tests/avocado: update sbsa-ref firmware
>        tests/avocado: drop virtio-rng from sbsa-ref tests
>        tests/avocado: use OpenBSD 7.4 for sbsa-ref

Hmm 'max' is timeouting:

  (1/7) test_sbsaref_edk2_firmware: PASS (9.99 s)
  (2/7) test_sbsaref_alpine_linux_cortex_a57: PASS (54.82 s)
  (3/7) test_sbsaref_alpine_linux_neoverse_n1: PASS (53.09 s)
  (4/7) test_sbsaref_alpine_linux_max: INTERRUPTED: Runner error 
occurred: Timeout reached... (180.51 s)
  (5/7) test_sbsaref_openbsd_cortex_a57: PASS (33.45 s)
  (6/7) test_sbsaref_openbsd_neoverse_n1: PASS (22.15 s)
  (7/7) test_sbsaref_openbsd_max: INTERRUPTED: Runner error occurred: 
Timeout reached... (180.42 s)
RESULTS    : PASS 5 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 2 | 
CANCEL 0
JOB TIME   : 537.48 s

Using impdef pauth ...

-- >8 --
diff --git a/tests/avocado/machine_aarch64_sbsaref.py 
b/tests/avocado/machine_aarch64_sbsaref.py
index 94c9f81d72..d349ce73ae 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -156 +156 @@ def test_sbsaref_alpine_linux_max(self):
-        self.boot_alpine_linux("max")
+        self.boot_alpine_linux("max,pauth-impdef=on")
@@ -201 +201 @@ def test_sbsaref_openbsd_max(self):
-        self.boot_openbsd("max")
+        self.boot_openbsd("max,pauth-impdef=on")
---

... I still get:

  (1/7) test_sbsaref_edk2_firmware: PASS (5.56 s)
  (2/7) test_sbsaref_alpine_linux_cortex_a57: PASS (53.09 s)
  (3/7) test_sbsaref_alpine_linux_neoverse_n1: PASS (53.00 s)
  (4/7) test_sbsaref_alpine_linux_max: PASS (70.99 s)
  (5/7) test_sbsaref_openbsd_cortex_a57: PASS (22.63 s)
  (6/7) test_sbsaref_openbsd_neoverse_n1: PASS (22.56 s)
  (7/7) test_sbsaref_openbsd_max: INTERRUPTED: Timeout reached... (180.43 s)
RESULTS    : PASS 6 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 1 | 
CANCEL 0
JOB TIME   : 409.29 s

What about disabling path on openbsd and using @skip tags?

-- >8 --
diff --git a/tests/avocado/machine_aarch64_sbsaref.py 
b/tests/avocado/machine_aarch64_sbsaref.py
index 94c9f81d72..c6ee7332a9 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -142,2 +142,3 @@ def test_sbsaref_alpine_linux_cortex_a57(self):
          :avocado: tags=cpu:cortex-a57
+        :avocado: tags=os:linux
          """
@@ -148,2 +149,3 @@ def test_sbsaref_alpine_linux_neoverse_n1(self):
          :avocado: tags=cpu:neoverse-n1
+        :avocado: tags=os:linux
          """
@@ -151,2 +153,17 @@ def test_sbsaref_alpine_linux_neoverse_n1(self):

+    def test_sbsaref_alpine_linux_max_pauth_off(self):
+        """
+        :avocado: tags=cpu:max
+        :avocado: tags=os:linux
+        """
+        self.boot_alpine_linux("max,pauth=off")
+
+    def test_sbsaref_alpine_linux_max_pauth_impdef(self):
+        """
+        :avocado: tags=cpu:max
+        :avocado: tags=os:linux
+        """
+        self.boot_alpine_linux("max,pauth-impdef=on")
+
+    @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might 
timeout')
      def test_sbsaref_alpine_linux_max(self):
@@ -154,2 +171,3 @@ def test_sbsaref_alpine_linux_max(self):
          :avocado: tags=cpu:max
+        :avocado: tags=os:linux
          """
@@ -186,3 +204,4 @@ def test_sbsaref_openbsd_cortex_a57(self):
          """
-        :avocado: tags=cpu:cortex-a57,os:openbsd
+        :avocado: tags=cpu:cortex-a57
+        :avocado: tags=os:openbsd
          """
@@ -192,3 +211,4 @@ def test_sbsaref_openbsd_neoverse_n1(self):
          """
-        :avocado: tags=cpu:neoverse-n1,os:openbsd
+        :avocado: tags=cpu:neoverse-n1
+        :avocado: tags=os:openbsd
          """
@@ -196,7 +216,24 @@ def test_sbsaref_openbsd_neoverse_n1(self):

+    def test_sbsaref_openbsd_max_pauth_off(self):
+        """
+        :avocado: tags=cpu:max
+        :avocado: tags=os:openbsd
+        """
+        self.boot_openbsd("max,pauth=off")
+
+    @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might 
timeout')
+    def test_sbsaref_openbsd_max_pauth_impdef(self):
+        """
+        :avocado: tags=cpu:max
+        :avocado: tags=os:openbsd
+        """
+        self.boot_openbsd("max,pauth-impdef=on")
+
+    @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might 
timeout')
      def test_sbsaref_openbsd_max(self):
          """
-        :avocado: tags=cpu:max,os:openbsd
+        :avocado: tags=cpu:max
+        :avocado: tags=os:openbsd
          """
-        self.boot_openbsd("max")
+        self.boot_openbsd("max,pauth-impdef=on")

---

However OpenBSD still timeouts at 180s:

  (01/11) test_sbsaref_edk2_firmware: PASS (7.25 s)
  (02/11) test_sbsaref_alpine_linux_cortex_a57: PASS (54.30 s)
  (03/11) test_sbsaref_alpine_linux_neoverse_n1: PASS (52.25 s)
  (04/11) test_sbsaref_alpine_linux_max_pauth_off: PASS (53.31 s)
  (05/11) test_sbsaref_alpine_linux_max_pauth_impdef: PASS (72.72 s)
  (06/11) test_sbsaref_alpine_linux_max: SKIP: Test might timeout
  (07/11) test_sbsaref_openbsd_cortex_a57: PASS (22.37 s)
  (08/11) test_sbsaref_openbsd_neoverse_n1: PASS (22.98 s)
  (09/11) test_sbsaref_openbsd_max_pauth_off: INTERRUPTED: Timeout 
reached... (180.54 s)
  (10/11) test_sbsaref_openbsd_max_pauth_impdef: SKIP: Test might timeout
  (11/11) test_sbsaref_openbsd_max: SKIP: Test might timeout

Regards,

Phil.