Skip to content

Commit

Permalink
tests/avocado: update firmware to enable sbsa-ref/max
Browse files Browse the repository at this point in the history
Update prebuilt firmware images to have TF-A with FEAT_FGT support
enabled. This allowed us to enable test for "max" cpu in sbsa-ref
machine.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Message-Id: <20230530152240.79160-1-marcin.juszkiewicz@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230630180423.558337-17-alex.bennee@linaro.org>
  • Loading branch information
hrw authored and stsquad committed Jul 3, 2023
1 parent 0101dd7 commit 9fe8fa0
Showing 1 changed file with 10 additions and 13 deletions.
23 changes: 10 additions & 13 deletions tests/avocado/machine_aarch64_sbsaref.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,23 @@ def fetch_firmware(self):
"""
Flash volumes generated using:
- Fedora GNU Toolchain version 12.2.1 20220819 (Red Hat Cross 12.2.1-2)
- Fedora GNU Toolchain version 13.1.1 20230511 (Red Hat 13.1.1-2)
- Trusted Firmware-A
https://github.com/ARM-software/arm-trusted-firmware/tree/5fdb2e54
https://github.com/ARM-software/arm-trusted-firmware/tree/c0d8ee38
- Tianocore EDK II
https://github.com/tianocore/edk2/tree/494127613b
https://github.com/tianocore/edk2-non-osi/tree/41876073
https://github.com/tianocore/edk2-platforms/tree/8efa4f42
https://github.com/tianocore/edk2/tree/0f9283429dd4
https://github.com/tianocore/edk2-non-osi/tree/f0bb00937ad6
https://github.com/tianocore/edk2-platforms/tree/7880b92e2a04
"""

# Secure BootRom (TF-A code)
fs0_xz_url = (
"https://fileserver.linaro.org/s/ATnSmq6k8SoXgbH/"
"https://fileserver.linaro.org/s/HrYMCjP7MEccjRP/"
"download/SBSA_FLASH0.fd.xz"
)
fs0_xz_hash = "a210a09692bcbe0a3743ffd0df44e80e0c7ad8ab"
fs0_xz_hash = "447eff64a90b84ce47703c6ec41fbfc25befaaea"
tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash)
archive.extract(tar_xz_path, self.workdir)
fs0_path = os.path.join(self.workdir, "SBSA_FLASH0.fd")
Expand Down Expand Up @@ -93,15 +93,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.8(release):v2.8")
wait_for_console_pattern(self, "BL1: v2.9(release):v2.9")
wait_for_console_pattern(self, "BL1: Booting BL2")

# Trusted Boot Firmware
wait_for_console_pattern(self, "BL2: v2.8(release)")
wait_for_console_pattern(self, "BL2: v2.9(release)")
wait_for_console_pattern(self, "Booting BL31")

# EL3 Runtime Software
wait_for_console_pattern(self, "BL31: v2.8(release)")
wait_for_console_pattern(self, "BL31: v2.9(release)")

# Non-trusted Firmware
wait_for_console_pattern(self, "UEFI firmware (version 1.0")
Expand Down Expand Up @@ -136,21 +136,18 @@ def boot_alpine_linux(self, cpu):
self.vm.launch()
wait_for_console_pattern(self, "Welcome to Alpine Linux 3.17")

@skipUnless(os.getenv("AVOCADO_TIMEOUT_EXPECTED"), "Test might timeout")
def test_sbsaref_alpine_linux_cortex_a57(self):
"""
:avocado: tags=cpu:cortex-a57
"""
self.boot_alpine_linux("cortex-a57")

@skipUnless(os.getenv("AVOCADO_TIMEOUT_EXPECTED"), "Test might timeout")
def test_sbsaref_alpine_linux_neoverse_n1(self):
"""
:avocado: tags=cpu:max
"""
self.boot_alpine_linux("neoverse-n1")

@skip("requires TF-A update to handle FEAT_FGT")
def test_sbsaref_alpine_linux_max(self):
"""
:avocado: tags=cpu:max
Expand Down

0 comments on commit 9fe8fa0

Please sign in to comment.