From patchwork Thu Mar 2 19:11:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 13157759 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4E651C678D4 for ; Thu, 2 Mar 2023 19:14:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXoLT-0008Jo-00; Thu, 02 Mar 2023 14:12:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXoLR-0008FH-Mn; Thu, 02 Mar 2023 14:12:01 -0500 Received: from muminek.juszkiewicz.com.pl ([213.251.184.221]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXoLQ-0006iU-16; Thu, 02 Mar 2023 14:12:01 -0500 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 7980A261092; Thu, 2 Mar 2023 20:11:56 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at juszkiewicz.com.pl Received: from muminek.juszkiewicz.com.pl ([127.0.0.1]) by localhost (muminek.juszkiewicz.com.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IdTaJIq_VHC0; Thu, 2 Mar 2023 20:11:51 +0100 (CET) Received: from puchatek.lan (83.11.36.13.ipv4.supernova.orange.pl [83.11.36.13]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTPSA id C74EA260167; Thu, 2 Mar 2023 20:11:50 +0100 (CET) From: Marcin Juszkiewicz To: Radoslaw Biernacki , Peter Maydell , Leif Lindholm Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Marcin Juszkiewicz Subject: [PATCH 1/3] tests/avocado: update AArch64 tests to Alpine 3.17.2 Date: Thu, 2 Mar 2023 20:11:44 +0100 Message-Id: <20230302191146.1790560-1-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: softfail client-ip=213.251.184.221; envelope-from=marcin.juszkiewicz@linaro.org; helo=muminek.juszkiewicz.com.pl X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org To test Alpine boot on SBSA-Ref target we need Alpine Linux 'standard' image as 'virt' one lacks kernel modules. So to minimalize Avocado cache I move test to 'standard' image. Signed-off-by: Marcin Juszkiewicz Reviewed-by: Alex Bennée --- tests/avocado/machine_aarch64_virt.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/avocado/machine_aarch64_virt.py b/tests/avocado/machine_aarch64_virt.py index 25dab8dc00..a90dc6ff4b 100644 --- a/tests/avocado/machine_aarch64_virt.py +++ b/tests/avocado/machine_aarch64_virt.py @@ -38,11 +38,11 @@ def test_alpine_virt_tcg_gic_max(self): :avocado: tags=accel:tcg """ iso_url = ('https://dl-cdn.alpinelinux.org/' - 'alpine/v3.16/releases/aarch64/' - 'alpine-virt-3.16.3-aarch64.iso') + 'alpine/v3.17/releases/aarch64/' + 'alpine-standard-3.17.2-aarch64.iso') # Alpine use sha256 so I recalculated this myself - iso_sha1 = '0683bc089486d55c91bf6607d5ecb93925769bc0' + iso_sha1 = '76284fcd7b41fe899b0c2375ceb8470803eea839' iso_path = self.fetch_asset(iso_url, asset_hash=iso_sha1) self.vm.set_console() @@ -65,7 +65,7 @@ def test_alpine_virt_tcg_gic_max(self): self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom') self.vm.launch() - self.wait_for_console_pattern('Welcome to Alpine Linux 3.16') + self.wait_for_console_pattern('Welcome to Alpine Linux 3.17') def common_aarch64_virt(self, machine): From patchwork Thu Mar 2 19:11:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 13157758 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 94E1CC6FA8E for ; Thu, 2 Mar 2023 19:13:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXoLV-0008Oi-SA; Thu, 02 Mar 2023 14:12:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXoLS-0008Gq-2n; Thu, 02 Mar 2023 14:12:02 -0500 Received: from muminek.juszkiewicz.com.pl ([213.251.184.221]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXoLQ-0006iV-04; Thu, 02 Mar 2023 14:12:01 -0500 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 65546260167; Thu, 2 Mar 2023 20:11:57 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at juszkiewicz.com.pl Received: from muminek.juszkiewicz.com.pl ([127.0.0.1]) by localhost (muminek.juszkiewicz.com.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QRogIvaknRxn; Thu, 2 Mar 2023 20:11:52 +0100 (CET) Received: from puchatek.lan (83.11.36.13.ipv4.supernova.orange.pl [83.11.36.13]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTPSA id A40DA260729; Thu, 2 Mar 2023 20:11:51 +0100 (CET) From: Marcin Juszkiewicz To: Radoslaw Biernacki , Peter Maydell , Leif Lindholm Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Marcin Juszkiewicz Subject: [PATCH 2/3] tests/avocado: Add set of boot tests on SBSA-ref Date: Thu, 2 Mar 2023 20:11:45 +0100 Message-Id: <20230302191146.1790560-2-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230302191146.1790560-1-marcin.juszkiewicz@linaro.org> References: <20230302191146.1790560-1-marcin.juszkiewicz@linaro.org> MIME-Version: 1.0 Received-SPF: softfail client-ip=213.251.184.221; envelope-from=marcin.juszkiewicz@linaro.org; helo=muminek.juszkiewicz.com.pl X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Philippe Mathieu-Daudé This change adds set of boot tests on SBSA-ref machine: 1. boot TF-A up to the EDK2 banner 2. boot Linux kernel/initrd up to Busybox shell Prebuilt flash volumes are included, built using upstream documentation. EDK2 and TF-A are updated to have SVE/SME properly enabled for 'max' cpu. Linux kernel/initrd are from Debian 'bookworm' installer with "init=/bin/sh" kernel argument. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Marcin Juszkiewicz --- MAINTAINERS | 1 + tests/avocado/machine_aarch64_sbsaref.py | 150 +++++++++++++++++++++++ 2 files changed, 151 insertions(+) create mode 100644 tests/avocado/machine_aarch64_sbsaref.py diff --git a/MAINTAINERS b/MAINTAINERS index 76662969d7..df0dfd4bc3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -916,6 +916,7 @@ L: qemu-arm@nongnu.org S: Maintained F: hw/arm/sbsa-ref.c F: docs/system/arm/sbsa.rst +F: tests/avocado/machine_aarch64_sbsaref.py Sharp SL-5500 (Collie) PDA M: Peter Maydell diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py new file mode 100644 index 0000000000..e36e53d4d5 --- /dev/null +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -0,0 +1,150 @@ +# Functional test that boots a Linux kernel and checks the console +# +# SPDX-FileCopyrightText: 2023 Linaro Ltd. +# SPDX-FileContributor: Philippe Mathieu-Daudé +# SPDX-FileContributor: Marcin Juszkiewicz +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import shutil + +from avocado.utils import archive + +from avocado_qemu import QemuSystemTest +from avocado_qemu import wait_for_console_pattern +from avocado_qemu import interrupt_interactive_console_until_pattern + + +class Aarch64SbsarefMachine(QemuSystemTest): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=machine:sbsa-ref + """ + + def fetch_firmware(self): + """ + Flash volumes generated using: + + - Fedora GNU Toolchain version 12.2.1 20220819 (Red Hat Cross 12.2.1-2) + + - Trusted Firmware-A + https://github.com/ARM-software/arm-trusted-firmware/tree/6264643a + + - Tianocore EDK II + https://github.com/tianocore/edk2/tree/f6ce1a5c + https://github.com/tianocore/edk2-non-osi/tree/74d4da60 + https://github.com/tianocore/edk2-platforms/tree/0540e1a2 + """ + + # Secure BootRom (TF-A code) + fs0_xz_url = ('https://fileserver.linaro.org/s/sZay4ZCCfHSXPKj/' + 'download/SBSA_FLASH0.fd.xz') + fs0_xz_hash = 'e74778cbb8e1aa0b77f8883565b9a18db638f6bb' + 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') + + # Non-secure rom (UEFI and EFI variables) + fs1_xz_url = ('https://fileserver.linaro.org/s/osHNaypByLa9xDK/' + 'download/SBSA_FLASH1.fd.xz') + fs1_xz_hash = '7d9f1a6b8964b8b99144f7e905a4083f31e31ad3' + tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash) + archive.extract(tar_xz_path, self.workdir) + fs1_path = os.path.join(self.workdir, 'SBSA_FLASH1.fd') + + for path in [fs0_path, fs1_path]: + with open(path, 'ab+') as fd: + fd.truncate(256 << 20) # Expand volumes to 256MiB + + self.vm.set_console() + self.vm.add_args('-drive', f'if=pflash,file={fs0_path},format=raw', + '-drive', f'if=pflash,file={fs1_path},format=raw') + + def test_sbsaref_tfa_v2_8(self): + """ + :avocado: tags=cpu:cortex-a57 + """ + + self.fetch_firmware() + self.vm.launch() + + # TF-A boot sequence: + # + # https://github.com/ARM-software/arm-trusted-firmware/blob/v2.8.0/\ + # docs/design/trusted-board-boot.rst#trusted-board-boot-sequence + # https://trustedfirmware-a.readthedocs.io/en/v2.8/\ + # design/firmware-design.html#cold-boot + + # 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: Booting BL2') + + # Trusted Boot Firmware + wait_for_console_pattern(self, 'BL2: v2.8(release)') + wait_for_console_pattern(self, 'Booting BL31') + + # EL3 Runtime Software + wait_for_console_pattern(self, 'BL31: v2.8(release)') + + # Non-trusted Firmware + wait_for_console_pattern(self, 'UEFI firmware (version 1.0') + interrupt_interactive_console_until_pattern(self, + 'QEMU SBSA-REF Machine') + + def boot_linux(self, cpu='cortex-a57'): + """ + :avocado: tags=cpu:cortex-a57 + """ + self.fetch_firmware() + + os.makedirs(f'{self.workdir}/vfat/efi/boot') + + # UEFI shell binary + shell_url = ('https://fileserver.linaro.org/s/SGoyRrEzkmW8C8Y/' + 'download/bootaa64.efi') + shell_sha1 = '5a8791eb130406d1a659e538b1a194a604a29a78' + shell_path = self.fetch_asset(shell_url, shell_sha1) + shutil.copyfile(shell_path, + f'{self.workdir}/vfat/efi/boot/bootaa64.efi') + + # Debian 'bookworm' d-i kernel from 8th Feb 2023 + linux_url = ('https://fileserver.linaro.org/s/L8JMwEZQK8SDR39/' + 'download/linux') + linux_sha1 = '39a75284783ab63626642228fbac1863492d30b5' + linux_path = self.fetch_asset(linux_url, linux_sha1) + shutil.copyfile(linux_path, f'{self.workdir}/vfat/linux') + + # Debian 'bookworm' d-i initrd.gz from 8th Feb 2023 + initrd_url = ('https://fileserver.linaro.org/s/NmYTxezZNKGF5P4/' + 'download/initrd.gz') + initrd_sha1 = '1404d0129cbd0bff7aaa589ddbea3cdb7c0d4c1d' + initrd_path = self.fetch_asset(initrd_url, initrd_sha1) + shutil.copyfile(initrd_path, f'{self.workdir}/vfat/initrd.gz') + + with open(f'{self.workdir}/vfat/startup.nsh', 'w') as script: + script.write('fs0:\\linux initrd=\\initrd.gz init=/bin/sh') + + self.vm.add_args('-cpu', cpu, + '-drive', + f'file=fat:rw:{self.workdir}/vfat/,format=raw') + self.vm.launch() + + # Exit UEFI + wait_for_console_pattern(self, 'EFI stub: Exiting boot services...') + + # init=/bin/sh started + wait_for_console_pattern(self, 'BusyBox v1.35.0 (Debian') + + def test_sbsaref_linux_a57(self): + """ + :avocado: tags=cpu:cortex-a57 + """ + self.boot_linux('cortex-a57') + + def test_sbsaref_linux_max(self): + """ + :avocado: tags=cpu:max + """ + self.boot_linux('max') From patchwork Thu Mar 2 19:11:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 13157757 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3438FC6FA8E for ; Thu, 2 Mar 2023 19:13:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXoLm-0000Jr-PG; Thu, 02 Mar 2023 14:12:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXoLW-0008PO-55; Thu, 02 Mar 2023 14:12:06 -0500 Received: from muminek.juszkiewicz.com.pl ([213.251.184.221]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXoLU-0006jN-CK; Thu, 02 Mar 2023 14:12:05 -0500 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 89055260167; Thu, 2 Mar 2023 20:12:02 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at juszkiewicz.com.pl Received: from muminek.juszkiewicz.com.pl ([127.0.0.1]) by localhost (muminek.juszkiewicz.com.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SznqlDZupR5i; Thu, 2 Mar 2023 20:11:56 +0100 (CET) Received: from puchatek.lan (83.11.36.13.ipv4.supernova.orange.pl [83.11.36.13]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTPSA id 550682606A3; Thu, 2 Mar 2023 20:11:52 +0100 (CET) From: Marcin Juszkiewicz To: Radoslaw Biernacki , Peter Maydell , Leif Lindholm Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Marcin Juszkiewicz Subject: [PATCH 3/3] tests/avocado: add Alpine Linux boot on AArch64/sbsa-ref Date: Thu, 2 Mar 2023 20:11:46 +0100 Message-Id: <20230302191146.1790560-3-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230302191146.1790560-1-marcin.juszkiewicz@linaro.org> References: <20230302191146.1790560-1-marcin.juszkiewicz@linaro.org> MIME-Version: 1.0 Received-SPF: softfail client-ip=213.251.184.221; envelope-from=marcin.juszkiewicz@linaro.org; helo=muminek.juszkiewicz.com.pl X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org To unify tests for AArch64/virt and AArch64/sbsa-ref we boot same Alpine Linux image on both. Signed-off-by: Marcin Juszkiewicz --- tests/avocado/machine_aarch64_sbsaref.py | 29 ++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index e36e53d4d5..fdbde4b891 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -148,3 +148,32 @@ def test_sbsaref_linux_max(self): :avocado: tags=cpu:max """ self.boot_linux('max') + + # 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 test_alpine_sbsaref_max(self): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=machine:sbsa-ref + """ + self.fetch_firmware() + + iso_url = ('https://dl-cdn.alpinelinux.org/' + 'alpine/v3.17/releases/aarch64/' + 'alpine-standard-3.17.2-aarch64.iso') + + # Alpine use sha256 so I recalculated this myself + iso_sha1 = '76284fcd7b41fe899b0c2375ceb8470803eea839' + iso_path = self.fetch_asset(iso_url, asset_hash=iso_sha1) + + self.vm.set_console() + self.vm.add_args("-cpu", "max,pauth-impdef=on") + self.vm.add_args("-machine", "sbsa-ref") + self.vm.add_args("-drive", f"file={iso_path},format=raw") + self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0') + self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom') + + self.vm.launch() + wait_for_console_pattern(self, 'Welcome to Alpine Linux 3.17') +