From patchwork Fri Jun 30 18:04:01 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: 697978 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp597589wrs; Fri, 30 Jun 2023 11:15:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlH7qrygG1lGzYNMdhVnnmfsBDQ3YwJgEOnQ85hR4I1c/OYYWs4/OHmmsENzT3fITWA9dpFr X-Received: by 2002:a05:6358:f1a:b0:127:f810:a78a with SMTP id b26-20020a0563580f1a00b00127f810a78amr3037898rwj.20.1688148954669; Fri, 30 Jun 2023 11:15:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688148954; cv=none; d=google.com; s=arc-20160816; b=egru5WOYwf4QMqeUdmWJTo6TXpfxXJl04/NJT/6pwMyXIXCui0tkk1p2geKJZFkCiv GSbHZZBVBOK+ICfmTh7wV3T+Sr5XPiCcHUu7Z+702XgXhkCGBcNE85SMpnsWsE5/6dIr DRUvqKif+4Zf7AZtPvkigYjBbZRh8eCgUjR3K+JW++XUvKOTFTqJIxFaXbJJ5YQ6mWmY tTefpmBi5kZJBXYdxYgACOcl83WPa1Rd8Si4nppJAivStLQDCMQpRvpG/xTMRzYhIBeh QhjMMRcozac8FZKpTOiuw46uH4LCaVerBvPXCNWLMlo3ZcPpBdj+pZitI68fwBLnLfn2 ALXg== 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=OltHerz+Vf7zZkebZbScoRT4WgVwJDskRS7DoEjx2Hw=; b=K2irCLzvloenaTJ6Qa+wnvyiMhR7ibzDBSLJAtQ1IQubbKVxD/P9r9f7YRABKJGljI hZWx9AvX0USI2iIT6Yni8MYDxsYzBNMgTYsIXRMpqr1dXSseNA3fr5JXCihKV1fZL/uP 7iWaSAjbXIb7fKln9XyADBubmHFbMFCIOpVreQDIq/CLEhBaC7vlJLzo/STv3GB+CNte yLJvN4PiwsOWDL5F0FCGLIY0gmBdSd0/D9e4b7TciX+fJcmxqsXUJQRjDK8aeuozAS8U 3NZ3/OThFNk6gb3RxDyRzRD9YF3yF1irzigu6+SUJkI//XihFOYLS2P9JkdZFfiC1rxN Auqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=StMOqtM0; 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 r19-20020ac85c93000000b003f94afc0694si8277655qta.188.2023.06.30.11.15.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jun 2023 11:15:54 -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=StMOqtM0; 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 1qFIdB-0005r7-80; Fri, 30 Jun 2023 14:14:05 -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 1qFIcp-0005bF-8H for qemu-devel@nongnu.org; Fri, 30 Jun 2023 14:13:47 -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 1qFIcj-0003ZR-ET for qemu-devel@nongnu.org; Fri, 30 Jun 2023 14:13:42 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fba545d743so24805935e9.0 for ; Fri, 30 Jun 2023 11:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688148816; x=1690740816; 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=StMOqtM0mw6tRLQ4Zr89gPd/skzqqmyl4AEx1umhVntwoUchrXQeace8LMFC5emKdI FnX8OHYQiHi8V35uB8tECmq5iF8+G2oiJ5/f3X/YmRVSvbsUcJsmz4qn+JshEOvPrJ1c Oj8nqtJD0Oo0k2LvzEAYCuPWeGZ1bIdDl5TSe99uaFZEHDBYA2sNQ2EhpvS/lk/eFtXx ycvbcZcTdJzLoW546Q1jTF+3Y8quzV17PR3h+TabtUmqTgBaM6EoQFqhGrd1ggrpUvsz 1F2yfSg3JaPeqoZDo9qJkwyUjSj95cU1i6ZCWCSLO74jCMweO/EpLaWsc0sZdV854VP9 uM6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688148816; x=1690740816; 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=LFJIcanFRlByEbaouUqUczjIllZ1vohWkKFVmvFY+zZ4GHiSEFytdlrKCWDFD+Bylh F/z0m0d21Bd+rzsJRkmv3fciQEYr9ODlw1wGuILX0JYNmzvUv4JEWsz8C9HNX8XlrzFO lfE4QvmiR50TN56gFvcze5Cr7H1cbDxynzSwarPmQBY+Jc9Z4Gimz9jQVKrxEgLxW4Uc EibYIHhGW1ELVxVLf9CcQi0s7Pl1Dx577ko0U7BblYQC1xZs5aYb9Lf0jph/YSW3KTGt O26YCPYY7QkyaMdPOx6L+yCgmjLcM5LB0EJFChfcYws20/g8yS5iWkdvhbgfy9lYDyxi igBQ== X-Gm-Message-State: AC+VfDxa/M5lLT09bsjNVmqogxcUGhAaT/8lyenFiEK1R2CHKXg/ONCv W7vGDYuG4NwEp9aQQQgbdUl6Q1+sIoL6Cz5z4Xc= X-Received: by 2002:a7b:c353:0:b0:3fb:b56b:470f with SMTP id l19-20020a7bc353000000b003fbb56b470fmr2757519wmj.14.1688148816025; Fri, 30 Jun 2023 11:13:36 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f10-20020a7bc8ca000000b003fbad1b4904sm8379012wml.0.2023.06.30.11.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 11:13:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BA7B41FFC8; Fri, 30 Jun 2023 19:04:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Stefan Hajnoczi , Leonardo Bras , Laurent Vivier , Peter Xu , Juan Quintela , Beraldo Leal , Radoslaw Biernacki , Qiuhao Li , Peter Maydell , Yanan Wang , Riku Voipio , Wainer dos Santos Moschetta , Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Eduardo Habkost , Thomas Huth , Laurent Vivier , Bin Meng , Marcel Apfelbaum , Bandan Das , Cleber Rosa , Richard Henderson , Leif Lindholm , Marcin Juszkiewicz , qemu-arm@nongnu.org, Darren Kenny , Alexander Bulekov Subject: [PATCH v4 16/38] tests/avocado: update firmware to enable sbsa-ref/max Date: Fri, 30 Jun 2023 19:04:01 +0100 Message-Id: <20230630180423.558337-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230630180423.558337-1-alex.bennee@linaro.org> References: <20230630180423.558337-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=unavailable 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