From patchwork Thu Oct 31 21:33:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Olivain X-Patchwork-Id: 2004893 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XfchY5JLhz1xwc for ; Fri, 1 Nov 2024 08:34:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0F9EC408AC; Thu, 31 Oct 2024 21:34:36 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id KH7L7xUHO9DZ; Thu, 31 Oct 2024 21:34:34 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 31C67408BB Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id 31C67408BB; Thu, 31 Oct 2024 21:34:34 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists1.osuosl.org (Postfix) with ESMTP id B63BE5B1E for ; Thu, 31 Oct 2024 21:34:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A59A58169E for ; Thu, 31 Oct 2024 21:34:32 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id K29FYotbQeEr for ; Thu, 31 Oct 2024 21:34:31 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=212.27.42.1; helo=smtp1-g21.free.fr; envelope-from=ju.o@free.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org A732C80EAB DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A732C80EAB Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by smtp1.osuosl.org (Postfix) with ESMTPS id A732C80EAB for ; Thu, 31 Oct 2024 21:34:31 +0000 (UTC) Received: from home.juju.sh (unknown [IPv6:2a01:e0a:485:b220:8213:2270:4a8d:a1d5]) (Authenticated sender: ju.o@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id 2F33AB00565; Thu, 31 Oct 2024 22:34:22 +0100 (CET) From: Julien Olivain To: buildroot@buildroot.org Cc: Julien Olivain , Romain Naour , Romain Naour Date: Thu, 31 Oct 2024 22:33:41 +0100 Message-ID: <20241031213348.2057705-2-ju.o@free.fr> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241031213348.2057705-1-ju.o@free.fr> References: <20241031213348.2057705-1-ju.o@free.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1730410470; bh=Yalx5EHkEFpsZA9YakdoMFilCyKdeuhqsmRyEqamrJA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NEj78M3trBd8fyMPQ8XsM0dHWk+wmIQZhTG+SSneQPE8kHKF99/NyUR0OLgXoUB4F ytnXSroz1MbVx9fzlSuuMt8YJUa606NJiT8dmid+BqC4KOh4mK25x6mnk+L6M+bL4E CxKoocGglbFVNC77dHBC8qAQ4bO9qiZo+V5MpZ8v5AdK4BmLMHgG39REdBA4yAOnQB u3jUUkuUo66ENviv/5H8lRKg/pSDkRB8KIEi/1XnYRHaN9JPx4yzd2dlbmmd/RORTY /pcU+fnm6F+YfJRSE+cdF7qqaR/ZQlqHDslZBibkEOd8F1HZpxZ90jY+VeGUl8QUzB H9yV86Fxj8nsQ== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=NEj78M3t Subject: [Buildroot] [PATCH v3 1/8] configs/qemu_aarch64_sbsa_defconfig: update ATF to v2.11 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Romain Naour qemu_aarch64_sbsa_defconfig doesn't boot since the qemu version bump to 9.0 [1]. Sync the ATF version with the one (v2.11) used by Qemu tests [2]. Since we use a released version of ATF, we switch to ATF custom version to use the official ATF repository instead of the read-only mirror on ARM-software's github. This doesn't fix yet this defconfig due to a bug in edk2 as mentioned in the qemu commit log [2]. With the edk2 version bump applied, this defconfig doesn't boot with ATF v2.10-lts but boot successfully with ATF v2.11. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/103a55028c75dace312470ba05a197886c6b6100 [2] https://gitlab.com/qemu-project/qemu/-/commit/24a7cd6a7c21f82f1ce9bd5ecf6fb54eb7bf4602 Signed-off-by: Romain Naour --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 1 + configs/qemu_aarch64_sbsa_defconfig | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 5632db01f8..4a0534d1ba 100644 --- a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,4 @@ # Locally computed: sha256 c9f0d0bf967d690edbf34b621728a6271856f2e26ed46081a285b6d627a358c5 arm-trusted-firmware-v2.7-git4.tar.gz sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 8da4331b30..23d274b529 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_EDK2=y From patchwork Thu Oct 31 21:33:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Olivain X-Patchwork-Id: 2004894 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xfchg2kgzz1xwc for ; Fri, 1 Nov 2024 08:34:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0CEB1605DB; Thu, 31 Oct 2024 21:34:41 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id aZgmyuJia5IE; Thu, 31 Oct 2024 21:34:40 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org D87F960650 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id D87F960650; Thu, 31 Oct 2024 21:34:39 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists1.osuosl.org (Postfix) with ESMTP id EB9745E46 for ; Thu, 31 Oct 2024 21:34:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D966E401AD for ; Thu, 31 Oct 2024 21:34:38 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id lbNtUcwsU-EB for ; Thu, 31 Oct 2024 21:34:37 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=212.27.42.1; helo=smtp1-g21.free.fr; envelope-from=ju.o@free.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 8DD98400D7 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8DD98400D7 Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8DD98400D7 for ; Thu, 31 Oct 2024 21:34:37 +0000 (UTC) Received: from home.juju.sh (unknown [IPv6:2a01:e0a:485:b220:8213:2270:4a8d:a1d5]) (Authenticated sender: ju.o@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id 22568B0051E; Thu, 31 Oct 2024 22:34:30 +0100 (CET) From: Julien Olivain To: buildroot@buildroot.org Cc: Julien Olivain , Romain Naour Date: Thu, 31 Oct 2024 22:33:42 +0100 Message-ID: <20241031213348.2057705-3-ju.o@free.fr> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241031213348.2057705-1-ju.o@free.fr> References: <20241031213348.2057705-1-ju.o@free.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1730410475; bh=vt1S06ZEbpxHlYaiANw4wRrR0otqY5oWxaiIWNrSHjo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UBKd5qKMwJpFMEMfcPsGH+pj+Iq2B6w4KR5xg+hWhJKi27wHTIfhlp3r1VcFn8J2C fkT1ak+1APfrEkoZaEHVCunMFXxbM0GASe+yiDZ1BzjZHXA0/C1WwIW8pJVCD9zIy5 NKsOlhSNXTAsIAY9MffxYpObJxYuFXPA/4GLt/gpleDcWnUZZ0Uum5mfjdsDRw6YqM jNZcfVz6L5hzQmBIp41/Vw1x6o4LF8CAeCt+eLqaKumw/lASF7H3AffshGmFuUcOM4 gvPM5gGTesVFVcHSq7xAd3zDAQHGJHgUHOe4bZOSQRGoch5IGaI3ERbdSS/ZoEkZ+S SdCavBljWbR0Q== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=UBKd5qKM Subject: [Buildroot] [PATCH v3 2/8] support/testing: disable tests using edk2 on aarch64 architecture X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" EDK2 version edk2-stable202405 (not yet in Buildroot) has dependencies on specific Qemu version. Buildroot guidelines also recommend that "each patch must be complete". See: [1]. This means, a patch in a series is not allowed to break something knowingly, even in the same patch series. This rule is mainly for using git bisect. We also want to avoid bumping EDK2, update the runtime test infra, and few tests in a big single commit, for readability. This would mix too many changes in the same commit. As a trade off, this commit disables the runtime tests which are known to be broken by the upcoming edk2 update. Then, those tests will be individually fixed and re-enabled in followup commits. This EDK2/Qemu incompatibility only affects runtime tests using EDK2 on the Arm Aarch64 architecture. This commit disable the runtime tests by adding a "skipTest()" call in: - tests.boot.test_edk2 - tests.boot.test_grub.TestGrubAArch64EFI - tests.package.test_fwts [1] https://buildroot.org/downloads/manual/manual.html#submitting-patches Signed-off-by: Julien Olivain Reviewed-by: Romain Naour --- support/testing/tests/boot/test_edk2.py | 4 ++++ support/testing/tests/boot/test_grub.py | 4 ++++ support/testing/tests/package/test_fwts.py | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/support/testing/tests/boot/test_edk2.py b/support/testing/tests/boot/test_edk2.py index 16fa10f8c9..7d350f52d9 100644 --- a/support/testing/tests/boot/test_edk2.py +++ b/support/testing/tests/boot/test_edk2.py @@ -33,6 +33,10 @@ class TestEdk2(infra.basetest.BRTest): BR2_PACKAGE_HOST_MTOOLS=y """ + def setUp(self): + self.skipTest("Incompatible QEmu 5.2.0 (Docker image) / " + "EDK2 (stable202405) versions.") + def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") flash0 = os.path.join(self.builddir, "images", "SBSA_FLASH0.fd") diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py index 5315fa23ba..41234de2b9 100644 --- a/support/testing/tests/boot/test_grub.py +++ b/support/testing/tests/boot/test_grub.py @@ -156,6 +156,10 @@ class TestGrubAArch64EFI(infra.basetest.BRTest): """.format(post_image=infra.filepath("tests/boot/test_grub/post-image-aarch64-efi.sh"), linux_fragment=infra.filepath("tests/boot/test_grub/linux-aarch64-efi.config")) + def setUp(self): + self.skipTest("Incompatible QEmu 5.2.0 (Docker image) / " + "EDK2 (stable202405) versions.") + def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") bios = os.path.join(self.builddir, "images", "QEMU_EFI.fd") diff --git a/support/testing/tests/package/test_fwts.py b/support/testing/tests/package/test_fwts.py index ef792136c2..2c9873ee54 100644 --- a/support/testing/tests/package/test_fwts.py +++ b/support/testing/tests/package/test_fwts.py @@ -36,6 +36,10 @@ class TestFwts(infra.basetest.BRTest): BR2_PACKAGE_HOST_MTOOLS=y """ + def setUp(self): + self.skipTest("Incompatible QEmu 5.2.0 (Docker image) / " + "EDK2 (stable202405) versions.") + def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") flash0 = os.path.join(self.builddir, "images", "SBSA_FLASH0.fd") From patchwork Thu Oct 31 21:33:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Olivain X-Patchwork-Id: 2004895 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xfchs3Qf1z1xwc for ; Fri, 1 Nov 2024 08:34:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id CB086408BD; Thu, 31 Oct 2024 21:34:51 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ZAGQh08-In6m; Thu, 31 Oct 2024 21:34:50 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 21285408AF Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id 21285408AF; Thu, 31 Oct 2024 21:34:50 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists1.osuosl.org (Postfix) with ESMTP id 9FBD45E46 for ; Thu, 31 Oct 2024 21:34:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8E96F8174A for ; Thu, 31 Oct 2024 21:34:48 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 3CF3vpkzfe4l for ; Thu, 31 Oct 2024 21:34:47 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:e0c:1:1599::10; helo=smtp1-g21.free.fr; envelope-from=ju.o@free.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 081CC80EAB DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 081CC80EAB Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [IPv6:2a01:e0c:1:1599::10]) by smtp1.osuosl.org (Postfix) with ESMTPS id 081CC80EAB for ; Thu, 31 Oct 2024 21:34:46 +0000 (UTC) Received: from home.juju.sh (unknown [IPv6:2a01:e0a:485:b220:8213:2270:4a8d:a1d5]) (Authenticated sender: ju.o@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id BF1E6B0055A; Thu, 31 Oct 2024 22:34:35 +0100 (CET) From: Julien Olivain To: buildroot@buildroot.org Date: Thu, 31 Oct 2024 22:33:43 +0100 Message-ID: <20241031213348.2057705-4-ju.o@free.fr> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241031213348.2057705-1-ju.o@free.fr> References: <20241031213348.2057705-1-ju.o@free.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1730410484; bh=QZwfRF1hrz0APwpKSDyoNL/QfccxajKcS35BCa5+o44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XkS55/VhaAF8ZkdHk7p1YiKCwPb8Yl2wD/G8r0/qWZaq00SfLwZG100ZpuPfRWNUT QYjJvzoW9ny9k2TwDpkAAABTYQyTtKqlMiSbMtMvCZ1wQfQ9+n824oBQJ/o5bQJ63V RGaI55hwMtId7U+0cSem6Ker0IY1huGeFmcfJFyskvlV7r8flmqlRCP/kpPuAqP9ZE k343twKX0Nhnla7egMsU32n3wb0D2mcE6usk3+NNofAKI4qjJ64iGj7VpsTHWlHAZn k5rU5izxe8IQWTl0L8RWNiOYD9VH5AcJ+rKSbLLm3ZQB+JCKMfpOA8jffXYKQcjY/h f7qXx8PMYuI1g== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=XkS55/Vh Subject: [Buildroot] [PATCH v3 3/8] boot/edk2: bump to version edk2-stable202405 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julien Olivain , Romain Naour , Romain Naour Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Romain Naour Release notes: https://github.com/tianocore/edk2/releases/tag/edk2-stable202405 We can't bump to edk2-stable202408 yet due to a runtime issue while testing qemu_aarch64_sbsa_defconfig following the switch generic ArmPsciResetSystemLib [1] ERROR: sbsa_sip_smc_handler: unhandled SMC (0xc20000ca) (function id: 202) Qemu 9.0/9.1 is using a slightly older edk2 firmware based on edk2-stable202405 release [2] that contains a commit [3] fixing a bootloader crash produced with qemu_aarch64_sbsa_defconfig [4] since Qemu 9.0. From [5]: "The version of the sbsa-ref EDK2 firmware we used to use in this test had a bug where it might make an unaligned access to the framebuffer, which causes a guest crash on newer versions of QEMU where we enforce the architectural requirement that unaligned accesses to Device memory should take an exception." This commit [5] is backported to edk2-stable202405. For the same reason, we have to update edk2-platforms to a specific version [6]: "QemuSbsa: enable WriteCombine for the FrameBuffer QEMU no longer permits misaligned access to device memory, which breaks QemuVideoDxe on SbsaQemu. c1d1910be6e04a8b1a73090cf2881fb698947a6e commit in EDK2 fixed it by enabling WriteCombine for Framebuffer memory. This change enables that fix." As a side note, the edk2-non-osi package does not need to be updated, so it is left untouched. Finally, this EDK2 version requires a recent Qemu version. The version included in the reference Docker image (5.2.0) is too old and will not allow to start this EDK2 version. Therefore, this bump is known to be incompatible with runtime tests which are using EDK2 on Aarch64 architecture. At the authoring time of this commit, broken tests are: - tests.boot.test_edk2 - tests.boot.test_grub.TestGrubAArch64EFI - tests.package.test_fwts Note that the EDK2/Qemu incompatibility is only affecting Aarch64 tests. Other tests using EDK2 on i386 or x86_64 are not affected. To prevent this commit introducing broken runtime tests, those have been disabled in a previous commit. [1] https://github.com/tianocore/edk2-platforms/commit/2d0668d399708fc242336e310cc7e7bec0aec891 [2] https://gitlab.com/qemu-project/qemu/-/commit/24a7cd6a7c21f82f1ce9bd5ecf6fb54eb7bf4602 [3] https://github.com/tianocore/edk2/commit/c1d1910be6e04a8b1a73090cf2881fb698947a6e [4] https://gitlab.com/buildroot.org/buildroot/-/jobs/7764483764 [5] https://gitlab.com/qemu-project/qemu/-/commit/6c84daac58f0d75a908626faf89a832fc0532140 [6] https://github.com/tianocore/edk2-platforms/commit/3f08401365d67e10924c774e6c3f64be56bc15b6 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7764483764 Signed-off-by: Romain Naour Cc: Waldemar Brodkorb [Julien: add comments in commit log] Signed-off-by: Julien Olivain --- ...oDxe-add-feature-PCD-to-remap-frameb.patch | 129 ++++++++++++++++++ boot/edk2/edk2.hash | 2 +- boot/edk2/edk2.mk | 2 +- package/edk2-platforms/edk2-platforms.hash | 2 +- package/edk2-platforms/edk2-platforms.mk | 2 +- 5 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 boot/edk2/0001-OvmfPkg-QemuVideoDxe-add-feature-PCD-to-remap-frameb.patch diff --git a/boot/edk2/0001-OvmfPkg-QemuVideoDxe-add-feature-PCD-to-remap-frameb.patch b/boot/edk2/0001-OvmfPkg-QemuVideoDxe-add-feature-PCD-to-remap-frameb.patch new file mode 100644 index 0000000000..5f6ceb289d --- /dev/null +++ b/boot/edk2/0001-OvmfPkg-QemuVideoDxe-add-feature-PCD-to-remap-frameb.patch @@ -0,0 +1,129 @@ +From 921c78f57a16b00debd58899a48e7045015c374b Mon Sep 17 00:00:00 2001 +From: Ard Biesheuvel +Date: Mon, 17 Jun 2024 17:07:41 +0200 +Subject: [PATCH] OvmfPkg/QemuVideoDxe: add feature PCD to remap framebuffer + W/C + +Some platforms (such as SBSA-QEMU on recent builds of the emulator) only +tolerate misaligned accesses to normal memory, and raise alignment +faults on such accesses to device memory, which is the default for PCIe +MMIO BARs. + +When emulating a PCIe graphics controller, the framebuffer is typically +exposed via a MMIO BAR, while the disposition of the region is closer to +memory (no side effects on reads or writes, except for the changing +picture on the screen; direct random access to any pixel in the image). + +In order to permit the use of such controllers on platforms that only +tolerate these types of accesses for normal memory, it is necessary to +remap the memory. Use the DXE services to set the desired capabilities +and attributes. + +Hide this behavior under a feature PCD so only platforms that really +need it can enable it. (OVMF on x86 has no need for this) + +Signed-off-by: Ard Biesheuvel +Upstream: https://github.com/tianocore/edk2/commit/c1d1910be6e04a8b1a73090cf2881fb698947a6e +Signed-off-by: Romain Naour +--- + OvmfPkg/OvmfPkg.dec | 5 +++++ + OvmfPkg/QemuVideoDxe/Gop.c | 19 +++++++++++++++++++ + OvmfPkg/QemuVideoDxe/Qemu.h | 2 +- + OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf | 4 ++++ + 4 files changed, 29 insertions(+), 1 deletion(-) + +diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec +index 51be9a5959..2c40de8a13 100644 +--- a/OvmfPkg/OvmfPkg.dec ++++ b/OvmfPkg/OvmfPkg.dec +@@ -444,3 +444,8 @@ + + ## This feature flag indicates the firmware build supports secure boot. + gUefiOvmfPkgTokenSpaceGuid.PcdSecureBootSupported|FALSE|BOOLEAN|0x6d ++ ++ ## Whether QemuVideoDxe should perform a EFI_MEMORY_WC remap of the PCI ++ # framebuffer. This might be required on platforms that do not tolerate ++ # misaligned accesses otherwise. ++ gUefiOvmfPkgTokenSpaceGuid.PcdRemapFrameBufferWriteCombine|FALSE|BOOLEAN|0x75 +diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c +index b11eed7558..a29c025afd 100644 +--- a/OvmfPkg/QemuVideoDxe/Gop.c ++++ b/OvmfPkg/QemuVideoDxe/Gop.c +@@ -9,6 +9,8 @@ + + #include "Qemu.h" + ++#include ++ + STATIC + VOID + QemuVideoCompleteModeInfo ( +@@ -54,6 +56,7 @@ QemuVideoCompleteModeData ( + EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info; + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *FrameBufDesc; + QEMU_VIDEO_MODE_DATA *ModeData; ++ EFI_STATUS Status; + + ModeData = &Private->ModeData[Mode->Mode]; + Info = Mode->Info; +@@ -79,6 +82,22 @@ QemuVideoCompleteModeData ( + (UINT64)Mode->FrameBufferSize + )); + ++ if (FeaturePcdGet (PcdRemapFrameBufferWriteCombine)) { ++ Status = gDS->SetMemorySpaceCapabilities ( ++ FrameBufDesc->AddrRangeMin, ++ FrameBufDesc->AddrLen, ++ EFI_MEMORY_UC | EFI_MEMORY_WC | EFI_MEMORY_XP ++ ); ++ ASSERT_EFI_ERROR (Status); ++ ++ Status = gDS->SetMemorySpaceAttributes ( ++ FrameBufDesc->AddrRangeMin, ++ FrameBufDesc->AddrLen, ++ EFI_MEMORY_WC | EFI_MEMORY_XP ++ ); ++ ASSERT_EFI_ERROR (Status); ++ } ++ + FreePool (FrameBufDesc); + return EFI_SUCCESS; + } +diff --git a/OvmfPkg/QemuVideoDxe/Qemu.h b/OvmfPkg/QemuVideoDxe/Qemu.h +index 57341a0bbf..a3da725fbf 100644 +--- a/OvmfPkg/QemuVideoDxe/Qemu.h ++++ b/OvmfPkg/QemuVideoDxe/Qemu.h +@@ -13,7 +13,7 @@ + #ifndef _QEMU_H_ + #define _QEMU_H_ + +-#include ++#include + #include + #include + #include +diff --git a/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf b/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +index 43a6e07faa..4c0870171b 100644 +--- a/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf ++++ b/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +@@ -44,6 +44,7 @@ + + [LibraryClasses] + BaseMemoryLib ++ DxeServicesTableLib + FrameBufferBltLib + DebugLib + DevicePathLib +@@ -61,6 +62,9 @@ + gEfiDevicePathProtocolGuid # PROTOCOL BY_START + gEfiPciIoProtocolGuid # PROTOCOL TO_START + ++[FeaturePcd] ++ gUefiOvmfPkgTokenSpaceGuid.PcdRemapFrameBufferWriteCombine ++ + [Pcd] + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId + gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource +-- +2.45.0 + diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash index f7daa8ddf3..abcf3c6b8e 100644 --- a/boot/edk2/edk2.hash +++ b/boot/edk2/edk2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6bdfdffcc2235a117b3f9d4124da63103f19ff30157673f812e1093b20ebb7ad edk2-edk2-stable202308-git4.tar.gz +sha256 4595b9d9d14c06bd03f575e4b7623574a4a874ef465652ecdc224099a5b14fc7 edk2-edk2-stable202405-git4.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index e5816b353a..145a9a80ae 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDK2_VERSION = edk2-stable202308 +EDK2_VERSION = edk2-stable202405 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git EDK2_LICENSE = BSD-2-Clause-Patent diff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash index 4c74c7dfb6..0095d4298d 100644 --- a/package/edk2-platforms/edk2-platforms.hash +++ b/package/edk2-platforms/edk2-platforms.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c240a8ec7816bc5963d881c84eb18d880e9269c117cfc46a3106b0c5e6e80c66 edk2-platforms-e509ac5a729ebe2a3bc905aed1df23226aca4dc9.tar.gz +sha256 41fa720ac644ec0523c576ff28eba5e0308c9649111ce42f7d408b8d8b30eaf5 edk2-platforms-3f08401365d67e10924c774e6c3f64be56bc15b6.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk index 7bd86ff159..23d9221649 100644 --- a/package/edk2-platforms/edk2-platforms.mk +++ b/package/edk2-platforms/edk2-platforms.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep in sync with latest commit as of the release date for boot/edk2 -EDK2_PLATFORMS_VERSION = e509ac5a729ebe2a3bc905aed1df23226aca4dc9 +EDK2_PLATFORMS_VERSION = 3f08401365d67e10924c774e6c3f64be56bc15b6 EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION)) EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent EDK2_PLATFORMS_LICENSE_FILES = License.txt From patchwork Thu Oct 31 21:33:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Olivain X-Patchwork-Id: 2004896 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xfchy6FL8z1xwc for ; Fri, 1 Nov 2024 08:34:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4D449408E6; Thu, 31 Oct 2024 21:34:56 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id hDdeOKEuSTFQ; Thu, 31 Oct 2024 21:34:55 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 3FF3C408E0 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id 3FF3C408E0; Thu, 31 Oct 2024 21:34:55 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists1.osuosl.org (Postfix) with ESMTP id 47CC85E46 for ; Thu, 31 Oct 2024 21:34:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 450098169E for ; Thu, 31 Oct 2024 21:34:53 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id CrvGwdSd1Jl3 for ; Thu, 31 Oct 2024 21:34:52 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=212.27.42.1; helo=smtp1-g21.free.fr; envelope-from=ju.o@free.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 4B89C80EAB DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4B89C80EAB Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4B89C80EAB for ; Thu, 31 Oct 2024 21:34:52 +0000 (UTC) Received: from home.juju.sh (unknown [IPv6:2a01:e0a:485:b220:8213:2270:4a8d:a1d5]) (Authenticated sender: ju.o@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id EB024B0051B; Thu, 31 Oct 2024 22:34:44 +0100 (CET) From: Julien Olivain To: buildroot@buildroot.org Cc: Julien Olivain , Romain Naour , Romain Naour Date: Thu, 31 Oct 2024 22:33:44 +0100 Message-ID: <20241031213348.2057705-5-ju.o@free.fr> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241031213348.2057705-1-ju.o@free.fr> References: <20241031213348.2057705-1-ju.o@free.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1730410490; bh=f3La1RU//KF3dNdZySGf6HUZ8oK1HVxRCbLPnBXf/iU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iGcXhDrw26+ZZIoV7LFhjX1HoDz1BpXNnzCET2zxOiHkMZBrBw+jJcAoGGc/wuLwb Ck/Bo64JvxX1sUWK8CKaUSHsetxp/c2QygKGuPeMoNl/sOgfAvRlbCdHxHbi7VnO+c KLByzmthRcSbONt7bJ2IiPXB2HhwrrcSHHVDSkZDWU9gK4cQQxzIOqLHP5UBhFgfbn scNnTDt5EYWkp9FhVeqHl/v226YTpW+H/wUS7Dc7JxR6zuiOjTbPCHSA0TTn+SG4Zx WoHoAGBcgI4rP2H0Cdbzlkb4g05nMxHvPRTxRhHMdTzZilZO+L6e/VF5uOtoknItOl MvmTg8UNlKSbg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=iGcXhDrw Subject: [Buildroot] [PATCH v3 4/8] configs/qemu_aarch64_sbsa_defconfig: switch to neoverse-n1 (armv8.2a) X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Romain Naour The SBSA Reference Platform was updated to neoverse-n1 (armv8.2a) in Qemu v8.1 [1]. BR2_cortex_a57: # cat /proc/cpuinfo processor : 0 BogoMIPS : 2000.00 Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid CPU implementer : 0x41 CPU architecture: 8 CPU variant : 0x1 CPU part : 0xd07 CPU revision : 0 [...] BR2_neoverse_n1: # cat /proc/cpuinfo processor : 0 BogoMIPS : 2000.00 Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm lrcpc dcpop asimddp ssbs CPU implementer : 0x41 CPU architecture: 8 CPU variant : 0x4 CPU part : 0xd0c CPU revision : 1 [...] Tests test_fwts.py test_edk2.py using BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y are not updated to neoverse-n1 by this commit. Those tests were disabled in a previous commit. Those tests will be updated and fixed in followup commits. Note: SBSA Reference Platform was recently updated again to neoverse-n2 (armv9.0a) in Qemu v9.1 [2]. But there is no armv9.0a support yet in Buildroot. [1] https://gitlab.com/qemu-project/qemu/-/commit/1877272bad7b08b67312503ee66184279876c7bd [2] https://gitlab.com/qemu-project/qemu/-/commit/b1d592e7b0a7301eae8e3baa99744ac35db3cd2a Signed-off-by: Romain Naour [Julien: add a small comment in commit log about tests] Signed-off-by: Julien Olivain --- board/qemu/aarch64-sbsa/readme.txt | 2 +- configs/qemu_aarch64_sbsa_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/qemu/aarch64-sbsa/readme.txt b/board/qemu/aarch64-sbsa/readme.txt index cf5f66d4d6..7d97d7f6ab 100644 --- a/board/qemu/aarch64-sbsa/readme.txt +++ b/board/qemu/aarch64-sbsa/readme.txt @@ -17,7 +17,7 @@ Run the emulation with: qemu-system-aarch64 \ -M sbsa-ref \ - -cpu cortex-a57 \ + -cpu neoverse-n1 \ -smp 4 \ -m 1024 \ -nographic \ diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 23d274b529..6df2b2e273 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_cortex_a57=y +BR2_neoverse_n1=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y From patchwork Thu Oct 31 21:33:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Olivain X-Patchwork-Id: 2004897 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xfcj36LpYz1xwc for ; Fri, 1 Nov 2024 08:35:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 8475E60650; Thu, 31 Oct 2024 21:35:01 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id IqWr26376yld; Thu, 31 Oct 2024 21:35:00 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 79B4560671 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id 79B4560671; Thu, 31 Oct 2024 21:35:00 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists1.osuosl.org (Postfix) with ESMTP id 1B89F5B1E for ; Thu, 31 Oct 2024 21:34:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E93E08169E for ; Thu, 31 Oct 2024 21:34:58 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 82NyVQMuHXAS for ; Thu, 31 Oct 2024 21:34:58 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:e0c:1:1599::10; helo=smtp1-g21.free.fr; envelope-from=ju.o@free.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 0360280EAB DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0360280EAB Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [IPv6:2a01:e0c:1:1599::10]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0360280EAB for ; Thu, 31 Oct 2024 21:34:57 +0000 (UTC) Received: from home.juju.sh (unknown [IPv6:2a01:e0a:485:b220:8213:2270:4a8d:a1d5]) (Authenticated sender: ju.o@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id BB642B00539; Thu, 31 Oct 2024 22:34:50 +0100 (CET) From: Julien Olivain To: buildroot@buildroot.org Cc: Julien Olivain , Romain Naour Date: Thu, 31 Oct 2024 22:33:45 +0100 Message-ID: <20241031213348.2057705-6-ju.o@free.fr> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241031213348.2057705-1-ju.o@free.fr> References: <20241031213348.2057705-1-ju.o@free.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1730410496; bh=7otdEn/LD3aE75B8XAT6IqWbqbJIkA9Xt/RUjvWMWLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aFwLf6w/brydmn4y7YLZt6KmAnqs9hIGm/2i5+Ty7cPta/zAkZEGu99MPd41h4M/y jg/G56JJNKAF8blvACvGWyNErWRwgWDwLkOgEKodyy1GMcyynJamBF0Y60z9cHk9t1 vJ/oSq429NemYDQ2nBRrpM2PIHh/5BNp5bgyoHQweqMDhIJemZebdfMN2/XcMm2kNZ zlUhIPqI0ufUZM9wtfH7z1fjyLMwUJ1YOI5Ons+R7JEcsLQxe1FpqMg4DIdXJRhZBD T5a6DaaLi2ovUPMPa7urqdh/YF+kCaVvLBzb78UIfuQ8aV4O31IY2eLbJ3k0cNvS+Q CavSwCeASrFFQ== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=aFwLf6w/ Subject: [Buildroot] [PATCH v3 5/8] support/testing/infra/emulator.py: add build host dir to qemu search path X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The relevant qemu emulator is started with pexpect.spawn() with a default environment (and PATH). This will always use the qemu available on the host. When running in the reference Docker image, it is using an old Qemu v5.2.0. This version is getting too old to run with more recent components, like EDK2 or ATF. The main reason to use a qemu version preinstalled in the Docker image was to save some build time. Also, this behavior is opposite to the "start-qemu.sh" helper script [1], which tries to execute the Buildroot host-qemu first (and then fallback the the version on the host system, if available). An option was added in [2] to let the user have a better control on which version is used. Also, updating the Buildroot reference Docker image has a larger impact on the whole project (i.e. updating the image would bring a newer qemu version, but might break many other things, at a time which is not always convenient). We now need some kind of control in runtime tests, to choose between a "stock" qemu, and a more recent version with all the bells and whistles. This commit adds the Buildroot host build directory in the path. This will make the runtime test infrastructure to use a host-qemu, if selected by a runtime test configuration. For now, most of the test can continue to use the qemu version provided in the Docker image. Only the problematic tests relying on a recent version will select BR2_PACKAGE_HOST_QEMU=y. The host-qemu package is usually maintained to a recent version, so this should be sufficient. [1] https://gitlab.com/buildroot.org/buildroot/-/blob/master/board/qemu/start-qemu.sh.in [2] https://gitlab.com/buildroot.org/buildroot/-/commit/5de78f181acc53959b0a446a3fb116ecdec13577 Signed-off-by: Julien Olivain Reviewed-by: Romain Naour --- support/testing/infra/emulator.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 5318577cda..238e123302 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -44,6 +44,7 @@ class Emulator(object): def __init__(self, builddir, downloaddir, logtofile, timeout_multiplier): self.qemu = None self.repl = None + self.builddir = builddir self.downloaddir = downloaddir self.logfile = infra.open_log_file(builddir, "run", logtofile) # We use elastic runners on the cloud to runs our tests. Those runners @@ -116,11 +117,14 @@ class Emulator(object): self.logfile.write(f"> host loadavg: {ldavg_str}\n") self.logfile.write(f"> timeout multiplier: {self.timeout_multiplier}\n") self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd)) + host_bin = os.path.join(self.builddir, "host", "bin") + br_path = host_bin + os.pathsep + os.environ["PATH"] self.qemu = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:], timeout=5 * self.timeout_multiplier, encoding='utf-8', codec_errors='replace', - env={"QEMU_AUDIO_DRV": "none"}) + env={"QEMU_AUDIO_DRV": "none", + "PATH": br_path}) # We want only stdout into the log to avoid double echo self.qemu.logfile_read = self.logfile From patchwork Thu Oct 31 21:33:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Olivain X-Patchwork-Id: 2004898 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XfcjC03Wwz1xwc for ; Fri, 1 Nov 2024 08:35:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 57E60408E2; Thu, 31 Oct 2024 21:35:09 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id l3cveUH7YeJk; Thu, 31 Oct 2024 21:35:08 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org F1399407E3 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id F1399407E3; Thu, 31 Oct 2024 21:35:07 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists1.osuosl.org (Postfix) with ESMTP id 7B2DA5E50 for ; Thu, 31 Oct 2024 21:35:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 18394402C7 for ; Thu, 31 Oct 2024 21:35:05 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Oss7ejuf8V53 for ; Thu, 31 Oct 2024 21:35:04 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:e0c:1:1599::10; helo=smtp1-g21.free.fr; envelope-from=ju.o@free.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org EEF994029F DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org EEF994029F Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [IPv6:2a01:e0c:1:1599::10]) by smtp2.osuosl.org (Postfix) with ESMTPS id EEF994029F for ; Thu, 31 Oct 2024 21:35:03 +0000 (UTC) Received: from home.juju.sh (unknown [IPv6:2a01:e0a:485:b220:8213:2270:4a8d:a1d5]) (Authenticated sender: ju.o@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id 6372DB0051E; Thu, 31 Oct 2024 22:34:56 +0100 (CET) From: Julien Olivain To: buildroot@buildroot.org Cc: Julien Olivain , Romain Naour Date: Thu, 31 Oct 2024 22:33:46 +0100 Message-ID: <20241031213348.2057705-7-ju.o@free.fr> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241031213348.2057705-1-ju.o@free.fr> References: <20241031213348.2057705-1-ju.o@free.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1730410502; bh=JgvrF8s3uFaEDKIJLmufzY0HjYl2xv2OeqBBT8jtE0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pQwrebr3Fr1kBesuNzzCKpAXBvkogGgarubzDBx4gKr6Upl0YwrbD71zZmUfMLZCz 6L4B7Iu+s0h6F1ucqFfZ714noX8QmLO86jDPRZRvNBCQWXPgQ7lBAjAhTcoJiHPwP1 BzhJw9ambdUcUc0xzmFaFaYjXd+BEJgfzsWAmQy5GjMIfnrxaMTNDP5+qm8ki4aOSa wkqZxP9gxb1JO0WQARLhiPoRxHK3LNm+5d0yb98z10qZFVWdLR4zmZTLBe8UvJbfEr jgLwectmBvrom+suNrW7zsWat+Kr7M99LHMmDQnk8jNLXcJ+bP8Zfsz9uyl7ULSdSv 9PBn5EnCjYfSg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=pQwrebr3 Subject: [Buildroot] [PATCH v3 6/8] support/testing: test_edk2: update and re-enable the test X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The EDK2 bump to stable202405 introduced an incompatibility with the Qemu version 5.2.0 present in the reference Docker image. For that reason, this test was disabled. This commit updates ATF to 2.11 and kernel to 6.6.58, and enables host-qemu in the build, to be used by the runtime test infrastructure. Those changes are fixing this test, which is why this commit re-enables it by removing the skipTest() invocation. Signed-off-by: Julien Olivain Reviewed-by: Romain Naour --- support/testing/tests/boot/test_edk2.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/support/testing/tests/boot/test_edk2.py b/support/testing/tests/boot/test_edk2.py index 7d350f52d9..e6b7855284 100644 --- a/support/testing/tests/boot/test_edk2.py +++ b/support/testing/tests/boot/test_edk2.py @@ -16,7 +16,7 @@ class TestEdk2(infra.basetest.BRTest): BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/qemu/aarch64-sbsa/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.34" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="support/testing/tests/boot/test_edk2/linux.config" BR2_TARGET_EDK2=y @@ -25,18 +25,16 @@ class TestEdk2(infra.basetest.BRTest): BR2_TARGET_GRUB2_ARM64_EFI=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_MTOOLS=y + BR2_PACKAGE_HOST_QEMU=y + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y """ - def setUp(self): - self.skipTest("Incompatible QEmu 5.2.0 (Docker image) / " - "EDK2 (stable202405) versions.") - def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") flash0 = os.path.join(self.builddir, "images", "SBSA_FLASH0.fd") From patchwork Thu Oct 31 21:33:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Olivain X-Patchwork-Id: 2004899 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XfcjG5kJZz1xwc for ; Fri, 1 Nov 2024 08:35:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3DD8B60650; Thu, 31 Oct 2024 21:35:13 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id XhlW05xt1zAH; Thu, 31 Oct 2024 21:35:12 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4B7E360671 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id 4B7E360671; Thu, 31 Oct 2024 21:35:12 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists1.osuosl.org (Postfix) with ESMTP id 22C145E50 for ; Thu, 31 Oct 2024 21:35:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0EA4380EAB for ; Thu, 31 Oct 2024 21:35:10 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id DR1dtjUzB34A for ; Thu, 31 Oct 2024 21:35:09 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:e0c:1:1599::10; helo=smtp1-g21.free.fr; envelope-from=ju.o@free.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 4E3C48174A DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 4E3C48174A Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [IPv6:2a01:e0c:1:1599::10]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4E3C48174A for ; Thu, 31 Oct 2024 21:35:09 +0000 (UTC) Received: from home.juju.sh (unknown [IPv6:2a01:e0a:485:b220:8213:2270:4a8d:a1d5]) (Authenticated sender: ju.o@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id 07024B0053D; Thu, 31 Oct 2024 22:35:02 +0100 (CET) From: Julien Olivain To: buildroot@buildroot.org Cc: Julien Olivain , Romain Naour Date: Thu, 31 Oct 2024 22:33:47 +0100 Message-ID: <20241031213348.2057705-8-ju.o@free.fr> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241031213348.2057705-1-ju.o@free.fr> References: <20241031213348.2057705-1-ju.o@free.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1730410507; bh=yp9/ujsXm/R/oujSoHywIDEVXOzg4YmF1JFNBrXFKfY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c/oNWnhDjsQYHDBy4gynJthepgO/3J8KRkQ+PkJJ9RJKLp3K8wNFetzbHjmBX5ADv o1i0kn5CPfxlJp+9h5j3ma6sWmL6nu2grGqyZnzDbJ4r6Z+pOZ2lHK5Pvkj9ee6/R8 pwWmI6ZhA/CIOhAFs+5GiTWg8zAfW9shHOYr1URPzOw+2jST8ayrbisI1fKUi3sa9i l7s/REC1mkJnOsK81PQ/HFi7CdFvqYCUxbfypLrVSJdL6MRMc9Z60fmuP2Sv7b7Hl5 aavrc/Ku0hBkOY3L6RMBSp66YitNetlcs59PV5Wa9NrcvghHPe5Pf8Yf5iQZWUxF7E 2YScNjEYFShbQ== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=c/oNWnhD Subject: [Buildroot] [PATCH v3 7/8] support/testing: test_fwts: update and re-enable the test X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The EDK2 bump to stable202405 introduced an incompatibility with the Qemu version 5.2.0 present in the reference Docker image. For that reason, this test was disabled. This commit updates ATF to 2.11, and enables host-qemu in the build, to be used by the runtime test infrastructure. Those changes are fixing this test, which is why this commit re-enables it by removing the skipTest() invocation. Signed-off-by: Julien Olivain Reviewed-by: Romain Naour --- support/testing/tests/package/test_fwts.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/support/testing/tests/package/test_fwts.py b/support/testing/tests/package/test_fwts.py index 2c9873ee54..5b79a17e33 100644 --- a/support/testing/tests/package/test_fwts.py +++ b/support/testing/tests/package/test_fwts.py @@ -26,7 +26,7 @@ class TestFwts(infra.basetest.BRTest): BR2_TARGET_GRUB2_ARM64_EFI=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_PACKAGE_FWTS=y @@ -34,12 +34,10 @@ class TestFwts(infra.basetest.BRTest): BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_MTOOLS=y + BR2_PACKAGE_HOST_QEMU=y + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y """ - def setUp(self): - self.skipTest("Incompatible QEmu 5.2.0 (Docker image) / " - "EDK2 (stable202405) versions.") - def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") flash0 = os.path.join(self.builddir, "images", "SBSA_FLASH0.fd") From patchwork Thu Oct 31 21:33:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Olivain X-Patchwork-Id: 2004900 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XfcjN3Gf6z1xwc for ; Fri, 1 Nov 2024 08:35:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id CDB0F407E4; Thu, 31 Oct 2024 21:35:18 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id O5lOczlBGg86; Thu, 31 Oct 2024 21:35:17 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A5AF8408B3 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id A5AF8408B3; Thu, 31 Oct 2024 21:35:17 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists1.osuosl.org (Postfix) with ESMTP id 390125E46 for ; Thu, 31 Oct 2024 21:35:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E3CA5408C0 for ; Thu, 31 Oct 2024 21:35:15 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id c8zNgYijbPsi for ; Thu, 31 Oct 2024 21:35:15 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=212.27.42.1; helo=smtp1-g21.free.fr; envelope-from=ju.o@free.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org E3007408AF DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E3007408AF Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by smtp4.osuosl.org (Postfix) with ESMTPS id E3007408AF for ; Thu, 31 Oct 2024 21:35:14 +0000 (UTC) Received: from home.juju.sh (unknown [IPv6:2a01:e0a:485:b220:8213:2270:4a8d:a1d5]) (Authenticated sender: ju.o@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id BC486B0051B; Thu, 31 Oct 2024 22:35:07 +0100 (CET) From: Julien Olivain To: buildroot@buildroot.org Cc: Julien Olivain , Romain Naour Date: Thu, 31 Oct 2024 22:33:48 +0100 Message-ID: <20241031213348.2057705-9-ju.o@free.fr> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241031213348.2057705-1-ju.o@free.fr> References: <20241031213348.2057705-1-ju.o@free.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1730410513; bh=asoq9VIUujg7p9rLO0ui1l/+7xXZJU9Vlwmov5Lmrm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k2iwC045sOhUGpAx3IVgLyIn393bTPwLTyj5kigm82Xh7AX1hOTG0Ou8X85DxC/X1 U198UoC/bQZNnDsOMUPL5M/uqIvDXsEOKkoRvTkDPvHrzn1nldq15Ht3kZfUIoIFqR oIWj3EwFBrl7h+ontTqkEpTz6zmX1z4ME5FtOC6Vgoc3T2pJOKo1OvhIkxDEcFf0Xr iA6HaPcpIzgRjFR0etQkmdYrrSEj9jUloqn2iVejy8i5afU1dP+ig6LFWll7oaCa0J AdXXW8glPXenZJDQ/Mikv/SZ8p1V0q6PQmrE7Twl6BwocOJ7w9NUmG8EN5TSfEVG4S uNXVL0pxvGyqg== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=k2iwC045 Subject: [Buildroot] [PATCH v3 8/8] support/testing: test_grub: update and re-enable the test X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The EDK2 bump to stable202405 introduced an incompatibility with the Qemu version 5.2.0 present in the reference Docker image. For that reason, this test was disabled. This commit enables host-qemu in the build, to be used by the runtime test infrastructure. Since this commit switch to a more recent host-qemu, it also removes firmware options to workaround old qemu bugs. Those changes are fixing this test, which is why this commit re-enables it by removing the skipTest() invocation. Signed-off-by: Julien Olivain Reviewed-by: Romain Naour --- support/testing/tests/boot/test_grub.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py index 41234de2b9..c753a16c34 100644 --- a/support/testing/tests/boot/test_grub.py +++ b/support/testing/tests/boot/test_grub.py @@ -153,13 +153,11 @@ class TestGrubAArch64EFI(infra.basetest.BRTest): BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_DOSFSTOOLS=y + BR2_PACKAGE_HOST_QEMU=y + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y """.format(post_image=infra.filepath("tests/boot/test_grub/post-image-aarch64-efi.sh"), linux_fragment=infra.filepath("tests/boot/test_grub/linux-aarch64-efi.config")) - def setUp(self): - self.skipTest("Incompatible QEmu 5.2.0 (Docker image) / " - "EDK2 (stable202405) versions.") - def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") bios = os.path.join(self.builddir, "images", "QEMU_EFI.fd")