From nobody Thu Nov 13 16:34:15 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=amsat.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581794619238185.7444838643587; Sat, 15 Feb 2020 11:23:39 -0800 (PST) Received: from localhost ([::1]:53884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j332Q-0005gW-1b for importer@patchew.org; Sat, 15 Feb 2020 14:23:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36412) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j331D-00042u-Aj for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j331C-0000uK-4Q for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:23 -0500 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:44757) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j331B-0000ta-Ue for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:22 -0500 Received: by mail-ed1-x543.google.com with SMTP id g19so15417529eds.11 for ; Sat, 15 Feb 2020 11:22:21 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a24sm657128ejt.40.2020.02.15.11.22.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 11:22:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T9g/uHvPBoXhUQDq2QsJ245v2/hf9EivqbEoJ3SIqVI=; b=O0ZOiTqAgEDNvTqaFZl96dP515q36pnwm/o6kOFowuLoG7ZYJVZHO6qIw1NKR/PclW SG+J4OwxoSJK/eMQQkfxdpJROP5QqmNWPfPG+so+KCuwGC3DDknIz0RoCeWZ791iTyk1 +hBjtnlgjhcfx2j2BGhSeJveVN5688BX8TkmSpoV58b+zuVhsjJrEL/RjPEBRX84xgeD mB3oJvwICMmzZPj9CODdSL9qG8kX2Oxzqd1G/mKW1bBJ/DVL4/UcKt4IaajIoYzdqnpC QoOSZy91sCFw2sx7q+wYHMjFW7qZSqkowTsDBX7vjjWHIxumnZ7lIhHepBRzX3bvac43 vUMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=T9g/uHvPBoXhUQDq2QsJ245v2/hf9EivqbEoJ3SIqVI=; b=hNU7vG/SsIiNSMDouv8bCNd8cqN5O9j3Z0WveZQ0JLwcC9WnzZp1UkdfpHvkfFCysS DyyhiSVHMG1470I9tqHSPUybcE60G0ggdWK8SIqBP3s//1leUSiSQzU4UWDtjCGdyWnn UgxDGyXcQoQgJ1WA+/lSOXQrLHmhRsMckXqfXRiLoZixXyeblwUNVHs8tmJCNMLyzv2V NW/axz02Td1ig7nAp/bMf4XMNaKBkQu/JdkV8yWLFDF9lA2kWCAeWiL7TB7CfJEc0bEW MUFaxLXb6qzxK5Lvmt134sC2zOqjI+jwgvOv1SgId1r6rqj5fCja3XUfSqbjxqFSYGUp meXw== X-Gm-Message-State: APjAAAXox/ODo88Hjsjz8S64VU3DadAB6AWERNx0FxjCQe92YMjhoPBS EHvSaxscECG0nXJPkF6OyZ9NqBikfxs= X-Google-Smtp-Source: APXvYqw9ciBVVR2btddrB8upvlmzxtHD2XfgWqRdl25JaGCJhdAcF8Km7PYbdDsh4E19K/0ucSjf8w== X-Received: by 2002:a17:906:5210:: with SMTP id g16mr8349779ejm.305.1581794540603; Sat, 15 Feb 2020 11:22:20 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/8] tests/acceptance/boot_linux_console: Use raspi console model as key Date: Sat, 15 Feb 2020 20:22:09 +0100 Message-Id: <20200215192216.4899-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200215192216.4899-1-f4bug@amsat.org> References: <20200215192216.4899-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::543 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Python dictionary are not that expensive. Use a key makes the code easier to review. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel --- tests/acceptance/boot_linux_console.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 34d37eba3b..8cfc758d42 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -347,14 +347,14 @@ def test_arm_emcraft_sf2(self): self.vm.launch() self.wait_for_console_pattern('init started: BusyBox') =20 - def do_test_arm_raspi2(self, uart_id): + def do_test_arm_raspi2(self, uart_model): """ The kernel can be rebuilt using the kernel source referenced and following the instructions on the on: https://www.raspberrypi.org/documentation/linux/kernel/building.md """ serial_kernel_cmdline =3D { - 0: 'earlycon=3Dpl011,0x3f201000 console=3DttyAMA0', + 'pl011': 'earlycon=3Dpl011,0x3f201000 console=3DttyAMA0', } deb_url =3D ('http://archive.raspberrypi.org/debian/' 'pool/main/r/raspberrypi-firmware/' @@ -366,7 +366,7 @@ def do_test_arm_raspi2(self, uart_id): =20 self.vm.set_console() kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + - serial_kernel_cmdline[uart_id]) + serial_kernel_cmdline[uart_model]) self.vm.add_args('-kernel', kernel_path, '-dtb', dtb_path, '-append', kernel_command_line) @@ -380,7 +380,7 @@ def test_arm_raspi2_uart0(self): :avocado: tags=3Dmachine:raspi2 :avocado: tags=3Ddevice:pl011 """ - self.do_test_arm_raspi2(0) + self.do_test_arm_raspi2('pl011') =20 def test_arm_exynos4210_initrd(self): """ --=20 2.21.1 From nobody Thu Nov 13 16:34:15 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581794672387817.230017090626; Sat, 15 Feb 2020 11:24:32 -0800 (PST) Received: from localhost ([::1]:53902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j333H-0007sW-4x for importer@patchew.org; Sat, 15 Feb 2020 14:24:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36426) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j331F-000451-Am for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j331D-0000v9-6B for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:25 -0500 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:37436) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j331C-0000uZ-Vz for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:23 -0500 Received: by mail-ed1-x541.google.com with SMTP id t7so3804339edr.4 for ; Sat, 15 Feb 2020 11:22:22 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a24sm657128ejt.40.2020.02.15.11.22.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 11:22:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4cYBXqS3UQh4dHtUacPsPiQgmHWGNLbdxXAjBX0BgL8=; b=N9tCOiwMK3N4rK+gvIo0fNKGmHKIFkEfcMHRBGHiDwW5oSMGzPFWI8X12VHuSekKHz n1vTWJXCLCyDdcmkM3ybB68NH5+avqQIsDfnyCNE1CK1yVUxn/X0cduOp6/zZSErHSgs b7q4dp71l//uBu6/hpN/J+pubYfRXHEhOnMwjD0gTYCU3Mo10cnVDLG9GOTAQ2tkdiyl fu16I0kQljO5E46dFts4YnjWO/b5llg73risr1R0D1nQzK1QHasos+U8UM2qFQlE7Aha x3c7zSh6c4EtKYFzav8VmmzJs5TzkMMg2Y1lgytTGsCeqmJB8zKCPLdK6AjKbV3gRm7A Zn2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4cYBXqS3UQh4dHtUacPsPiQgmHWGNLbdxXAjBX0BgL8=; b=U4fL0qR87hGyBVXbdmqGn+FerVJpk94r5AifTD6W2JdLLtwdRGd+vvUm4Fe60LgOCB WuK/F4iTknNM1Vn3E7L1Max2+SS20ljypQZpWP7QQ3sfdK/cRFiSXZxXmzmXX7YOZ49c X6vfZ8JV9yujFzXUOwKH7dUWhkrdXEuey2I1RiYvKKWBkl2aHHuevKbQLtiMNIuU+eDs mZOaDXKTr5vAU0YnivvZ+veAaNAVAO9gL48B42FsBjfykcsDLEAYlpB3Y61PBRdUOkRJ 1CprPKd9keqV3/A0iSrrPdDhZmQsLa6KyP5cE77QOS2hVkCp2Ah3BQUO0DFW5NNyYoTD DLkw== X-Gm-Message-State: APjAAAVeHKh0i+Y6TEYMCb3xCnZAB502Bg2OvlHBInOCY/LsD5itRQem YI7oUwsYPVgmIPvanZZCpfNqzB0qdWA= X-Google-Smtp-Source: APXvYqyyrmqKPNWgX4yoMSzCPAtyp2XDW7Cjpqo40FghUIwatzVz3qArAKNXvLylfA/dd+3QF0RkhA== X-Received: by 2002:a50:a864:: with SMTP id j91mr8176296edc.318.1581794541891; Sat, 15 Feb 2020 11:22:21 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/8] tests/acceptance/boot_linux_console: Add raspi version=2 parameter Date: Sat, 15 Feb 2020 20:22:10 +0100 Message-Id: <20200215192216.4899-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200215192216.4899-1-f4bug@amsat.org> References: <20200215192216.4899-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::541 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We want to tests different Raspberry Pi machines. Refactor to take the board version as argument. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel --- tests/acceptance/boot_linux_console.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 8cfc758d42..a1b6e70d3f 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -347,26 +347,34 @@ def test_arm_emcraft_sf2(self): self.vm.launch() self.wait_for_console_pattern('init started: BusyBox') =20 - def do_test_arm_raspi2(self, uart_model): + def do_test_arm_raspi(self, version, uart_model): """ The kernel can be rebuilt using the kernel source referenced and following the instructions on the on: https://www.raspberrypi.org/documentation/linux/kernel/building.md """ serial_kernel_cmdline =3D { - 'pl011': 'earlycon=3Dpl011,0x3f201000 console=3DttyAMA0', + 'pl011': { + 2: 'earlycon=3Dpl011,0x3f201000 console=3DttyAMA0', + }, + } + kernel =3D { + 2: '/boot/kernel7.img', + } + dtb =3D { + 2: '/boot/bcm2709-rpi-2-b.dtb', } deb_url =3D ('http://archive.raspberrypi.org/debian/' 'pool/main/r/raspberrypi-firmware/' 'raspberrypi-kernel_1.20190215-1_armhf.deb') deb_hash =3D 'cd284220b32128c5084037553db3c482426f3972' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) - kernel_path =3D self.extract_from_deb(deb_path, '/boot/kernel7.img= ') - dtb_path =3D self.extract_from_deb(deb_path, '/boot/bcm2709-rpi-2-= b.dtb') + kernel_path =3D self.extract_from_deb(deb_path, kernel[version]) + dtb_path =3D self.extract_from_deb(deb_path, dtb[version]) =20 self.vm.set_console() kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + - serial_kernel_cmdline[uart_model]) + serial_kernel_cmdline[uart_model][version]) self.vm.add_args('-kernel', kernel_path, '-dtb', dtb_path, '-append', kernel_command_line) @@ -378,9 +386,10 @@ def test_arm_raspi2_uart0(self): """ :avocado: tags=3Darch:arm :avocado: tags=3Dmachine:raspi2 + :avocado: tags=3Dcpu:cortex-a7 :avocado: tags=3Ddevice:pl011 """ - self.do_test_arm_raspi2('pl011') + self.do_test_arm_raspi(2, 'pl011') =20 def test_arm_exynos4210_initrd(self): """ --=20 2.21.1 From nobody Thu Nov 13 16:34:15 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=amsat.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581794799358489.74481812265685; Sat, 15 Feb 2020 11:26:39 -0800 (PST) Received: from localhost ([::1]:53938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j335K-0002lM-4X for importer@patchew.org; Sat, 15 Feb 2020 14:26:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36430) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j331F-000460-Rw for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j331E-0000w3-Kw for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:25 -0500 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:42369) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j331E-0000vf-EY for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:24 -0500 Received: by mail-ed1-x535.google.com with SMTP id e10so15432852edv.9 for ; Sat, 15 Feb 2020 11:22:24 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a24sm657128ejt.40.2020.02.15.11.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 11:22:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DOWa9iVNzRi2wiFe8WeDuCCmr7A3b0qlB/RcGKV1zU8=; b=u9jdQOCQCDTsHykfv+mbPzD6som3lvh7Ho8BfDHndIat6IjNIQYZF1EEhXNunSLlfb jF4el2DtmHhJQ/FBGwlqGjZt/xa24oxSwdX7NbFfbwnqKDUnM2H6HXwmS4dt3QVAF+wz bXWyHkmet5LJGkzmL7rLdL9LpLZxLwZ6VPS9XMa7y/ZBDLN/1gChELL5C4nM9PK7WDsN SfGkhnCHf+BHzBJNaEiy31e49dp+JIXNPIpLRHRB5P1wmdMNUNNovdGoXyJLVTVg3DHx iscpOBceN77ehGG52tqrKyQhv82mw9JDLyJNoiuoACrp/LGcHJo0cudSdgBlTlPE9Nm6 Tpbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DOWa9iVNzRi2wiFe8WeDuCCmr7A3b0qlB/RcGKV1zU8=; b=QWc7XuAjJKPmXUeFwL3qqzbvNnr60mCgK+lycaGO2YQW/U0L7R09CoUnz6GA32vEy/ NBICFv4xjBZrhU1U5ftP0teWlG7qgeq0WinROb0RNsQOViUkDPw3RP294VBZnr+daSR/ MFHqQ6Of0SF3fMlfiOKJuVaN9WOlFJyRv8PYpB1mYUsw5YshXsgqYmyeMSOIT7bB+/+s EAI1f7g7bueKFgBLgZO/TVudRfJlHDqpydXtO7a++KHTRJNMdd/GNy3fEcVR6xN0vfj5 QAwOegnJkt/pDp0QH8S0VYzQ5BYc9mjfQKJ6F2XIes8OS4xS/Fikeg72Sm944Q15EE8F tiKA== X-Gm-Message-State: APjAAAXBtuWj34ZIrv7p6jl1kFHst9HqJCJykEALXQPIJTOA1Ii6HSV6 S3G8/Q/T3FelF+xElKRdFSgutLgvG/8= X-Google-Smtp-Source: APXvYqyQPyrJ7r+k1ws+AOJSyiSLQI5tjekRbvxe1QKTs+lZ6yx3GnJXKgrvtw+mzqrD0mtirMso8Q== X-Received: by 2002:a17:906:f105:: with SMTP id gv5mr8308011ejb.135.1581794543219; Sat, 15 Feb 2020 11:22:23 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/8] tests/acceptance/boot_linux_console: Test the raspi1 console Date: Sat, 15 Feb 2020 20:22:11 +0100 Message-Id: <20200215192216.4899-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200215192216.4899-1-f4bug@amsat.org> References: <20200215192216.4899-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::535 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) $ avocado --show=3Dapp,console run -t machine:raspi1 tests/acceptance/ JOB ID : c49310d4a21444f03789cd2c443d8c54a29ffd0a JOB LOG : avocado/job-results/job-2020-02-05T23.52-c49310d/job.log (1/1) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_r= aspi1_uart0: console: [ 0.000000] Booting Linux on physical CPU 0x0 console: [ 0.000000] Linux version 4.14.98+ (dom@dom-XPS-13-9370) (gcc= version 4.9.3 (crosstool-NG crosstool-ng-1.22.0-88-g8460611)) #1200 Tue Fe= b 12 20:11:02 GMT 2019 console: [ 0.000000] CPU: ARMv6-compatible processor [410fb767] revisi= on 7 (ARMv7), cr=3D00c5387d console: [ 0.000000] CPU: VIPT aliasing data cache, unknown instructio= n cache console: [ 0.000000] OF: fdt: Machine model: Raspberry Pi Model B console: [ 0.000000] earlycon: pl11 at MMIO 0x20201000 (options '') console: [ 0.000000] bootconsole [pl11] enabled console: [ 0.000000] Memory policy: Data cache writeback console: [ 0.000000] cma: Reserved 8 MiB at 0x1b800000 console: [ 0.000000] Built 1 zonelists, mobility grouping on. Total p= ages: 113680 console: [ 0.000000] Kernel command line: printk.time=3D0 earlycon=3Dp= l011,0x20201000 console=3DttyAMA0 PASS (12.93 s) RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | = CANCEL 0 JOB TIME : 13.18 s Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel --- tests/acceptance/boot_linux_console.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index a1b6e70d3f..c8eabae695 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -355,13 +355,16 @@ def do_test_arm_raspi(self, version, uart_model): """ serial_kernel_cmdline =3D { 'pl011': { + 1: 'earlycon=3Dpl011,0x20201000 console=3DttyAMA0', 2: 'earlycon=3Dpl011,0x3f201000 console=3DttyAMA0', }, } kernel =3D { + 1: '/boot/kernel.img', 2: '/boot/kernel7.img', } dtb =3D { + 1: '/boot/bcm2708-rpi-b.dtb', 2: '/boot/bcm2709-rpi-2-b.dtb', } deb_url =3D ('http://archive.raspberrypi.org/debian/' @@ -382,6 +385,15 @@ def do_test_arm_raspi(self, version, uart_model): console_pattern =3D 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) =20 + def test_arm_raspi1_uart0(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:raspi1 + :avocado: tags=3Dcpu:arm1176 + :avocado: tags=3Ddevice:pl011 + """ + self.do_test_arm_raspi(1, 'pl011') + def test_arm_raspi2_uart0(self): """ :avocado: tags=3Darch:arm --=20 2.21.1 From nobody Thu Nov 13 16:34:15 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=amsat.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581794709358591.0953717384454; Sat, 15 Feb 2020 11:25:09 -0800 (PST) Received: from localhost ([::1]:53906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j333s-0000ME-4C for importer@patchew.org; Sat, 15 Feb 2020 14:25:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36445) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j331H-00048m-3a for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j331F-0000xM-Vl for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:27 -0500 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:33902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j331F-0000wI-OJ for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:25 -0500 Received: by mail-ed1-x541.google.com with SMTP id r18so15484541edl.1 for ; Sat, 15 Feb 2020 11:22:25 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a24sm657128ejt.40.2020.02.15.11.22.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 11:22:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1Vyu9OnmWLRZk34xoTCmZmRuvcPUbomKmqmGWzA039U=; b=EKgFpt8vK68yhgmHOlXXi7COP6KaADvMvoM1xcvkzpNoFmPZ7lvdhjANri/X5gdNUs 0QOrFwv9WXKvq+JO/D30P0/9sDZuc5w1UHYfPjAmOTELvwJuNGgVyd/kMNY6DFNntiDb uf2HFuaUOFlIT93xNNd9f42rSKle4oxIlPBXpLn5S6GJsrZVLjRp0vCJfPz0Thy9oa73 LuUrefxZ7vrs8oRtCMMVw1RsyYpV+qldidFm4QQLP+BfnIY+Ap8rSnGii/wEE4IGaC3y A+A9hgJCwRKQQdvaZaZDd6HZdb2foFxTgrsh1J+14d14nDqUuZG1AMYr0cEPWv0IbBC9 b8vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1Vyu9OnmWLRZk34xoTCmZmRuvcPUbomKmqmGWzA039U=; b=EqAMWVG8it9XEjrdaPcb8iZLTexpnmJuupeA9eK/pFs13w5/gK7XTvhpnsqjneGsv3 V8pVJhN8BQkHAGjkrCJxtRC2erSJVlZiRB3yoDEWTyO9JG3u7RQ1+ojKTMp2c8BR3yJb icp6KLhVKUfPNvjCUELKAuwtGX9VX1tQYSZGUebKVYZ0WjsI2fu41bwnxAc2hy9YNK/w kg5Pw+/8amMz8AOONIckckleSlgzd+hz1n/aDeokRlc7puO9Ofbo6hAB2j/0N4mTH2jU CLaMQYQDW2hVB7SNm802fgHf0rhVbGoFqdPZWeUPCPOfm+lC1KFmKTnvKEWRJjWQ1S4h WssA== X-Gm-Message-State: APjAAAWPk0zwUOju1fjSSEmeV0xdPRZIRQF6agMe7C7egSU8yLn7K1we ylmZKtYXj0Cs5l2P7mPC2Y7gVZWK8j0= X-Google-Smtp-Source: APXvYqx0yOlFtVdwLa0GhSdeaLOAssFshLn0AZcXBbOZuVCkTdWsgRZQXC528ylHpPtodyF4+wuvQQ== X-Received: by 2002:a17:906:3746:: with SMTP id e6mr8694432ejc.165.1581794544602; Sat, 15 Feb 2020 11:22:24 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/8] tests/acceptance/boot_linux_console: Test the raspi0 console Date: Sat, 15 Feb 2020 20:22:12 +0100 Message-Id: <20200215192216.4899-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200215192216.4899-1-f4bug@amsat.org> References: <20200215192216.4899-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::541 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) $ avocado --show=3Dapp,console run -t machine:raspi0 tests/acceptance/ JOB ID : af8e017486290758bff39c986934134199af3556 JOB LOG : avocado/job-results/job-2020-02-05T23.53-af8e017/job.log (1/1) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_r= aspi0_uart0: console: [ 0.000000] Booting Linux on physical CPU 0x0 console: [ 0.000000] Linux version 4.14.98+ (dom@dom-XPS-13-9370) (gcc= version 4.9.3 (crosstool-NG crosstool-ng-1.22.0-88-g8460611)) #1200 Tue Fe= b 12 20:11:02 GMT 2019 console: [ 0.000000] CPU: ARMv6-compatible processor [410fb767] revisi= on 7 (ARMv7), cr=3D00c5387d console: [ 0.000000] CPU: VIPT aliasing data cache, unknown instructio= n cache console: [ 0.000000] OF: fdt: Machine model: Raspberry Pi Zero W console: [ 0.000000] earlycon: pl11 at MMIO 0x20201000 (options '') console: [ 0.000000] bootconsole [pl11] enabled console: [ 0.000000] Memory policy: Data cache writeback console: [ 0.000000] cma: Reserved 8 MiB at 0x1b800000 console: [ 0.000000] Built 1 zonelists, mobility grouping on. Total p= ages: 113680 console: [ 0.000000] Kernel command line: printk.time=3D0 earlycon=3Dp= l011,0x20201000 console=3DttyAMA0 PASS (12.59 s) RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | = CANCEL 0 JOB TIME : 12.88 s Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel --- tests/acceptance/boot_linux_console.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index c8eabae695..bd3f0fc852 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -355,15 +355,18 @@ def do_test_arm_raspi(self, version, uart_model): """ serial_kernel_cmdline =3D { 'pl011': { + 0: 'earlycon=3Dpl011,0x20201000 console=3DttyAMA0', 1: 'earlycon=3Dpl011,0x20201000 console=3DttyAMA0', 2: 'earlycon=3Dpl011,0x3f201000 console=3DttyAMA0', }, } kernel =3D { + 0: '/boot/kernel.img', 1: '/boot/kernel.img', 2: '/boot/kernel7.img', } dtb =3D { + 0: '/boot/bcm2708-rpi-0-w.dtb', 1: '/boot/bcm2708-rpi-b.dtb', 2: '/boot/bcm2709-rpi-2-b.dtb', } @@ -385,6 +388,15 @@ def do_test_arm_raspi(self, version, uart_model): console_pattern =3D 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) =20 + def test_arm_raspi0_uart0(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:raspi0 + :avocado: tags=3Dcpu:arm1176 + :avocado: tags=3Ddevice:pl011 + """ + self.do_test_arm_raspi(0, 'pl011') + def test_arm_raspi1_uart0(self): """ :avocado: tags=3Darch:arm --=20 2.21.1 From nobody Thu Nov 13 16:34:15 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581794822097536.5884293234053; Sat, 15 Feb 2020 11:27:02 -0800 (PST) Received: from localhost ([::1]:53944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j335g-0003RI-TV for importer@patchew.org; Sat, 15 Feb 2020 14:27:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36457) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j331I-0004D5-Qt for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j331H-0000zA-EX for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:28 -0500 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:46537) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j331H-0000y8-7Q for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:27 -0500 Received: by mail-ed1-x544.google.com with SMTP id p14so7289543edy.13 for ; Sat, 15 Feb 2020 11:22:27 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a24sm657128ejt.40.2020.02.15.11.22.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 11:22:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tzrui7Hni4HFas47JhhX91fv9JSO990o0375X1EFRvA=; b=Y2VFKwqKuyOKh2fZHOUSqMmH7qFh3qXZhhJrDA9lvf0Ak3QDxxoCnggcMkwgc/u/Ss J24qPzJu1u9Vr03FoOj8UZ9QIbmIkDUB1LRjHkvIJfaeF3hfO/9/AV2+C53xoizEtGVi re8HUXO9Hs0Cf8zqVTihfMw5mB4uF++JYeVGO0FBefpI+Gj4Io+kyaG3v40MDzKIQoBq yt8SW/KS4PKVXNd/hHWxfa78lozMhDJFZS8iUo9KHYzXrou8IQ5ELWgcKYoQv5QA1jNW RqoDLR8W4T9+HnLFGNjIXykh6zkOzwwelAB3XrJ45Nd3SkfcYH3nUdnCiNlQJItjcpdG BzyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tzrui7Hni4HFas47JhhX91fv9JSO990o0375X1EFRvA=; b=ufudAQfIi/2DDjba5FS2yyw7gIt97rfNUmImCbCkDOYOcg7mlYn+wkQkhC6JSzBzNp 9xA+qUX1Of3U1eAwLUlD3IvDckV1aphrKCA+tKZw97+TMJNIM3+7h/YB2r4O/5bu5aDI oBhaDejhvgCSiGe7x0hQVCewKCFZzvZQGZ7JmagsW0vSSfv3olWQm1FV5448BlsdsZ+Y kiRQHYiveVJirKQh1JAmBQyYJBnoF2SCAwCPv+6vHXjpPQVuX+f5NaUHsvu/cOjPdXqK e2CQQOP4lPx+IXJkXC/nTgqM+/j3IFHP9ink6w3k4+e0Ku0rN1PnJ/iWOkJ7dc9RKr0Y bTqw== X-Gm-Message-State: APjAAAVWESrtoLbPcPntO6kAtXtDlxlho/1HysVoUmNlO/S4YraOi/ej 6ubzVgaf7iz/8h6CeAIgausCM5xWlFQ= X-Google-Smtp-Source: APXvYqzARskAAw3XImlSx0Y7jKGg1loNMYvhMzaxSl1hWagJJgDAu6PUr7acneCnzd5B+v+kFiVdsQ== X-Received: by 2002:a17:906:4a5a:: with SMTP id a26mr8428680ejv.49.1581794545977; Sat, 15 Feb 2020 11:22:25 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/8] tests/acceptance/boot_linux_console: Test the raspi1 AUX console Date: Sat, 15 Feb 2020 20:22:13 +0100 Message-Id: <20200215192216.4899-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200215192216.4899-1-f4bug@amsat.org> References: <20200215192216.4899-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::544 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) $ avocado --show=3Dapp,console run -t device:bcm2835_aux tests/acceptance/ JOB ID : a8846d69d52da701681b1d17f80ef299009fd078 JOB LOG : avocado/job-results/job-2020-02-05T23.44-a8846d6/job.log (1/3) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_r= aspi0_uart1: console: [ 0.000000] Booting Linux on physical CPU 0x0 console: [ 0.000000] Linux version 4.14.98+ (dom@dom-XPS-13-9370) (gcc= version 4.9.3 (crosstool-NG crosstool-ng-1.22.0-88-g8460611)) #1200 Tue Fe= b 12 20:11:02 GMT 2019 console: [ 0.000000] CPU: ARMv6-compatible processor [410fb767] revisi= on 7 (ARMv7), cr=3D00c5387d console: [ 0.000000] CPU: VIPT aliasing data cache, unknown instructio= n cache console: [ 0.000000] OF: fdt: Machine model: Raspberry Pi Zero W console: [ 0.000000] earlycon: uart8250 at MMIO32 0x20215040 (options = '') console: [ 0.000000] bootconsole [uart8250] enabled console: [ 0.000000] Memory policy: Data cache writeback console: [ 0.000000] cma: Reserved 8 MiB at 0x1b800000 console: [ 0.000000] Built 1 zonelists, mobility grouping on. Total p= ages: 113680 console: [ 0.000000] Kernel command line: printk.time=3D0 earlycon=3Du= art8250,mmio32,0x20215040 console=3DttyS1,115200 PASS (13.31 s) (2/3) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_r= aspi1_uart1: console: [ 0.000000] Booting Linux on physical CPU 0x0 console: [ 0.000000] Linux version 4.14.98+ (dom@dom-XPS-13-9370) (gcc= version 4.9.3 (crosstool-NG crosstool-ng-1.22.0-88-g8460611)) #1200 Tue Fe= b 12 20:11:02 GMT 2019 console: [ 0.000000] CPU: ARMv6-compatible processor [410fb767] revisi= on 7 (ARMv7), cr=3D00c5387d console: [ 0.000000] CPU: VIPT aliasing data cache, unknown instructio= n cache console: [ 0.000000] OF: fdt: Machine model: Raspberry Pi Model B console: [ 0.000000] earlycon: uart8250 at MMIO32 0x20215040 (options = '') console: [ 0.000000] bootconsole [uart8250] enabled console: [ 0.000000] Memory policy: Data cache writeback console: [ 0.000000] cma: Reserved 8 MiB at 0x1b800000 console: [ 0.000000] Built 1 zonelists, mobility grouping on. Total p= ages: 113680 console: [ 0.000000] Kernel command line: printk.time=3D0 earlycon=3Du= art8250,mmio32,0x20215040 console=3DttyS1,115200 PASS (13.39 s) (3/3) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_r= aspi2_uart1: console: [ 0.000000] Booting Linux on physical CPU 0xf00 console: [ 0.000000] Linux version 4.14.98-v7+ (dom@dom-XPS-13-9370) (= gcc version 4.9.3 (crosstool-NG crosstool-ng-1.22.0-88-g8460611)) #1200 SMP= Tue Feb 12 20:27:48 GMT 2019 console: [ 0.000000] CPU: ARMv7 Processor [410fc075] revision 5 (ARMv7= ), cr=3D10c5387d console: [ 0.000000] CPU: div instructions available: patching divisio= n code console: [ 0.000000] CPU: PIPT / VIPT nonaliasing data cache, VIPT ali= asing instruction cache console: [ 0.000000] OF: fdt: Machine model: Raspberry Pi 2 Model B console: [ 0.000000] earlycon: uart8250 at MMIO32 0x3f215040 (options = '') console: [ 0.000000] bootconsole [uart8250] enabled console: [ 0.000000] Memory policy: Data cache writealloc console: [ 0.000000] cma: Reserved 8 MiB at 0x3b800000 console: [ 0.000000] percpu: Embedded 17 pages/cpu @baf2e000 s38720 r8= 192 d22720 u69632 console: [ 0.000000] Built 1 zonelists, mobility grouping on. Total p= ages: 243600 console: [ 0.000000] Kernel command line: printk.time=3D0 earlycon=3Du= art8250,mmio32,0x3f215040 console=3DttyS1,115200 PASS (12.46 s) RESULTS : PASS 3 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | = CANCEL 0 JOB TIME : 39.60 s Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel --- tests/acceptance/boot_linux_console.py | 37 +++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index bd3f0fc852..3d442b6cd1 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -359,6 +359,14 @@ def do_test_arm_raspi(self, version, uart_model): 1: 'earlycon=3Dpl011,0x20201000 console=3DttyAMA0', 2: 'earlycon=3Dpl011,0x3f201000 console=3DttyAMA0', }, + 'bcm2835_aux': { + 0: 'earlycon=3Duart8250,mmio32,0x20215040 console=3DttyS1,= 115200', + 1: 'earlycon=3Duart8250,mmio32,0x20215040 console=3DttyS1,= 115200', + 2: 'earlycon=3Duart8250,mmio32,0x3f215040 console=3DttyS1,= 115200', + }, + } + uart_id =3D { + 'pl011': 0, 'bcm2835_aux': 1, } kernel =3D { 0: '/boot/kernel.img', @@ -378,7 +386,7 @@ def do_test_arm_raspi(self, version, uart_model): kernel_path =3D self.extract_from_deb(deb_path, kernel[version]) dtb_path =3D self.extract_from_deb(deb_path, dtb[version]) =20 - self.vm.set_console() + self.vm.set_console(console_index=3Duart_id[uart_model]) kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + serial_kernel_cmdline[uart_model][version]) self.vm.add_args('-kernel', kernel_path, @@ -397,6 +405,15 @@ def test_arm_raspi0_uart0(self): """ self.do_test_arm_raspi(0, 'pl011') =20 + def test_arm_raspi0_uart1(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:raspi0 + :avocado: tags=3Dcpu:arm1176 + :avocado: tags=3Ddevice:bcm2835_aux + """ + self.do_test_arm_raspi(0, 'bcm2835_aux') + def test_arm_raspi1_uart0(self): """ :avocado: tags=3Darch:arm @@ -406,6 +423,15 @@ def test_arm_raspi1_uart0(self): """ self.do_test_arm_raspi(1, 'pl011') =20 + def test_arm_raspi1_uart1(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:raspi1 + :avocado: tags=3Dcpu:arm1176 + :avocado: tags=3Ddevice:bcm2835_aux + """ + self.do_test_arm_raspi(1, 'bcm2835_aux') + def test_arm_raspi2_uart0(self): """ :avocado: tags=3Darch:arm @@ -415,6 +441,15 @@ def test_arm_raspi2_uart0(self): """ self.do_test_arm_raspi(2, 'pl011') =20 + def test_arm_raspi2_uart1(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:raspi2 + :avocado: tags=3Dcpu:cortex-a7 + :avocado: tags=3Ddevice:bcm2835_aux + """ + self.do_test_arm_raspi(2, 'bcm2835_aux') + def test_arm_exynos4210_initrd(self): """ :avocado: tags=3Darch:arm --=20 2.21.1 From nobody Thu Nov 13 16:34:15 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=amsat.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158179487582133.7812590652419; Sat, 15 Feb 2020 11:27:55 -0800 (PST) Received: from localhost ([::1]:53954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j336Y-0004t6-23 for importer@patchew.org; Sat, 15 Feb 2020 14:27:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36468) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j331J-0004Fs-Tu for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j331I-00010f-KF for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:29 -0500 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:37440) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j331I-0000zj-Dj for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:28 -0500 Received: by mail-ed1-x544.google.com with SMTP id t7so3804505edr.4 for ; Sat, 15 Feb 2020 11:22:28 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a24sm657128ejt.40.2020.02.15.11.22.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 11:22:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=09Xk8WDBMCC08TR8D0T7ekaeveyV8dl1oOjYfkBK3r4=; b=YaLf/XH6wsVDqz+uCMcOjR3Qko2ZHIc1kHFfovvZmFp6pz0sJn2+kNLnHrZ30tvTn0 +Ti9qxSgOxaGwpRng2gpdPnuVvPIjOJAjLTZSmDlYGu5o2PaPoP6Fterq7lJr1CARViu iBrjz3cKTcTHL47uGioHEoRfI+jaDOs0Yq6FM1KQ2zcUNo3jAK7b9+Lmy+qgIi/Pi5lP IIF3ae6OWQqUUXrVzzxaytBXjZUtDMWrTGSvy9sYgooQO6zZWEugqNKA2mEMBUYAE35c hmMVzWbxe3U+pguzz51LC0XqGWc0lJwPzZQDSXJ50EvoIb2Ydv2rcblDSNEQKpcWNvPe R3nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=09Xk8WDBMCC08TR8D0T7ekaeveyV8dl1oOjYfkBK3r4=; b=fUhP8DKooR9XHBqVTOW08LFmGX/y/VmFAuKMGcoPMjUnCW8Ht5bMkVQZ8M5s0ay1Pc 74ccmF0iXpwFEt957dKuZiN0b4S/sJVFpif5kBEx/r5r+LyN25LITd/R5ymHtGQHGyab 3FEwOmqZzE236qV7XAfPTDy3+YCi7+Kr8K8qFJhwfKB6a8RxQb1d3+EDOHPyEnsP0W+a GwVZpi2XfTlLAziISmylc/MxYKaMqWwLP7PE8T8kCNVGSaLzJvPn/6g3eZzEL++oh2L0 gSdJ7qB5nYzprvDc6l8hMcokCkH9tTpUF2RC5f2vsv5va383QujC65F4sk/BkkmqVfgJ gcrg== X-Gm-Message-State: APjAAAVzqYkj0IFDXMY1ZYGn+2BTm7SYu4kdNlZUluZapHVAoJer53us gQvVUQemKWXWZ1LRJVpDfSv4BvaXjmY= X-Google-Smtp-Source: APXvYqyAWgMB2HAy5L1qb/u48RWQuuL15FbJpHdM4fejvIECboOvi+3dTf6hM90i90og1JC7/xSC2A== X-Received: by 2002:a17:906:bb04:: with SMTP id jz4mr8574711ejb.183.1581794547245; Sat, 15 Feb 2020 11:22:27 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 6/8] tests/boot_linux_console: Test booting U-Boot on the Raspberry Pi 2 Date: Sat, 15 Feb 2020 20:22:14 +0100 Message-Id: <20200215192216.4899-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200215192216.4899-1-f4bug@amsat.org> References: <20200215192216.4899-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::544 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This test runs U-Boot on the Raspberry Pi 2. It is very simple and fast: $ avocado --show=3Dapp,console run -t raspi2 -t u-boot tests/acceptance/ JOB LOG : avocado/job-results/job-2020-01-20T23.40-2424777/job.log (1/1) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_r= aspi2_uboot: console: MMC: sdhci@7e300000: 0 console: Loading Environment from FAT... Card did not respond to voltage = select! console: In: serial console: Out: vidconsole console: Err: vidconsole console: Net: No ethernet found. console: starting USB... console: USB0: Port not available. console: Hit any key to stop autoboot: 0 console: U-Boot> console: U-Boot> bdinfo console: arch_number =3D 0x00000000 console: boot_params =3D 0x00000100 console: DRAM bank =3D 0x00000000 console: -> start =3D 0x00000000 console: -> size =3D 0x3c000000 console: baudrate =3D 115200 bps console: TLB addr =3D 0x3bff0000 console: relocaddr =3D 0x3bf64000 console: reloc off =3D 0x3bf5c000 console: irq_sp =3D 0x3bb5fec0 console: sp start =3D 0x3bb5feb0 console: Early malloc usage: 2a4 / 400 console: fdt_blob =3D 0x3bfbdfb0 console: U-Boot> version console: U-Boot 2019.01+dfsg-7 (May 14 2019 - 02:07:44 +0000) console: gcc (Debian 8.3.0-7) 8.3.0 console: GNU ld (GNU Binutils for Debian) 2.31.1 console: U-Boot> reset console: resetting ... PASS (0.46 s) U-Boot is built by the Debian project, see: https://wiki.debian.org/InstallingDebianOn/Allwinner#Creating_a_bootable_SD= _Card_with_u-boot Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel --- tests/acceptance/boot_linux_console.py | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 3d442b6cd1..3b1952b2df 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -16,6 +16,7 @@ from avocado import skipUnless from avocado_qemu import Test from avocado_qemu import exec_command_and_wait_for_pattern +from avocado_qemu import interrupt_interactive_console_until_pattern from avocado_qemu import wait_for_console_pattern from avocado.utils import process from avocado.utils import archive @@ -575,6 +576,33 @@ def test_arm_cubieboard_sata(self): exec_command_and_wait_for_pattern(self, 'reboot', 'reboot: Restarting system= ') =20 + def test_arm_raspi2_uboot(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:raspi2 + :avocado: tags=3Du-boot + """ + deb_url =3D ('https://snapshot.debian.org/archive/debian/' + '20190514T084354Z/pool/main/u/u-boot/' + 'u-boot-rpi_2019.01%2Bdfsg-7_armhf.deb') + deb_hash =3D 'ad858cf3afe623b6c3fa2e20dcdd1768fcb9ae83' + deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) + uboot_path =3D '/usr/lib/u-boot/rpi_2/uboot.elf' + uboot_path =3D self.extract_from_deb(deb_path, uboot_path) + + self.vm.set_console() + self.vm.add_args('-kernel', uboot_path, + # VideoCore starts CPU with only 1 core enabled + '-global', 'bcm2836.enabled-cpus=3D1', + '-no-reboot') + self.vm.launch() + interrupt_interactive_console_until_pattern(self, + 'Hit any key to stop autoboot:', + 'Config file not found') + exec_command_and_wait_for_pattern(self, 'bdinfo', 'U-Boot') + exec_command_and_wait_for_pattern(self, 'version', 'U-Boot') + exec_command_and_wait_for_pattern(self, 'reset', 'resetting ...') + def test_s390x_s390_ccw_virtio(self): """ :avocado: tags=3Darch:s390x --=20 2.21.1 From nobody Thu Nov 13 16:34:15 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581794905321865.924767018189; Sat, 15 Feb 2020 11:28:25 -0800 (PST) Received: from localhost ([::1]:53958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3371-0005T7-Td for importer@patchew.org; Sat, 15 Feb 2020 14:28:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36482) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j331L-0004Il-4L for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j331J-00013c-Qk for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:31 -0500 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:40772) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j331J-00011M-Jz for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:29 -0500 Received: by mail-ed1-x544.google.com with SMTP id p3so15456747edx.7 for ; Sat, 15 Feb 2020 11:22:29 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a24sm657128ejt.40.2020.02.15.11.22.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 11:22:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PzfywHJFm+G1+KKl/Onq2rp5QkVpIkH04ol8WwJE1Zw=; b=s35Jv7yjc5XdY4TW3ZpEk5RqR8skKfXKFTlvT3ZTPM6OH1hQK1QycSUqrjPqww2tre t2LVmPC4CfhXtecQEf3GMoUXOD9Wa5V6KQrEFCf2WOAUHEhLLzEag8KY4s5NpHqIR6yG zcwasypyrkm6RcUiBg/k2sG7DDg4+rDlXejoxuk5n2NDd+OB+6fghWAnRAuBaFPxZa/x IC5I5o/L5PCtmXsGE4/E4L26JRlfI5/0QduZUn9UJ2uJHH7nOCLWUNJdjPixJV3yBT3C JGd7ctfkb24nygQEKkN4GOOrmqSa22oV/1SUJrPNo5iLm2Xb09lgiEGOpaTiQ4Abovdc YCuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PzfywHJFm+G1+KKl/Onq2rp5QkVpIkH04ol8WwJE1Zw=; b=oCAjXIcoLhhlRMdwmp3XLM79cRDnYo2J5YB+0ZIxXaiM+IFcD93z573n+ZcUwC0BAM 90z89AjJOhc98cagUlNsOtivo4nNW9u6fWE/7JtYUlbXJ8cJpJ0sHFLvAFYTT1X3BICb jBdr97rq44lyUPnK9GNlXTsVOEHWIZPdINr+RP+nsXhU3up8sgKf74PHxb+lvDOupdQj OrKtNh+oVvfi4WP/lXwMx2j7DVqvXYb3o/s2XXQpVKfMDbQKoM6Vu3wcOdcyrX88cnTc x3Kyq0mWUEDnllqSYjKD7brh9Dx6ltKdTwfPGSIklhU/sqwHRUcYROIpLgkmU+6VXsUE yp+g== X-Gm-Message-State: APjAAAWmxEWzwZ3PZIl2tl7QEvIp+fgpHQyGbzYqiwt4P+KhmCqOJVt/ cXOh6B6Pnl8styFwUy52v7WqxKoqJ/E= X-Google-Smtp-Source: APXvYqz4rplq1Fmsn1BZGJORE+dpd0XuDhdxkSMWf6etl1FiQu/fXllxRJSnjSBq6GUT7peNeiml1g== X-Received: by 2002:a05:6402:3047:: with SMTP id bu7mr7899500edb.44.1581794548526; Sat, 15 Feb 2020 11:22:28 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 7/8] tests/boot_linux_console: Test booting U-Boot on the Raspberry Pi 3 Date: Sat, 15 Feb 2020 20:22:15 +0100 Message-Id: <20200215192216.4899-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200215192216.4899-1-f4bug@amsat.org> References: <20200215192216.4899-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::544 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This test runs U-Boot on the Raspberry Pi 3. It is very simple and fast: $ avocado --show=3Dapp,console run -t raspi3 -t u-boot tests/acceptance/ JOB LOG : avocado/job-results/job-2020-01-20T23.40-2424777/job.log (1/1) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_aarch= 64_raspi3_uboot: console: MMC: mmc@7e202000: 0, sdhci@7e300000: 1 console: Loading Environment from FAT... WARNING at drivers/mmc/bcm2835_s= dhost.c:410/bcm2835_send_command()! console: WARNING at drivers/mmc/bcm2835_sdhost.c:410/bcm2835_send_command= ()! console: Card did not respond to voltage select! console: In: serial console: Out: vidconsole console: Err: vidconsole console: Net: No ethernet found. console: starting USB... console: Bus usb@7e980000: Port not available. console: Hit any key to stop autoboot: 0 console: U-Boot> console: U-Boot> console: U-Boot> bdinfo console: arch_number =3D 0x0000000000000000 console: boot_params =3D 0x0000000000000100 console: DRAM bank =3D 0x0000000000000000 console: -> start =3D 0x0000000000000000 console: -> size =3D 0x000000003c000000 console: baudrate =3D 115200 bps console: TLB addr =3D 0x000000003bff0000 console: relocaddr =3D 0x000000003bf57000 console: reloc off =3D 0x000000003bed7000 console: irq_sp =3D 0x000000003bb52dd0 console: sp start =3D 0x000000003bb52dd0 console: FB base =3D 0x0000000000000000 console: Early malloc usage: 7b0 / 2000 console: fdt_blob =3D 0x000000003bfbf200 console: U-Boot> version console: U-Boot 2020.01+dfsg-1 (Jan 08 2020 - 08:19:44 +0000) console: gcc (Debian 9.2.1-22) 9.2.1 20200104 console: GNU ld (GNU Binutils for Debian) 2.33.1 console: U-Boot> reset console: resetting ... PASS (1.79 s) U-Boot is built by the Debian project, see: https://wiki.debian.org/InstallingDebianOn/Allwinner#Creating_a_bootable_SD= _Card_with_u-boot Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel --- tests/acceptance/boot_linux_console.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 3b1952b2df..989db7d461 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -603,6 +603,31 @@ def test_arm_raspi2_uboot(self): exec_command_and_wait_for_pattern(self, 'version', 'U-Boot') exec_command_and_wait_for_pattern(self, 'reset', 'resetting ...') =20 + def test_aarch64_raspi3_uboot(self): + """ + :avocado: tags=3Darch:aarch64 + :avocado: tags=3Dmachine:raspi3 + :avocado: tags=3Du-boot + """ + deb_url =3D ('https://snapshot.debian.org/archive/debian/' + '20200108T145233Z/pool/main/u/u-boot/' + 'u-boot-rpi_2020.01%2Bdfsg-1_arm64.deb') + deb_hash =3D 'f394386e02469d52f2eb3c07a2325b1c95aeb00b' + deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) + uboot_path =3D '/usr/lib/u-boot/rpi_3/u-boot.bin' + uboot_path =3D self.extract_from_deb(deb_path, uboot_path) + + self.vm.set_console(console_index=3D1) + self.vm.add_args('-kernel', uboot_path, + '-no-reboot') + self.vm.launch() + interrupt_interactive_console_until_pattern(self, + 'Hit any key to stop autoboot:', + 'Config file not found') + exec_command_and_wait_for_pattern(self, 'bdinfo', 'U-Boot') + exec_command_and_wait_for_pattern(self, 'version', 'U-Boot') + exec_command_and_wait_for_pattern(self, 'reset', 'resetting ...') + def test_s390x_s390_ccw_virtio(self): """ :avocado: tags=3Darch:s390x --=20 2.21.1 From nobody Thu Nov 13 16:34:15 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581794946754209.36835592967918; Sat, 15 Feb 2020 11:29:06 -0800 (PST) Received: from localhost ([::1]:53968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j337h-0006V9-JW for importer@patchew.org; Sat, 15 Feb 2020 14:29:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36495) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j331M-0004NO-Nz for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j331L-00015b-9s for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:32 -0500 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:46538) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j331L-00014g-2C for qemu-devel@nongnu.org; Sat, 15 Feb 2020 14:22:31 -0500 Received: by mail-ed1-x544.google.com with SMTP id p14so7289659edy.13 for ; Sat, 15 Feb 2020 11:22:30 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a24sm657128ejt.40.2020.02.15.11.22.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 11:22:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M2A4CWYeBUQraMsGqLJVBo2F77JeixbCIjDEu/D75HE=; b=riXWaGz5w5wGYkhJAYi6/K0pIFSLLQHnA3nhAW125c+8PEfI7slcH5Vy6VY4vWsCqR x/Jg7sW+cWub/FjDc/ixYyoWFjVs3Xg1E++Qjhf5G4N1PHRRZWzlytADCtryQiH0e05r zSqhhlRsdcrusrEcSnfEX8CcPaS4qv/5gbfCAx6MkA6sybKB+3JJXCgfjK8fmUwhAcXA 1i1+92fhxGDHCYQmzvHIQgULDeSQ9LMCEzbQcC2f51ZHWANqcYrS3Iy2eK+oaf0ayICt At38qwismfIv+QyHX2tY01m6LzKXVigHxM/qJBpoYi6O1NVCMUnnGo2re5qh2deEXGBW 4XVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=M2A4CWYeBUQraMsGqLJVBo2F77JeixbCIjDEu/D75HE=; b=qZTd4pPocRKt/Og/+JwrPYjaDs1EnTwoOJYj7bWK0swaQGz1f/T5WsZzEbkgj/RvTy W5u/B03vToRAwPCE6qjyj7JPNMCk7Q91entV2C+MQG0afi0Tdll1hTJgwyZdWlaEM+YW LqpvV+Z2b/oFNmbSgYPwrcygtz/L+PfQ78mlIidInWelmFTxDEwrK9ieW3crmzFh3Pdj nGYrg5tQ53O2rith/Wl6QoYIqTOx0rgsftgizC/e3vzx7Rw9Bv55BUA+6/iEWZ26t44q lFJzdclw5vhgbkNtaUXLViRrgpOh5lNv2XoDysmaQUFelqEEzqrUwp0OwcZbXci1gX0V 6YbA== X-Gm-Message-State: APjAAAVXAK9rb09XIAje501ek1xDYgnyK3ephJR0oGJ/sE6sPD/Rpq5P JN9o4IyMqqpRYwjA7KtXY7ESR2g+WG4= X-Google-Smtp-Source: APXvYqyElwgb5I/2wRTw1nKMdNcq7K7aM6pG6HyVzWCU6IA7aVZ1mHeckzUzChM3U9pwToJNbAkKcQ== X-Received: by 2002:a17:906:ccde:: with SMTP id ot30mr8731132ejb.244.1581794549813; Sat, 15 Feb 2020 11:22:29 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 8/8] tests/acceptance: Count Raspberry Pi logos displayed on framebuffer Date: Sat, 15 Feb 2020 20:22:16 +0100 Message-Id: <20200215192216.4899-9-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200215192216.4899-1-f4bug@amsat.org> References: <20200215192216.4899-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::544 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Add a test that verifies that each core properly displays the Raspberry Pi logo on the framebuffer device. We simply follow the OpenCV "Template Matching with Multiple Objects" tutorial, replacing Lionel Messi by a raspberrry: https://docs.opencv.org/4.2.0/d4/dc6/tutorial_py_template_matching.html When OpenCV and NumPy are installed, this test can be run using: $ avocado --show=3Dapp,framebuffer run -t device:bcm2835-fb tests/accepta= nce/ JOB ID : 9bbbc54c0a6fa180348d0b5305507f76852b4da2 JOB LOG : avocado/job-results/job-2020-01-31T23.48-9bbbc54/job.log (1/1) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_r= aspi2_framebuffer_logo: framebuffer: found raspberry at position (x, y) =3D (0, 0) framebuffer: found raspberry at position (x, y) =3D (71, 0) framebuffer: found raspberry at position (x, y) =3D (142, 0) framebuffer: found raspberry at position (x, y) =3D (213, 0) PASS (11.06 s) RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | = CANCEL 0 JOB TIME : 11.39 s Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel --- The resulting match can be visualised at https://pasteboard.co/ISzNHtx.png --- tests/acceptance/boot_linux_console.py | 62 ++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 989db7d461..7c960051a6 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -12,6 +12,7 @@ import lzma import gzip import shutil +import logging =20 from avocado import skipUnless from avocado_qemu import Test @@ -22,6 +23,19 @@ from avocado.utils import archive =20 =20 +NUMPY_AVAILABLE =3D True +try: + import numpy as np +except ImportError: + NUMPY_AVAILABLE =3D False + +CV2_AVAILABLE =3D True +try: + import cv2 +except ImportError: + CV2_AVAILABLE =3D False + + class BootLinuxConsole(Test): """ Boots a Linux kernel and checks that the console is operational and the @@ -451,6 +465,54 @@ def test_arm_raspi2_uart1(self): """ self.do_test_arm_raspi(2, 'bcm2835_aux') =20 + @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed') + @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed') + def test_arm_raspi2_framebuffer_logo(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:raspi2 + :avocado: tags=3Ddevice:bcm2835-fb + """ + screendump_path =3D os.path.join(self.workdir, 'screendump.pbm') + rpilogo_url =3D ('https://github.com/raspberrypi/linux/raw/' + 'raspberrypi-kernel_1.20190517-1/' + 'drivers/video/logo/logo_linux_clut224.ppm') + rpilogo_hash =3D 'fff3cc20c6030acce0953147f9baac43f44ed6b0' + rpilogo_path =3D self.fetch_asset(rpilogo_url, asset_hash=3Drpilog= o_hash) + deb_url =3D ('http://archive.raspberrypi.org/debian/' + 'pool/main/r/raspberrypi-firmware/' + 'raspberrypi-kernel_1.20190215-1_armhf.deb') + deb_hash =3D 'cd284220b32128c5084037553db3c482426f3972' + deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) + kernel_path =3D self.extract_from_deb(deb_path, '/boot/kernel7.img= ') + dtb_path =3D self.extract_from_deb(deb_path, '/boot/bcm2709-rpi-2-= b.dtb') + + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'earlycon=3Dpl011,0x3f201000 console=3DttyA= MA0') + self.vm.add_args('-kernel', kernel_path, + '-dtb', dtb_path, + '-append', kernel_command_line) + self.vm.launch() + framebuffer_ready =3D 'Console: switching to colour frame buffer d= evice' + wait_for_console_pattern(self, framebuffer_ready) + self.vm.command('human-monitor-command', command_line=3D'stop') + self.vm.command('human-monitor-command', + command_line=3D'screendump %s' % screendump_path) + logger =3D logging.getLogger('framebuffer') + + cpu_cores_count =3D 4 + match_threshold =3D 0.95 + screendump_bgr =3D cv2.imread(screendump_path, cv2.IMREAD_COLOR) + rpilogo_bgr =3D cv2.imread(rpilogo_path, cv2.IMREAD_COLOR) + result =3D cv2.matchTemplate(screendump_bgr, rpilogo_bgr, + cv2.TM_CCOEFF_NORMED) + loc =3D np.where(result >=3D match_threshold) + rpilogo_count =3D 0 + for rpilogo_count, pt in enumerate(zip(*loc[::-1]), start=3D1): + logger.debug('found raspberry at position (x, y) =3D %s', pt) + self.assertGreaterEqual(rpilogo_count, cpu_cores_count) + def test_arm_exynos4210_initrd(self): """ :avocado: tags=3Darch:arm --=20 2.21.1