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: 658138 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp66400wrb; Thu, 2 Mar 2023 11:13:51 -0800 (PST) X-Google-Smtp-Source: AK7set90gx4LVBuW/ctgncB3ABfsgZME3T3La4sAa+3xcC9C9ZcvqomROV7nmpG/b+7Sh/cKjmAV X-Received: by 2002:a05:6214:2487:b0:539:b68e:3444 with SMTP id gi7-20020a056214248700b00539b68e3444mr22962517qvb.27.1677784431326; Thu, 02 Mar 2023 11:13:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677784431; cv=none; d=google.com; s=arc-20160816; b=dhwOHfX4eb8Gre+J+7WMaYce9a54mLqejiYmmCVK+9NEcSRvirR2lUwU3WGB6bFBx/ bNTq1Ogr3WjuBKcFJMal7jH/tQd87t8VaqOeBon1eet/U6kZru9Du5sr+s/odoHuhftQ tARYZy3RuCnjDTU27o1SGRFZP3QKNXZqsCGuOd4LBqAo2frrfniRIao76CzN1943BRaw FC2Fe6KoKp2BLwdkPxMS4h0dku+hn9GGIVq5wdLWW+XSeBo3w2brNTpqDvEPK055bybV NPCmS8+VfzH6dUzFP1+uu6DtUgvH0+1lczPfYCxID538sqLBloVhs03L8I4UlFtOdAt4 I9mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=ADkt6+asEqaAt6jraUKUwdFs055AbPsdyjeTB2kLXFQ=; b=gFlNSWmk5F2tO1mhL8BSq0QYeaSRaCRJwCO+zkUG+w1mgM8ynTkOqYR+j2RSuHzvh+ 4NJpO87oTrTqCkEyZUV9xQwfTFG4/8qjGUaA8AFZzr4TMVuuLfEALyWz+eSUQFTqOolz xhW4WEfMrH2CWV0mGSU26PGvMjGIajuqqNeKs7PLqXc0kpTMPlMTfXihUQbURV4b5lEf XoLi63KxXv5CkWHO85RaGaNgbrpZ1lIx0l6zMgRB2ro0WzmqKNT3BmatmlwXin76gPsQ /c97rQCxB70//TMFnIE6UtE4jYxBE9bxnSVXqy80zLEhg04opwuefcQvu+q9Ch/ZYaYD CYPQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g22-20020a0caad6000000b0056eab95c1ccsi13538906qvb.81.2023.03.02.11.13.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Mar 2023 11:13:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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')