From patchwork Mon Jun 26 21:59:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 696509 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3449915wrm; Mon, 26 Jun 2023 15:08:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5VFTLs+0LEbu7sIGI0CpkgFJ3zvY5R/0xB9V5NYtsowgZNPFS0jFcCxBvmusrqSSK2g6iX X-Received: by 2002:a05:6214:d42:b0:62d:ee5a:514b with SMTP id 2-20020a0562140d4200b0062dee5a514bmr45641530qvr.11.1687817288066; Mon, 26 Jun 2023 15:08:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687817288; cv=none; d=google.com; s=arc-20160816; b=yvpwpRMCOvnVg8lr0VDmISpNlADd0dziQUXG6sPPqZmlFwVUq4OUlhzsZoIeZ20Wr4 5BY2x6Zef7AWzdpqCMTUu5EPbg5ZPJZawXsA1DOjE8c+/McwmRNlrVSFU5r4B/hFl+1E JovoJM3oiycrcsOEV80Vo7T89Kgp3nstrteb9J1WENUF/HNUPfSwzJQa7gT/9u4plUxC NJikpO92LBzcpojUK3uucRSmdcdYiYbZTnDVTEU2Un4jF8Iog34/+LFEml6zQOulXiMD g2TcQtPE6Z+eMbMLYLemmfZ7zo2ioiCej5cmAHVFSiuCDMBCjXWvLm1Y+2EmD25CAJ41 Sk9Q== 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:dkim-signature; bh=AouWM1m7VIgcxf/wQ9k/4ktgNJVDqALSrdqBKb0paEY=; fh=sQEya64SXtq2IEsk3H77u01QQAMvGjGQGvqUW/mcVd0=; b=F8/Y20txFOwRB91wzSydKLt0QniaSLO3d7AX7CO/96hDtsr3d7cJogeWRIsCz4aZSf pnxeH+Mh38yyTt20GKrB3P6wTGLy/r1jQw+YNmAxO/rcTI0cXe7wfoqXR93zyW2hG0Uq pl7NoJ2Co1lgfIn6T5/mnmNt/Zxjcss5ccpByoyjMEBjeLAajzyKcoKBa0umGGuZXiFD OOl/C24/raXs+r93GFB8yqzJkqrMp6dQhLXb0IfSkKrt5nY78dSGL1LYOYf/fag66NRQ BrskCZ/e3D5h42Y57i0pN0z3OKgVMRey/070LM1HOXF1o/jzlTaMKRIQhLaSNgHLlr+L YseA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fY6BUgKC; 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=pass (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 ke25-20020a056214301900b0063217340105si122853qvb.536.2023.06.26.15.08.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 15:08:08 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=fY6BUgKC; 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=pass (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 1qDuFO-0002kV-OF; Mon, 26 Jun 2023 17:59:46 -0400 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 1qDuFK-0002gO-76 for qemu-devel@nongnu.org; Mon, 26 Jun 2023 17:59:42 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qDuFE-0004un-FE for qemu-devel@nongnu.org; Mon, 26 Jun 2023 17:59:41 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fa99742be2so14461075e9.1 for ; Mon, 26 Jun 2023 14:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687816775; x=1690408775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AouWM1m7VIgcxf/wQ9k/4ktgNJVDqALSrdqBKb0paEY=; b=fY6BUgKC6JbIlKSwRFP4CZsDSYFDw+GCPyGvkhP+csObfxgbiH9l7fBPw6DAMU3HhW pCxsLuYkWdvgaElpn55poamF1PrLHAinrMpr25SWmycaqZHZVEytuG1P8vkjsn+TePrm ZNzksos+pWaIAzbSGDmNlKDW7zyvpo/37oPkoGVEABUE2T6PH1YZ3Ix0B+1jre2Md1BJ 4scqYOFdTnCyhgBG9PoicI0NknlxPF3dIyr4OCIo5/JQ5AbNDKbBQKEEOaRTcaXtAQ23 EOx9ENdGFKZn3vW5jkXFAqBf/3TiJ8FY+agHwsuNEOhxyoM0jyiP4yrx9Ir4G0NAQwev o2nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687816775; x=1690408775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AouWM1m7VIgcxf/wQ9k/4ktgNJVDqALSrdqBKb0paEY=; b=fVz05PkyBBPCaK/lJN62KgQrFBUaVeTKREU8k7QATUsQUHO5JYWtt3iS4K8JhME7oZ nplmg9ZIAvneDfcc2jF7dYco++P8nqIIhXVLmnq8pRGUWLJB5InjNsg4zzt4TNrGw2mc KxIGjjR+QxrhTBWNuGybwWISao9xomlYSr9eHsqmd6TXrEYvdyt5TPTRlturghxhptg7 UGzNdGrlRqjcSDcYmtHTpf5xHrC5VfUg0Mr8M5OifXLFNFfPbGk+YtKFRIGQLoywJzm1 ZMZEaDED1cGAnpOVqsZNFatMjVWVN+YR5fTtH/8uJZRYu8z6uXeUqC1AbnizI4dSZWvM ot3g== X-Gm-Message-State: AC+VfDzLzpKtUNgVZCjMXv4EPAC90e6egKNIHpZXNPeLfbyCVEQKtrHX 7P5XOO07gLj4bZLxP2XsyN2fkA== X-Received: by 2002:a05:600c:221a:b0:3fb:a1d9:ede8 with SMTP id z26-20020a05600c221a00b003fba1d9ede8mr170099wml.10.1687816775142; Mon, 26 Jun 2023 14:59:35 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id s25-20020a7bc399000000b003fa96fe2bebsm3889438wmj.41.2023.06.26.14.59.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 14:59:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B6F8F1FFC8; Mon, 26 Jun 2023 22:59:28 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Alexander Bulekov , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Juan Quintela , Alexandre Iooss , Thomas Huth , Marcel Apfelbaum , Leif Lindholm , Riku Voipio , Peter Maydell , Paolo Bonzini , Bandan Das , Leonardo Bras , Cleber Rosa , Richard Henderson , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Mahmoud Mandour , Stefan Hajnoczi , Yanan Wang , Eduardo Habkost , Bin Meng , qemu-arm@nongnu.org, Wainer dos Santos Moschetta , Darren Kenny , Radoslaw Biernacki , Marcin Juszkiewicz , Qiuhao Li , Laurent Vivier Subject: [PATCH v2 16/26] tests/avocado: update firmware to enable sbsa-ref/max Date: Mon, 26 Jun 2023 22:59:16 +0100 Message-Id: <20230626215926.2522656-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230626215926.2522656-1-alex.bennee@linaro.org> References: <20230626215926.2522656-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: Marcin Juszkiewicz 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 Message-Id: <20230530152240.79160-1-marcin.juszkiewicz@linaro.org> Signed-off-by: Alex Bennée --- v3 - re-enable for CI --- tests/avocado/machine_aarch64_sbsaref.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index 0a79fa7ab6..cce6ef9f65 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -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") @@ -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") @@ -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