From patchwork Fri Jun 23 12:20:51 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: 695266 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1926429wrm; Fri, 23 Jun 2023 05:37:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Tig9hpEzHgCii1bH3Y+y3ZQAz7sV9u/mtvZvlN1HFaM8AXOLKmOhhJytpUKKUhFqkE5CL X-Received: by 2002:a05:622a:130d:b0:400:8d7a:a302 with SMTP id v13-20020a05622a130d00b004008d7aa302mr778431qtk.18.1687523823984; Fri, 23 Jun 2023 05:37:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523823; cv=none; d=google.com; s=arc-20160816; b=LACyxpkmwoCUdcHelQFqYHI+B+bwh8adTPspGVTq93Q1jIcxe1VGF28X4da3M502wE q2VXhVfGFXA04gMTWr2ZwIfarOSjEwynv6V4bJLhEhOiOBOdj+Ws9a45OK8WRo2yN1qS 0KY6Ln8Xo1ZPnikrPpFZzRieeo7ONRrMGjqq/foZyHue6qN2L8O1PvgPVgp8YnhAYExH murf/tenbjBhGWey1JuoDVH/qhs1HnOex/y/hPL6QKTxQVtsAI3vAxq+QzyJSYxB3wQH G36ET72QBXOMcau42q0pdawJQHe/NmjWPUxyqyV5YJXkL7WYXRd0PQ9g+0Cl9NP5q/bM e+Aw== 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=KBdNTeWY2HuOCU9nu+Z3lWX8HamSwCQjIvaXqYAw/FM=; b=Q4nKC989fpRP5wYR4tx2p/rwkD26LB3cghl/txKBXSXqwxeletw672IGoBnRh12Swm iCWID0+Ay/6zqEFqPdPDbZ27MeMnQlFlFTeG1FDZxABaek6mQKLPhP9ZZLYztb/DH9SP YD4VuySQ6IAp1hz4am4cy3i5sPV+UfOGXj6IuPpZ1HNgO62txb7SXTRj2q7IKiUn59mV uRttFgs7BVatSURz+Y5D/Rca2IN23F1sXr7QYi/x6LcL0tF2Gus5ZCanLXcEfn5gt/9+ UArnSSnHt7ye4UozYnJXCJtaVSIfUbHB+0qgJl8bEsN4l+iz5qN+/TvzbWoQBACVNg/k FpZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cxAUoZ9Q; 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 t17-20020a05622a149100b003ff212f9382si1033764qtx.478.2023.06.23.05.37.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:37:03 -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=cxAUoZ9Q; 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 1qCfwf-0001M9-H6; Fri, 23 Jun 2023 08:31:21 -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 1qCfwJ-0001AQ-RF for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:31:01 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfwD-0000UB-8z for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:30:58 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3112902f785so1715129f8f.0 for ; Fri, 23 Jun 2023 05:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687523452; x=1690115452; 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=KBdNTeWY2HuOCU9nu+Z3lWX8HamSwCQjIvaXqYAw/FM=; b=cxAUoZ9QqI5vpS0Gf2MwXF96k47tsBIYETssMEAeR/6PVVyCDclikStNnXkjx8jEaq 5dkTwIBzNHv4rPbznJfZwBQVQScBWuxUGRGIfTXSbdPY0VJy3wXz8NhxtaGKDt2VQuQe RQRHOyw+R3Cg4jxt9Aq8owKAeEJuTsrwr4zjGwQEa2PQS0YdbUYJxERZQiBFGcfkZXLe 1U+L8kWLZ26YRR82GVoLHa8zshMUblXGaq6qs9DdrXx4lw2kuLJq0X7oFDgeycdne2/A 5eobd08aeaafITnlD6Q+LuijM5592ZdbyXAmRvxDpy1CrCAKvLSF2OAKp+qWsZMt86l7 38QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687523452; x=1690115452; 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=KBdNTeWY2HuOCU9nu+Z3lWX8HamSwCQjIvaXqYAw/FM=; b=kwOLedQGFYp0OLv1N87j86C7sxHwpcmaTb+L6UC1J4QiQ2wffH2bMZLCYw+/kKwyKU wYQknVVeuR/hfggalorkYzzMfaVyR5tsucqeKK7e+Kpo/4kbM13jMYYdoUxKcKnXr+WO 9V7qlgp1caM4qvCc7jc8f9SoDaPRYyGb+0dY8GZo8PLKNfVVZP4Qmq1GcyGRoD0VmH16 vfspynKX0sEc6zByrZ8m6s7uLXz/qgrCZS6cnArMpSMfQboqw9UWz57n9TA8/gVpRtfc 0nn5oU1GKeobTW57j3QHkssO5xVUPkq8t7LQ5Vjy6EUgtOdqflB8vTCokRjoVyAqqVMc j7uA== X-Gm-Message-State: AC+VfDwf5zC5uqh+UU1rPdW4SlF0juvVpXUd4cAia5AKsvsq6W4YjVsi GezIiJ2vS0PWtXctG9pvzGR8jQ== X-Received: by 2002:adf:e403:0:b0:311:10ae:123e with SMTP id g3-20020adfe403000000b0031110ae123emr21026341wrm.2.1687523451874; Fri, 23 Jun 2023 05:30:51 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p16-20020a5d6390000000b003113943bb66sm9344371wru.110.2023.06.23.05.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:30:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7EF031FFC8; Fri, 23 Jun 2023 13:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 17/26] tests/avocado: update firmware to enable sbsa-ref/max Date: Fri, 23 Jun 2023 13:20:51 +0100 Message-Id: <20230623122100.1640995-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.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 Reviewed-by: Philippe Mathieu-Daudé --- tests/avocado/machine_aarch64_sbsaref.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index 0a79fa7ab6..35f8042416 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") @@ -150,7 +150,7 @@ def test_sbsaref_alpine_linux_neoverse_n1(self): """ self.boot_alpine_linux("neoverse-n1") - @skip("requires TF-A update to handle FEAT_FGT") + @skipUnless(os.getenv("AVOCADO_TIMEOUT_EXPECTED"), "Test might timeout") def test_sbsaref_alpine_linux_max(self): """ :avocado: tags=cpu:max