From nobody Sat Nov 23 18:17:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1730193961; cv=none; d=zohomail.com; s=zohoarc; b=HoqJ3McdMXfZg1sUNz2qPxmH5NWNdPmymzODp9gDJM+uY909RYlpt0gn0xcfpVsLNWVTEwq2n7Uo9bq+nl7yQq6cdW0fhMXJ5hK8gmSV1I66CIE1KGr75yIMwSuWH5RKylc27rOi8Cej//TN9VLFHbetx4WeNdBz5uXXWahOZ3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730193961; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kq8VGu24n1+lkwaAdGGCBNQKC7V9a4Y5jMF37lx7Vo8=; b=fMh7twyW8y2QwZefTHkVJnOMOd8hTaH5y7Pn1vUIsP0pS9EN/5s5rNlnVh+PuIEfirSgC9BT6z16jf1oskEkuHZ4UVYiexdBPvojwuxSOWJoTvOMoG5lP1vE96/m99FE3SyJp/k8n35w3C9m5ySjX2MUD47mFeLAj93lHQzROyo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730193961843366.5934780061124; Tue, 29 Oct 2024 02:26:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5iTX-0007bn-DT; Tue, 29 Oct 2024 05:25: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 1t5iTG-0007Un-PM for qemu-devel@nongnu.org; Tue, 29 Oct 2024 05:25:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5iTC-00041f-J3 for qemu-devel@nongnu.org; Tue, 29 Oct 2024 05:25:01 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-278-8NQQTzqpNQeL6IvmLlqXjA-1; Tue, 29 Oct 2024 05:24:52 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 530D319560B7; Tue, 29 Oct 2024 09:24:51 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.191]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 297E01956054; Tue, 29 Oct 2024 09:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730193896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kq8VGu24n1+lkwaAdGGCBNQKC7V9a4Y5jMF37lx7Vo8=; b=W6zHTiFSfRCgDC8AVj++amiDJy1pf6qA8sgg9rZ5Ci+7l/xk6vp2Bwhb+MJ2epzz3gb4IU pQX5mJY6JzOA5DI8wGH4CFQ3J8w2xaECY1NhzHYxU23S3aeEWwNSWJS2hDM9GRN4dDnCSE 7QlVf8SzMsMZFoEi1rJ6ShCxe3cS81E= X-MC-Unique: 8NQQTzqpNQeL6IvmLlqXjA-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Niek Linnenbank , Joel Stanley Subject: [PATCH 1/2] tests/functional: Convert BananaPi tests to the functional framework Date: Tue, 29 Oct 2024 10:24:39 +0100 Message-ID: <20241029092440.25021-2-thuth@redhat.com> In-Reply-To: <20241029092440.25021-1-thuth@redhat.com> References: <20241029092440.25021-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.373, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1730193963855116600 Content-Type: text/plain; charset="utf-8" Move the BananaPi tests from tests/avocado/boot_linux_console.py into a new file dedicated for Banana Pi tests in the functional framework. Update the hash sums of the assets to sha256 along the way and fix the broken link for the buildroot image from storage.kernelci.org. (Note: The test_arm_bpim2u_openwrt_22_03_3 test is currently broken due to a regression in commit 4c2c047469 ("target/arm: Fix usage of MMU indexes when EL3 is AArch32") - it works if that commit gets reverted) Signed-off-by: Thomas Huth --- tests/avocado/boot_linux_console.py | 176 ------------------------ tests/functional/meson.build | 2 + tests/functional/qemu_test/utils.py | 21 +++ tests/functional/test_arm_bpim2u.py | 206 ++++++++++++++++++++++++++++ 4 files changed, 229 insertions(+), 176 deletions(-) create mode 100755 tests/functional/test_arm_bpim2u.py diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux= _console.py index 23d1b3587b..d05abf0d1a 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -471,182 +471,6 @@ def test_arm_quanta_gsj_initrd(self): self.wait_for_console_pattern( 'Give root password for system maintenance') =20 - def test_arm_bpim2u(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:bpim2u - :avocado: tags=3Daccel:tcg - """ - deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') - deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' - deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) - kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-6.6.16-current-= sunxi') - dtb_path =3D ('/usr/lib/linux-image-6.6.16-current-sunxi/' - 'sun8i-r40-bananapi-m2-ultra.dtb') - dtb_path =3D self.extract_from_deb(deb_path, dtb_path) - - self.vm.set_console() - kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + - 'console=3DttyS0,115200n8 ' - 'earlycon=3Duart,mmio32,0x1c28000') - self.vm.add_args('-kernel', kernel_path, - '-dtb', dtb_path, - '-append', kernel_command_line) - self.vm.launch() - console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) - - def test_arm_bpim2u_initrd(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Daccel:tcg - :avocado: tags=3Dmachine:bpim2u - """ - deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') - deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' - deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) - kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-6.6.16-current-= sunxi') - dtb_path =3D ('/usr/lib/linux-image-6.6.16-current-sunxi/' - 'sun8i-r40-bananapi-m2-ultra.dtb') - dtb_path =3D self.extract_from_deb(deb_path, dtb_path) - initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/' - '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' - 'arm/rootfs-armv7a.cpio.gz') - initrd_hash =3D '604b2e45cdf35045846b8bbfbf2129b1891bdc9c' - initrd_path_gz =3D self.fetch_asset(initrd_url, asset_hash=3Dinitr= d_hash) - initrd_path =3D os.path.join(self.workdir, 'rootfs.cpio') - archive.gzip_uncompress(initrd_path_gz, initrd_path) - - self.vm.set_console() - kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + - 'console=3DttyS0,115200 ' - 'panic=3D-1 noreboot') - self.vm.add_args('-kernel', kernel_path, - '-dtb', dtb_path, - '-initrd', initrd_path, - '-append', kernel_command_line, - '-no-reboot') - self.vm.launch() - self.wait_for_console_pattern('Boot successful.') - - exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', - 'Allwinner sun8i Family') - exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', - 'system-control@1c00000') - exec_command_and_wait_for_pattern(self, 'reboot', - 'reboot: Restarting system= ') - # Wait for VM to shut down gracefully - self.vm.wait() - - def test_arm_bpim2u_gmac(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Daccel:tcg - :avocado: tags=3Dmachine:bpim2u - :avocado: tags=3Ddevice:sd - """ - self.require_netdev('user') - - deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') - deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' - deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) - kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-6.6.16-current-= sunxi') - dtb_path =3D ('/usr/lib/linux-image-6.6.16-current-sunxi/' - 'sun8i-r40-bananapi-m2-ultra.dtb') - dtb_path =3D self.extract_from_deb(deb_path, dtb_path) - rootfs_url =3D ('http://storage.kernelci.org/images/rootfs/buildro= ot/' - 'buildroot-baseline/20221116.0/armel/rootfs.ext2.xz') - rootfs_hash =3D 'fae32f337c7b87547b10f42599acf109da8b6d9a' - rootfs_path_xz =3D self.fetch_asset(rootfs_url, asset_hash=3Drootf= s_hash) - rootfs_path =3D os.path.join(self.workdir, 'rootfs.cpio') - archive.lzma_uncompress(rootfs_path_xz, rootfs_path) - image_pow2ceil_expand(rootfs_path) - - self.vm.set_console() - kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + - 'console=3DttyS0,115200 ' - 'root=3Db300 rootwait rw ' - 'panic=3D-1 noreboot') - self.vm.add_args('-kernel', kernel_path, - '-dtb', dtb_path, - '-drive', 'file=3D' + rootfs_path + ',if=3Dsd,for= mat=3Draw', - '-net', 'nic,model=3Dgmac,netdev=3Dhost_gmac', - '-netdev', 'user,id=3Dhost_gmac', - '-append', kernel_command_line, - '-no-reboot') - self.vm.launch() - shell_ready =3D "/bin/sh: can't access tty; job control turned off" - self.wait_for_console_pattern(shell_ready) - - exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', - 'Allwinner sun8i Family') - exec_command_and_wait_for_pattern(self, 'cat /proc/partitions', - 'mmcblk') - exec_command_and_wait_for_pattern(self, 'ifconfig eth0 up', - 'eth0: Link is Up') - exec_command_and_wait_for_pattern(self, 'udhcpc eth0', - 'udhcpc: lease of 10.0.2.15 obtained') - exec_command_and_wait_for_pattern(self, 'ping -c 3 10.0.2.2', - '3 packets transmitted, 3 packets received, 0% packet loss') - exec_command_and_wait_for_pattern(self, 'reboot', - 'reboot: Restarting system= ') - # Wait for VM to shut down gracefully - self.vm.wait() - - @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') - def test_arm_bpim2u_openwrt_22_03_3(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:bpim2u - :avocado: tags=3Ddevice:sd - """ - - # This test download a 8.9 MiB compressed image and expand it - # to 127 MiB. - image_url =3D ('https://downloads.openwrt.org/releases/22.03.3/tar= gets/' - 'sunxi/cortexa7/openwrt-22.03.3-sunxi-cortexa7-' - 'sinovoip_bananapi-m2-ultra-ext4-sdcard.img.gz') - image_hash =3D ('5b41b4e11423e562c6011640f9a7cd3b' - 'dd0a3d42b83430f7caa70a432e6cd82c') - image_path_gz =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash, - algorithm=3D'sha256') - image_path =3D archive.extract(image_path_gz, self.workdir) - image_pow2ceil_expand(image_path) - - self.vm.set_console() - self.vm.add_args('-drive', 'file=3D' + image_path + ',if=3Dsd,form= at=3Draw', - '-nic', 'user', - '-no-reboot') - self.vm.launch() - - kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + - 'usbcore.nousb ' - 'noreboot') - - self.wait_for_console_pattern('U-Boot SPL') - - interrupt_interactive_console_until_pattern( - self, 'Hit any key to stop autoboot:', '=3D>') - exec_command_and_wait_for_pattern(self, "setenv extraargs '" + - kernel_command_line + "'",= '=3D>') - exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel .= ..'); - - self.wait_for_console_pattern( - 'Please press Enter to activate this console.') - - exec_command_and_wait_for_pattern(self, ' ', 'root@') - - exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', - 'Allwinner sun8i Family') - exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', - 'system-control@1c00000') - def test_arm_orangepi(self): """ :avocado: tags=3Darch:arm diff --git a/tests/functional/meson.build b/tests/functional/meson.build index d642c11516..0a6880b610 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -15,6 +15,7 @@ test_timeouts =3D { 'aarch64_sbsaref' : 600, 'aarch64_virt' : 360, 'acpi_bits' : 240, + 'arm_bpim2u' : 360, 'arm_raspi2' : 120, 'arm_tuxrun' : 120, 'mips_malta' : 120, @@ -52,6 +53,7 @@ tests_alpha_system_thorough =3D [ ] =20 tests_arm_system_thorough =3D [ + 'arm_bpim2u', 'arm_canona1100', 'arm_integratorcp', 'arm_raspi2', diff --git a/tests/functional/qemu_test/utils.py b/tests/functional/qemu_te= st/utils.py index 2a1cb60d38..1bf1c410d5 100644 --- a/tests/functional/qemu_test/utils.py +++ b/tests/functional/qemu_test/utils.py @@ -15,6 +15,27 @@ import subprocess import tarfile =20 +""" +Round up to next power of 2 +""" +def pow2ceil(x): + return 1 if x =3D=3D 0 else 2**(x - 1).bit_length() + +def file_truncate(path, size): + if size !=3D os.path.getsize(path): + with open(path, 'ab+') as fd: + fd.truncate(size) + +""" +Expand file size to next power of 2 +""" +def image_pow2ceil_expand(path): + size =3D os.path.getsize(path) + size_aligned =3D pow2ceil(size) + if size !=3D size_aligned: + with open(path, 'ab+') as fd: + fd.truncate(size_aligned) + def archive_extract(archive, dest_dir, member=3DNone): with tarfile.open(archive) as tf: if hasattr(tarfile, 'data_filter'): diff --git a/tests/functional/test_arm_bpim2u.py b/tests/functional/test_ar= m_bpim2u.py new file mode 100755 index 0000000000..2f9fa145e3 --- /dev/null +++ b/tests/functional/test_arm_bpim2u.py @@ -0,0 +1,206 @@ +#!/usr/bin/env python3 +# +# Functional test that boots a Linux kernel on a Banana Pi machine +# and checks the console +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os + +from qemu_test import LinuxKernelTest, exec_command_and_wait_for_pattern +from qemu_test import Asset, interrupt_interactive_console_until_pattern +from qemu_test.utils import archive_extract, gzip_uncompress, lzma_uncompr= ess +from qemu_test.utils import image_pow2ceil_expand +from unittest import skipUnless + +class BananaPiMachine(LinuxKernelTest): + + ASSET_DEB =3D Asset( + ('https://apt.armbian.com/pool/main/l/linux-6.6.16/' + 'linux-image-current-sunxi_24.2.1_armhf__6.6.16-Seb3e-D6b4a-P2359= -Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb'), + '3d968c15b121ede871dce49d13ee7644d6f74b6b121b84c9a40f51b0c80d6d22') + + ASSET_INITRD =3D Asset( + ('https://github.com/groeck/linux-build-test/raw/' + '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' + 'arm/rootfs-armv7a.cpio.gz'), + '2c8dbdb16ea7af2dfbcbea96044dde639fb07d09fd3c4fb31f2027ef71e55ddd') + + ASSET_ROOTFS =3D Asset( + ('http://storage.kernelci.org/images/rootfs/buildroot/' + 'buildroot-baseline/20230703.0/armel/rootfs.ext2.xz'), + '42b44a12965ac0afe9a88378527fb698a7dc76af50495efc2361ee1595b4e5c6') + + ASSET_SD_IMAGE =3D Asset( + ('https://downloads.openwrt.org/releases/22.03.3/targets/sunxi/cor= texa7/' + 'openwrt-22.03.3-sunxi-cortexa7-sinovoip_bananapi-m2-ultra-ext4-s= dcard.img.gz'), + '5b41b4e11423e562c6011640f9a7cd3bdd0a3d42b83430f7caa70a432e6cd82c') + + def test_arm_bpim2u(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:bpim2u + :avocado: tags=3Daccel:tcg + """ + self.set_machine('bpim2u') + deb_path =3D self.ASSET_DEB.fetch() + kernel_path =3D self.extract_from_deb(deb_path, + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D ('/usr/lib/linux-image-6.6.16-current-sunxi/' + 'sun8i-r40-bananapi-m2-ultra.dtb') + dtb_path =3D self.extract_from_deb(deb_path, dtb_path) + + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0,115200n8 ' + 'earlycon=3Duart,mmio32,0x1c28000') + self.vm.add_args('-kernel', kernel_path, + '-dtb', dtb_path, + '-append', kernel_command_line) + self.vm.launch() + console_pattern =3D 'Kernel command line: %s' % kernel_command_line + self.wait_for_console_pattern(console_pattern) + os.remove(kernel_path) + os.remove(dtb_path) + + def test_arm_bpim2u_initrd(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Daccel:tcg + :avocado: tags=3Dmachine:bpim2u + """ + self.set_machine('bpim2u') + deb_path =3D self.ASSET_DEB.fetch() + kernel_path =3D self.extract_from_deb(deb_path, + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D ('/usr/lib/linux-image-6.6.16-current-sunxi/' + 'sun8i-r40-bananapi-m2-ultra.dtb') + dtb_path =3D self.extract_from_deb(deb_path, dtb_path) + initrd_path_gz =3D self.ASSET_INITRD.fetch() + initrd_path =3D os.path.join(self.workdir, 'rootfs.cpio') + gzip_uncompress(initrd_path_gz, initrd_path) + + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0,115200 ' + 'panic=3D-1 noreboot') + self.vm.add_args('-kernel', kernel_path, + '-dtb', dtb_path, + '-initrd', initrd_path, + '-append', kernel_command_line, + '-no-reboot') + self.vm.launch() + self.wait_for_console_pattern('Boot successful.') + + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'Allwinner sun8i Family') + exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', + 'system-control@1c00000') + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system= ') + # Wait for VM to shut down gracefully + self.vm.wait() + os.remove(kernel_path) + os.remove(dtb_path) + os.remove(initrd_path) + + def test_arm_bpim2u_gmac(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:bpim2u + :avocado: tags=3Ddevice:sd + """ + self.set_machine('bpim2u') + self.require_netdev('user') + + deb_path =3D self.ASSET_DEB.fetch() + kernel_path =3D self.extract_from_deb(deb_path, + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D ('/usr/lib/linux-image-6.6.16-current-sunxi/' + 'sun8i-r40-bananapi-m2-ultra.dtb') + dtb_path =3D self.extract_from_deb(deb_path, dtb_path) + rootfs_path_xz =3D self.ASSET_ROOTFS.fetch() + rootfs_path =3D os.path.join(self.workdir, 'rootfs.cpio') + lzma_uncompress(rootfs_path_xz, rootfs_path) + image_pow2ceil_expand(rootfs_path) + + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0,115200 ' + 'root=3Db300 rootwait rw ' + 'panic=3D-1 noreboot') + self.vm.add_args('-kernel', kernel_path, + '-dtb', dtb_path, + '-drive', 'file=3D' + rootfs_path + ',if=3Dsd,for= mat=3Draw', + '-net', 'nic,model=3Dgmac,netdev=3Dhost_gmac', + '-netdev', 'user,id=3Dhost_gmac', + '-append', kernel_command_line, + '-no-reboot') + self.vm.launch() + shell_ready =3D "/bin/sh: can't access tty; job control turned off" + self.wait_for_console_pattern(shell_ready) + + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'Allwinner sun8i Family') + exec_command_and_wait_for_pattern(self, 'cat /proc/partitions', + 'mmcblk') + exec_command_and_wait_for_pattern(self, 'ifconfig eth0 up', + 'eth0: Link is Up') + exec_command_and_wait_for_pattern(self, 'udhcpc eth0', + 'udhcpc: lease of 10.0.2.15 obtained') + exec_command_and_wait_for_pattern(self, 'ping -c 3 10.0.2.2', + '3 packets transmitted, 3 packets received, 0% packet loss') + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system= ') + # Wait for VM to shut down gracefully + self.vm.wait() + os.remove(kernel_path) + os.remove(dtb_path) + os.remove(rootfs_path) + + @skipUnless(os.getenv('QEMU_TEST_ALLOW_LARGE_STORAGE'), 'storage limit= ed') + def test_arm_bpim2u_openwrt_22_03_3(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:bpim2u + :avocado: tags=3Ddevice:sd + """ + self.set_machine('bpim2u') + # This test download a 8.9 MiB compressed image and expand it + # to 127 MiB. + image_path_gz =3D self.ASSET_SD_IMAGE.fetch() + image_path =3D os.path.join(self.workdir, 'sdcard.img') + gzip_uncompress(image_path_gz, image_path) + image_pow2ceil_expand(image_path) + + self.vm.set_console() + self.vm.add_args('-drive', 'file=3D' + image_path + ',if=3Dsd,form= at=3Draw', + '-nic', 'user', + '-no-reboot') + self.vm.launch() + + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'usbcore.nousb ' + 'noreboot') + + self.wait_for_console_pattern('U-Boot SPL') + + interrupt_interactive_console_until_pattern( + self, 'Hit any key to stop autoboot:', '=3D>') + exec_command_and_wait_for_pattern(self, "setenv extraargs '" + + kernel_command_line + "'",= '=3D>') + exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel .= ..'); + + self.wait_for_console_pattern( + 'Please press Enter to activate this console.') + + exec_command_and_wait_for_pattern(self, ' ', 'root@') + + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'Allwinner sun8i Family') + exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', + 'system-control@1c00000') + os.remove(image_path) + +if __name__ =3D=3D '__main__': + LinuxKernelTest.main() --=20 2.47.0 From nobody Sat Nov 23 18:17:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1730193973; cv=none; d=zohomail.com; s=zohoarc; b=n4i3khrtbnHotC5DA+/RqTFx5ke5yKVb5cBQO09v2qfRFzN1F5pbzyEDTcSCLQ4JTIyIUcwEBLU0GyK7GihVpJYShjo6GKsX0QjkqxldcPJ1DR3tgiNi1pey2Nb+MY6c4bNSVLWxsbPRlcUqVEQIrpGzCnfdWb2I2ntsox3jqkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730193973; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KDZtbWAAeZZnDGQOnVYpnmFC1S+l5V0dPc1+QOh4AhM=; b=N56m1dRXh7rL4KILkuqAUsJZQLz/FDTWbJn5VF3/+wVJ0AGgslYi4zQ71gZRDbm1ZpFbYigEfH+bB7xb1oqQFYmtO6AENRiBsc+KagccvhfWWlLWekPcSTMEkMHRNMZJygaqHaR1ja8toghrbDaXFdK07sb9qrppn7g9u5LLptY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 173019397381720.044242554687344; Tue, 29 Oct 2024 02:26:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5iTj-0007e0-9Q; Tue, 29 Oct 2024 05:25:31 -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 1t5iTJ-0007VE-2O for qemu-devel@nongnu.org; Tue, 29 Oct 2024 05:25:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5iTF-00042A-BS for qemu-devel@nongnu.org; Tue, 29 Oct 2024 05:25:04 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-258-3r2Ptw1QNiSnIHaGXvvYhw-1; Tue, 29 Oct 2024 05:24:56 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6F1EA19560A3; Tue, 29 Oct 2024 09:24:55 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.191]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 150A919560AA; Tue, 29 Oct 2024 09:24:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730193900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KDZtbWAAeZZnDGQOnVYpnmFC1S+l5V0dPc1+QOh4AhM=; b=ZAhZbh7FDwMswPRCa6J74lmnPVd5/SdiNX1f2b/93tlGaiqUr9pBABnwuMTaft4VbPNX/u kpJKH3h4klf8+oDqanZ+RXGYn1JOz6VXyWeDXqiDR4f2XWf/dcfNOiWgYA2X+CrjWthTO5 CUTZI3MBME0WcpFnCmZ4yiNxDOXiWZ4= X-MC-Unique: 3r2Ptw1QNiSnIHaGXvvYhw-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Niek Linnenbank , Joel Stanley Subject: [PATCH 2/2] tests/functional: Convert the OrangePi tests to the functional framework Date: Tue, 29 Oct 2024 10:24:40 +0100 Message-ID: <20241029092440.25021-3-thuth@redhat.com> In-Reply-To: <20241029092440.25021-1-thuth@redhat.com> References: <20241029092440.25021-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.373, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1730193976110116600 Content-Type: text/plain; charset="utf-8" Move the OrangePi tests from tests/avocado/boot_linux_console.py into a new file dedicated for OrangePi tests in the functional framework and update the hash sums of the assets to sha256 along the way. For the buildroot image and the Armbian image, we've got to switch to a newer version since the old images have been removed from the server, and the NetBSD image has been moved to the archive, so we need to update this URL as well. Signed-off-by: Thomas Huth --- MAINTAINERS | 1 + tests/avocado/boot_linux_console.py | 235 ---------------------- tests/functional/meson.build | 2 + tests/functional/test_arm_orangepi.py | 270 ++++++++++++++++++++++++++ 4 files changed, 273 insertions(+), 235 deletions(-) create mode 100755 tests/functional/test_arm_orangepi.py diff --git a/MAINTAINERS b/MAINTAINERS index c3bfa132fd..822c82775b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -640,6 +640,7 @@ F: hw/*/allwinner-h3* F: include/hw/*/allwinner-h3* F: hw/arm/orangepi.c F: docs/system/arm/orangepi.rst +F: tests/functional/test_arm_orangepi.py =20 ARM PrimeCell and CMSDK devices M: Peter Maydell diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux= _console.py index d05abf0d1a..12e24bb05a 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -471,241 +471,6 @@ def test_arm_quanta_gsj_initrd(self): self.wait_for_console_pattern( 'Give root password for system maintenance') =20 - def test_arm_orangepi(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:orangepi-pc - :avocado: tags=3Daccel:tcg - """ - deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') - deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' - deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) - kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-6.6.16-current-= sunxi') - dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun8i-h3-o= rangepi-pc.dtb' - dtb_path =3D self.extract_from_deb(deb_path, dtb_path) - - self.vm.set_console() - kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + - 'console=3DttyS0,115200n8 ' - 'earlycon=3Duart,mmio32,0x1c28000') - self.vm.add_args('-kernel', kernel_path, - '-dtb', dtb_path, - '-append', kernel_command_line) - self.vm.launch() - console_pattern =3D 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) - - def test_arm_orangepi_initrd(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Daccel:tcg - :avocado: tags=3Dmachine:orangepi-pc - """ - deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') - deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' - deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) - kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-6.6.16-current-= sunxi') - dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun8i-h3-o= rangepi-pc.dtb' - dtb_path =3D self.extract_from_deb(deb_path, dtb_path) - initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/' - '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' - 'arm/rootfs-armv7a.cpio.gz') - initrd_hash =3D '604b2e45cdf35045846b8bbfbf2129b1891bdc9c' - initrd_path_gz =3D self.fetch_asset(initrd_url, asset_hash=3Dinitr= d_hash) - initrd_path =3D os.path.join(self.workdir, 'rootfs.cpio') - archive.gzip_uncompress(initrd_path_gz, initrd_path) - - self.vm.set_console() - kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + - 'console=3DttyS0,115200 ' - 'panic=3D-1 noreboot') - self.vm.add_args('-kernel', kernel_path, - '-dtb', dtb_path, - '-initrd', initrd_path, - '-append', kernel_command_line, - '-no-reboot') - self.vm.launch() - self.wait_for_console_pattern('Boot successful.') - - exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', - 'Allwinner sun8i Family') - exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', - 'system-control@1c00000') - exec_command_and_wait_for_pattern(self, 'reboot', - 'reboot: Restarting system= ') - # Wait for VM to shut down gracefully - self.vm.wait() - - def test_arm_orangepi_sd(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Daccel:tcg - :avocado: tags=3Dmachine:orangepi-pc - :avocado: tags=3Ddevice:sd - """ - self.require_netdev('user') - - deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') - deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' - deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) - kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-6.6.16-current-= sunxi') - dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun8i-h3-o= rangepi-pc.dtb' - dtb_path =3D self.extract_from_deb(deb_path, dtb_path) - rootfs_url =3D ('http://storage.kernelci.org/images/rootfs/buildro= ot/' - 'buildroot-baseline/20221116.0/armel/rootfs.ext2.xz') - rootfs_hash =3D 'fae32f337c7b87547b10f42599acf109da8b6d9a' - rootfs_path_xz =3D self.fetch_asset(rootfs_url, asset_hash=3Drootf= s_hash) - rootfs_path =3D os.path.join(self.workdir, 'rootfs.cpio') - archive.lzma_uncompress(rootfs_path_xz, rootfs_path) - image_pow2ceil_expand(rootfs_path) - - self.vm.set_console() - kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + - 'console=3DttyS0,115200 ' - 'root=3D/dev/mmcblk0 rootwait rw ' - 'panic=3D-1 noreboot') - self.vm.add_args('-kernel', kernel_path, - '-dtb', dtb_path, - '-drive', 'file=3D' + rootfs_path + ',if=3Dsd,for= mat=3Draw', - '-append', kernel_command_line, - '-no-reboot') - self.vm.launch() - shell_ready =3D "/bin/sh: can't access tty; job control turned off" - self.wait_for_console_pattern(shell_ready) - - exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', - 'Allwinner sun8i Family') - exec_command_and_wait_for_pattern(self, 'cat /proc/partitions', - 'mmcblk0') - exec_command_and_wait_for_pattern(self, 'ifconfig eth0 up', - 'eth0: Link is Up') - exec_command_and_wait_for_pattern(self, 'udhcpc eth0', - 'udhcpc: lease of 10.0.2.15 obtained') - exec_command_and_wait_for_pattern(self, 'ping -c 3 10.0.2.2', - '3 packets transmitted, 3 packets received, 0% packet loss') - exec_command_and_wait_for_pattern(self, 'reboot', - 'reboot: Restarting system= ') - # Wait for VM to shut down gracefully - self.vm.wait() - - @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') - def test_arm_orangepi_bionic_20_08(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:orangepi-pc - :avocado: tags=3Ddevice:sd - """ - - # This test download a 275 MiB compressed image and expand it - # to 1036 MiB, but the underlying filesystem is 1552 MiB... - # As we expand it to 2 GiB we are safe. - - image_url =3D ('https://archive.armbian.com/orangepipc/archive/' - 'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.= xz') - image_hash =3D ('b4d6775f5673486329e45a0586bf06b6' - 'dbe792199fd182ac6b9c7bb6c7d3e6dd') - image_path_xz =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash, - algorithm=3D'sha256') - image_path =3D archive.extract(image_path_xz, self.workdir) - image_pow2ceil_expand(image_path) - - self.vm.set_console() - self.vm.add_args('-drive', 'file=3D' + image_path + ',if=3Dsd,form= at=3Draw', - '-nic', 'user', - '-no-reboot') - self.vm.launch() - - kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + - 'console=3DttyS0,115200 ' - 'loglevel=3D7 ' - 'nosmp ' - 'systemd.default_timeout_start_sec=3D9000 ' - 'systemd.mask=3Darmbian-zram-config.service= ' - 'systemd.mask=3Darmbian-ramlog.service') - - self.wait_for_console_pattern('U-Boot SPL') - self.wait_for_console_pattern('Autoboot in ') - exec_command_and_wait_for_pattern(self, ' ', '=3D>') - exec_command_and_wait_for_pattern(self, "setenv extraargs '" + - kernel_command_line + "'",= '=3D>') - exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel .= ..'); - - self.wait_for_console_pattern('systemd[1]: Set hostname ' + - 'to ') - self.wait_for_console_pattern('Starting Load Kernel Modules...') - - @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') - def test_arm_orangepi_uboot_netbsd9(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:orangepi-pc - :avocado: tags=3Ddevice:sd - :avocado: tags=3Dos:netbsd - """ - # This test download a 304MB compressed image and expand it to 2GB - deb_url =3D ('http://snapshot.debian.org/archive/debian/' - '20200108T145233Z/pool/main/u/u-boot/' - 'u-boot-sunxi_2020.01%2Bdfsg-1_armhf.deb') - deb_hash =3D 'f67f404a80753ca3d1258f13e38f2b060e13db99' - deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) - # We use the common OrangePi PC 'plus' build of U-Boot for our sec= ondary - # program loader (SPL). We will then set the path to the more spec= ific - # OrangePi "PC" device tree blob with 'setenv fdtfile' in U-Boot p= rompt, - # before to boot NetBSD. - uboot_path =3D '/usr/lib/u-boot/orangepi_plus/u-boot-sunxi-with-sp= l.bin' - uboot_path =3D self.extract_from_deb(deb_path, uboot_path) - image_url =3D ('https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.0/' - 'evbarm-earmv7hf/binary/gzimg/armv7.img.gz') - image_hash =3D '2babb29d36d8360adcb39c09e31060945259917a' - image_path_gz =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash) - image_path =3D os.path.join(self.workdir, 'armv7.img') - archive.gzip_uncompress(image_path_gz, image_path) - image_pow2ceil_expand(image_path) - image_drive_args =3D 'if=3Dsd,format=3Draw,snapshot=3Don,file=3D' = + image_path - - # dd if=3Du-boot-sunxi-with-spl.bin of=3Darmv7.img bs=3D1K seek=3D= 8 conv=3Dnotrunc - with open(uboot_path, 'rb') as f_in: - with open(image_path, 'r+b') as f_out: - f_out.seek(8 * 1024) - shutil.copyfileobj(f_in, f_out) - - self.vm.set_console() - self.vm.add_args('-nic', 'user', - '-drive', image_drive_args, - '-global', 'allwinner-rtc.base-year=3D2000', - '-no-reboot') - self.vm.launch() - wait_for_console_pattern(self, 'U-Boot 2020.01+dfsg-1') - interrupt_interactive_console_until_pattern(self, - 'Hit any key to stop autoboot:', - 'switch to partitions #0, OK') - - exec_command_and_wait_for_pattern(self, '', '=3D>') - cmd =3D 'setenv bootargs root=3Dld0a' - exec_command_and_wait_for_pattern(self, cmd, '=3D>') - cmd =3D 'setenv kernel netbsd-GENERIC.ub' - exec_command_and_wait_for_pattern(self, cmd, '=3D>') - cmd =3D 'setenv fdtfile dtb/sun8i-h3-orangepi-pc.dtb' - exec_command_and_wait_for_pattern(self, cmd, '=3D>') - cmd =3D ("setenv bootcmd 'fatload mmc 0:1 ${kernel_addr_r} ${kerne= l}; " - "fatload mmc 0:1 ${fdt_addr_r} ${fdtfile}; " - "fdt addr ${fdt_addr_r}; " - "bootm ${kernel_addr_r} - ${fdt_addr_r}'") - exec_command_and_wait_for_pattern(self, cmd, '=3D>') - - exec_command_and_wait_for_pattern(self, 'boot', - 'Booting kernel from Legacy Imag= e') - wait_for_console_pattern(self, 'Starting kernel ...') - wait_for_console_pattern(self, 'NetBSD 9.0 (GENERIC)') - # Wait for user-space - wait_for_console_pattern(self, 'Starting root file system check') - def test_arm_ast2600_debian(self): """ :avocado: tags=3Darch:arm diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 0a6880b610..9120ff5466 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -16,6 +16,7 @@ test_timeouts =3D { 'aarch64_virt' : 360, 'acpi_bits' : 240, 'arm_bpim2u' : 360, + 'arm_orangepi' : 540, 'arm_raspi2' : 120, 'arm_tuxrun' : 120, 'mips_malta' : 120, @@ -56,6 +57,7 @@ tests_arm_system_thorough =3D [ 'arm_bpim2u', 'arm_canona1100', 'arm_integratorcp', + 'arm_orangepi', 'arm_raspi2', 'arm_vexpress', 'arm_tuxrun', diff --git a/tests/functional/test_arm_orangepi.py b/tests/functional/test_= arm_orangepi.py new file mode 100755 index 0000000000..d2ed5fcc82 --- /dev/null +++ b/tests/functional/test_arm_orangepi.py @@ -0,0 +1,270 @@ +#!/usr/bin/env python3 +# +# Functional test that boots a Linux kernel on an Orange Pi machine +# and checks the console +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import shutil + +from qemu_test import LinuxKernelTest, exec_command_and_wait_for_pattern +from qemu_test import Asset, interrupt_interactive_console_until_pattern +from qemu_test import wait_for_console_pattern +from qemu_test.utils import archive_extract, gzip_uncompress, lzma_uncompr= ess +from qemu_test.utils import image_pow2ceil_expand +from unittest import skipUnless + +class BananaPiMachine(LinuxKernelTest): + + ASSET_DEB =3D Asset( + ('https://apt.armbian.com/pool/main/l/linux-6.6.16/' + 'linux-image-current-sunxi_24.2.1_armhf__6.6.16-Seb3e-D6b4a-P2359= -Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb'), + '3d968c15b121ede871dce49d13ee7644d6f74b6b121b84c9a40f51b0c80d6d22') + + ASSET_INITRD =3D Asset( + ('https://github.com/groeck/linux-build-test/raw/' + '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' + 'arm/rootfs-armv7a.cpio.gz'), + '2c8dbdb16ea7af2dfbcbea96044dde639fb07d09fd3c4fb31f2027ef71e55ddd') + + ASSET_ROOTFS =3D Asset( + ('http://storage.kernelci.org/images/rootfs/buildroot/' + 'buildroot-baseline/20230703.0/armel/rootfs.ext2.xz'), + '42b44a12965ac0afe9a88378527fb698a7dc76af50495efc2361ee1595b4e5c6') + + ASSET_ARMBIAN =3D Asset( + ('https://k-space.ee.armbian.com/archive/orangepipc/archive/' + 'Armbian_23.8.1_Orangepipc_jammy_current_6.1.47.img.xz'), + 'b386dff6552513b5f164ea00f94814a6b0f1da9fb90b83725e949cf797e11afb') + + ASSET_UBOOT =3D Asset( + ('http://snapshot.debian.org/archive/debian/20200108T145233Z/pool/' + 'main/u/u-boot/u-boot-sunxi_2020.01%2Bdfsg-1_armhf.deb'), + '9223d94dc283ab54df41ce9d6f69025a5b47fece29fb67a714e23aa0cdf3bdfa') + + ASSET_NETBSD =3D Asset( + ('https://archive.netbsd.org/pub/NetBSD-archive/NetBSD-9.0/' + 'evbarm-earmv7hf/binary/gzimg/armv7.img.gz'), + '20d3e07dc057e15c12452620e90ecab2047f0f7940d9cba8182ebc795927177f') + + def test_arm_orangepi(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:orangepi-pc + :avocado: tags=3Daccel:tcg + """ + self.set_machine('orangepi-pc') + deb_path =3D self.ASSET_DEB.fetch() + kernel_path =3D self.extract_from_deb(deb_path, + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun8i-h3-o= rangepi-pc.dtb' + dtb_path =3D self.extract_from_deb(deb_path, dtb_path) + + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0,115200n8 ' + 'earlycon=3Duart,mmio32,0x1c28000') + self.vm.add_args('-kernel', kernel_path, + '-dtb', dtb_path, + '-append', kernel_command_line) + self.vm.launch() + console_pattern =3D 'Kernel command line: %s' % kernel_command_line + self.wait_for_console_pattern(console_pattern) + os.remove(kernel_path) + os.remove(dtb_path) + + def test_arm_orangepi_initrd(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Daccel:tcg + :avocado: tags=3Dmachine:orangepi-pc + """ + self.set_machine('orangepi-pc') + deb_path =3D self.ASSET_DEB.fetch() + kernel_path =3D self.extract_from_deb(deb_path, + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun8i-h3-o= rangepi-pc.dtb' + dtb_path =3D self.extract_from_deb(deb_path, dtb_path) + initrd_path_gz =3D self.ASSET_INITRD.fetch() + initrd_path =3D os.path.join(self.workdir, 'rootfs.cpio') + gzip_uncompress(initrd_path_gz, initrd_path) + + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0,115200 ' + 'panic=3D-1 noreboot') + self.vm.add_args('-kernel', kernel_path, + '-dtb', dtb_path, + '-initrd', initrd_path, + '-append', kernel_command_line, + '-no-reboot') + self.vm.launch() + self.wait_for_console_pattern('Boot successful.') + + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'Allwinner sun8i Family') + exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', + 'system-control@1c00000') + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system= ') + # Wait for VM to shut down gracefully + self.vm.wait() + os.remove(kernel_path) + os.remove(dtb_path) + os.remove(initrd_path) + + def test_arm_orangepi_sd(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Daccel:tcg + :avocado: tags=3Dmachine:orangepi-pc + :avocado: tags=3Ddevice:sd + """ + self.set_machine('orangepi-pc') + self.require_netdev('user') + deb_path =3D self.ASSET_DEB.fetch() + kernel_path =3D self.extract_from_deb(deb_path, + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun8i-h3-o= rangepi-pc.dtb' + dtb_path =3D self.extract_from_deb(deb_path, dtb_path) + rootfs_path_xz =3D self.ASSET_ROOTFS.fetch() + rootfs_path =3D os.path.join(self.workdir, 'rootfs.cpio') + lzma_uncompress(rootfs_path_xz, rootfs_path) + image_pow2ceil_expand(rootfs_path) + + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0,115200 ' + 'root=3D/dev/mmcblk0 rootwait rw ' + 'panic=3D-1 noreboot') + self.vm.add_args('-kernel', kernel_path, + '-dtb', dtb_path, + '-drive', 'file=3D' + rootfs_path + ',if=3Dsd,for= mat=3Draw', + '-append', kernel_command_line, + '-no-reboot') + self.vm.launch() + shell_ready =3D "/bin/sh: can't access tty; job control turned off" + self.wait_for_console_pattern(shell_ready) + + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'Allwinner sun8i Family') + exec_command_and_wait_for_pattern(self, 'cat /proc/partitions', + 'mmcblk0') + exec_command_and_wait_for_pattern(self, 'ifconfig eth0 up', + 'eth0: Link is Up') + exec_command_and_wait_for_pattern(self, 'udhcpc eth0', + 'udhcpc: lease of 10.0.2.15 obtained') + exec_command_and_wait_for_pattern(self, 'ping -c 3 10.0.2.2', + '3 packets transmitted, 3 packets received, 0% packet loss') + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system= ') + # Wait for VM to shut down gracefully + self.vm.wait() + os.remove(kernel_path) + os.remove(dtb_path) + os.remove(rootfs_path) + + @skipUnless(os.getenv('QEMU_TEST_ALLOW_LARGE_STORAGE'), 'storage limit= ed') + def test_arm_orangepi_armbian(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:orangepi-pc + :avocado: tags=3Ddevice:sd + """ + self.set_machine('orangepi-pc') + # This test download a 275 MiB compressed image and expand it + # to 1036 MiB, but the underlying filesystem is 1552 MiB... + # As we expand it to 2 GiB we are safe. + image_path_xz =3D self.ASSET_ARMBIAN.fetch() + image_path =3D os.path.join(self.workdir, 'armbian.img') + lzma_uncompress(image_path_xz, image_path) + image_pow2ceil_expand(image_path) + + self.vm.set_console() + self.vm.add_args('-drive', 'file=3D' + image_path + ',if=3Dsd,form= at=3Draw', + '-nic', 'user', + '-no-reboot') + self.vm.launch() + + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'console=3DttyS0,115200 ' + 'loglevel=3D7 ' + 'nosmp ' + 'systemd.default_timeout_start_sec=3D9000 ' + 'systemd.mask=3Darmbian-zram-config.service= ' + 'systemd.mask=3Darmbian-ramlog.service') + + self.wait_for_console_pattern('U-Boot SPL') + self.wait_for_console_pattern('Autoboot in ') + exec_command_and_wait_for_pattern(self, ' ', '=3D>') + exec_command_and_wait_for_pattern(self, "setenv extraargs '" + + kernel_command_line + "'",= '=3D>') + exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel .= ..'); + + self.wait_for_console_pattern('systemd[1]: Hostname set ' + + 'to ') + self.wait_for_console_pattern('Starting Load Kernel Modules...') + + @skipUnless(os.getenv('QEMU_TEST_ALLOW_LARGE_STORAGE'), 'storage limit= ed') + def test_arm_orangepi_uboot_netbsd9(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:orangepi-pc + :avocado: tags=3Ddevice:sd + :avocado: tags=3Dos:netbsd + """ + self.set_machine('orangepi-pc') + # This test download a 304MB compressed image and expand it to 2GB + deb_path =3D self.ASSET_UBOOT.fetch() + # We use the common OrangePi PC 'plus' build of U-Boot for our sec= ondary + # program loader (SPL). We will then set the path to the more spec= ific + # OrangePi "PC" device tree blob with 'setenv fdtfile' in U-Boot p= rompt, + # before to boot NetBSD. + uboot_path =3D '/usr/lib/u-boot/orangepi_plus/u-boot-sunxi-with-sp= l.bin' + uboot_path =3D self.extract_from_deb(deb_path, uboot_path) + image_path_gz =3D self.ASSET_NETBSD.fetch() + image_path =3D os.path.join(self.workdir, 'armv7.img') + gzip_uncompress(image_path_gz, image_path) + image_pow2ceil_expand(image_path) + image_drive_args =3D 'if=3Dsd,format=3Draw,snapshot=3Don,file=3D' = + image_path + + # dd if=3Du-boot-sunxi-with-spl.bin of=3Darmv7.img bs=3D1K seek=3D= 8 conv=3Dnotrunc + with open(uboot_path, 'rb') as f_in: + with open(image_path, 'r+b') as f_out: + f_out.seek(8 * 1024) + shutil.copyfileobj(f_in, f_out) + + self.vm.set_console() + self.vm.add_args('-nic', 'user', + '-drive', image_drive_args, + '-global', 'allwinner-rtc.base-year=3D2000', + '-no-reboot') + self.vm.launch() + wait_for_console_pattern(self, 'U-Boot 2020.01+dfsg-1') + interrupt_interactive_console_until_pattern(self, + 'Hit any key to stop autoboot:', + 'switch to partitions #0, OK') + + exec_command_and_wait_for_pattern(self, '', '=3D>') + cmd =3D 'setenv bootargs root=3Dld0a' + exec_command_and_wait_for_pattern(self, cmd, '=3D>') + cmd =3D 'setenv kernel netbsd-GENERIC.ub' + exec_command_and_wait_for_pattern(self, cmd, '=3D>') + cmd =3D 'setenv fdtfile dtb/sun8i-h3-orangepi-pc.dtb' + exec_command_and_wait_for_pattern(self, cmd, '=3D>') + cmd =3D ("setenv bootcmd 'fatload mmc 0:1 ${kernel_addr_r} ${kerne= l}; " + "fatload mmc 0:1 ${fdt_addr_r} ${fdtfile}; " + "fdt addr ${fdt_addr_r}; " + "bootm ${kernel_addr_r} - ${fdt_addr_r}'") + exec_command_and_wait_for_pattern(self, cmd, '=3D>') + + exec_command_and_wait_for_pattern(self, 'boot', + 'Booting kernel from Legacy Imag= e') + wait_for_console_pattern(self, 'Starting kernel ...') + wait_for_console_pattern(self, 'NetBSD 9.0 (GENERIC)') + # Wait for user-space + wait_for_console_pattern(self, 'Starting root file system check') + +if __name__ =3D=3D '__main__': + LinuxKernelTest.main() --=20 2.47.0