tests/functional: Convert Aarch64 Raspi4 avocado tests

Straight forward conversion. Update the SHA1 hashes to SHA256
hashes since SHA1 should not be used anymore nowadays.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240826221058.75126-5-philmd@linaro.org>
[thuth: Use LinuxKernelTest class]
Message-ID: <20240906180549.792832-12-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-09-06 20:05:46 +02:00 committed by Thomas Huth
parent 471f7ff715
commit 547738be48
4 changed files with 101 additions and 97 deletions

View File

@ -913,6 +913,7 @@ F: include/hw/*/bcm283*
F: docs/system/arm/raspi.rst
F: tests/functional/test_arm_raspi2.py
F: tests/functional/test_aarch64_raspi3.py
F: tests/functional/test_aarch64_raspi4.py
Real View
M: Peter Maydell <peter.maydell@linaro.org>

View File

@ -203,103 +203,6 @@ class BootLinuxConsole(LinuxKernelTest):
exec_command_and_wait_for_pattern(self, 'ping -c 3 10.0.2.2',
'3 packets transmitted, 3 packets received, 0% packet loss')
def test_arm_raspi4(self):
"""
:avocado: tags=arch:aarch64
:avocado: tags=machine:raspi4b
:avocado: tags=device:pl011
:avocado: tags=accel:tcg
:avocado: tags=rpi4b
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
"""
deb_url = ('http://archive.raspberrypi.org/debian/'
'pool/main/r/raspberrypi-firmware/'
'raspberrypi-kernel_1.20230106-1_arm64.deb')
deb_hash = '08dc55696535b18a6d4fe6fa10d4c0d905cbb2ed'
deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
kernel_path = self.extract_from_deb(deb_path, '/boot/kernel8.img')
dtb_path = self.extract_from_deb(deb_path, '/boot/bcm2711-rpi-4-b.dtb')
self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
'earlycon=pl011,mmio32,0xfe201000 ' +
'console=ttyAMA0,115200 ' +
'root=/dev/mmcblk1p2 rootwait ' +
'dwc_otg.fiq_fsm_enable=0')
self.vm.add_args('-kernel', kernel_path,
'-dtb', dtb_path,
'-append', kernel_command_line)
# When PCI is supported we can add a USB controller:
# '-device', 'qemu-xhci,bus=pcie.1,id=xhci',
# '-device', 'usb-kbd,bus=xhci.0',
self.vm.launch()
console_pattern = 'Kernel command line: %s' % kernel_command_line
self.wait_for_console_pattern(console_pattern)
# When USB is enabled we can look for this
# console_pattern = 'Product: QEMU USB Keyboard'
# self.wait_for_console_pattern(console_pattern)
console_pattern = 'Waiting for root device'
self.wait_for_console_pattern(console_pattern)
def test_arm_raspi4_initrd(self):
"""
:avocado: tags=arch:aarch64
:avocado: tags=machine:raspi4b
:avocado: tags=device:pl011
:avocado: tags=accel:tcg
:avocado: tags=rpi4b
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
"""
deb_url = ('http://archive.raspberrypi.org/debian/'
'pool/main/r/raspberrypi-firmware/'
'raspberrypi-kernel_1.20230106-1_arm64.deb')
deb_hash = '08dc55696535b18a6d4fe6fa10d4c0d905cbb2ed'
deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
kernel_path = self.extract_from_deb(deb_path, '/boot/kernel8.img')
dtb_path = self.extract_from_deb(deb_path, '/boot/bcm2711-rpi-4-b.dtb')
initrd_url = ('https://github.com/groeck/linux-build-test/raw/'
'86b2be1384d41c8c388e63078a847f1e1c4cb1de/rootfs/'
'arm64/rootfs.cpio.gz')
initrd_hash = 'f3d4f9fa92a49aa542f1b44d34be77bbf8ca5b9d'
initrd_path_gz = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
initrd_path = os.path.join(self.workdir, 'rootfs.cpio')
archive.gzip_uncompress(initrd_path_gz, initrd_path)
self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
'earlycon=pl011,mmio32,0xfe201000 ' +
'console=ttyAMA0,115200 ' +
'panic=-1 noreboot ' +
'dwc_otg.fiq_fsm_enable=0')
self.vm.add_args('-kernel', kernel_path,
'-dtb', dtb_path,
'-initrd', initrd_path,
'-append', kernel_command_line,
'-no-reboot')
# When PCI is supported we can add a USB controller:
# '-device', 'qemu-xhci,bus=pcie.1,id=xhci',
# '-device', 'usb-kbd,bus=xhci.0',
self.vm.launch()
self.wait_for_console_pattern('Boot successful.')
exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo',
'BCM2835')
exec_command_and_wait_for_pattern(self, 'cat /proc/iomem',
'cprman@7e101000')
exec_command_and_wait_for_pattern(self, 'halt', 'reboot: System halted')
# TODO: Raspberry Pi4 doesn't shut down properly with recent kernels
# Wait for VM to shut down gracefully
#self.vm.wait()
def test_arm_exynos4210_initrd(self):
"""
:avocado: tags=arch:arm

View File

@ -36,6 +36,7 @@ tests_generic_bsduser = [
tests_aarch64_system_thorough = [
'aarch64_raspi3',
'aarch64_raspi4',
'aarch64_sbsaref',
'aarch64_virt',
]

View File

@ -0,0 +1,99 @@
#!/usr/bin/env python3
#
# Functional test that boots a Linux kernel on a Raspberry Pi machine
# and checks the console
#
# SPDX-License-Identifier: GPL-2.0-or-later
import os
from qemu_test import LinuxKernelTest, Asset
from qemu_test import exec_command_and_wait_for_pattern
from qemu_test.utils import gzip_uncompress
class Aarch64Raspi4Machine(LinuxKernelTest):
"""
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
"""
ASSET_KERNEL_20190215 = Asset(
('http://archive.raspberrypi.org/debian/'
'pool/main/r/raspberrypi-firmware/'
'raspberrypi-kernel_1.20230106-1_arm64.deb'),
'56d5713c8f6eee8a0d3f0e73600ec11391144fef318b08943e9abd94c0a9baf7')
ASSET_INITRD = Asset(
('https://github.com/groeck/linux-build-test/raw/'
'86b2be1384d41c8c388e63078a847f1e1c4cb1de/rootfs/'
'arm64/rootfs.cpio.gz'),
'7c0b16d1853772f6f4c3ca63e789b3b9ff4936efac9c8a01fb0c98c05c7a7648')
def test_arm_raspi4(self):
deb_path = self.ASSET_KERNEL_20190215.fetch()
kernel_path = self.extract_from_deb(deb_path, '/boot/kernel8.img')
dtb_path = self.extract_from_deb(deb_path, '/boot/bcm2711-rpi-4-b.dtb')
self.set_machine('raspi4b')
self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
'earlycon=pl011,mmio32,0xfe201000 ' +
'console=ttyAMA0,115200 ' +
'root=/dev/mmcblk1p2 rootwait ' +
'dwc_otg.fiq_fsm_enable=0')
self.vm.add_args('-kernel', kernel_path,
'-dtb', dtb_path,
'-append', kernel_command_line)
# When PCI is supported we can add a USB controller:
# '-device', 'qemu-xhci,bus=pcie.1,id=xhci',
# '-device', 'usb-kbd,bus=xhci.0',
self.vm.launch()
console_pattern = 'Kernel command line: %s' % kernel_command_line
self.wait_for_console_pattern(console_pattern)
# When USB is enabled we can look for this
# console_pattern = 'Product: QEMU USB Keyboard'
# self.wait_for_console_pattern(console_pattern)
console_pattern = 'Waiting for root device'
self.wait_for_console_pattern(console_pattern)
def test_arm_raspi4_initrd(self):
deb_path = self.ASSET_KERNEL_20190215.fetch()
kernel_path = self.extract_from_deb(deb_path, '/boot/kernel8.img')
dtb_path = self.extract_from_deb(deb_path, '/boot/bcm2711-rpi-4-b.dtb')
initrd_path_gz = self.ASSET_INITRD.fetch()
initrd_path = os.path.join(self.workdir, 'rootfs.cpio')
gzip_uncompress(initrd_path_gz, initrd_path)
self.set_machine('raspi4b')
self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
'earlycon=pl011,mmio32,0xfe201000 ' +
'console=ttyAMA0,115200 ' +
'panic=-1 noreboot ' +
'dwc_otg.fiq_fsm_enable=0')
self.vm.add_args('-kernel', kernel_path,
'-dtb', dtb_path,
'-initrd', initrd_path,
'-append', kernel_command_line,
'-no-reboot')
# When PCI is supported we can add a USB controller:
# '-device', 'qemu-xhci,bus=pcie.1,id=xhci',
# '-device', 'usb-kbd,bus=xhci.0',
self.vm.launch()
self.wait_for_console_pattern('Boot successful.')
exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo',
'BCM2835')
exec_command_and_wait_for_pattern(self, 'cat /proc/iomem',
'cprman@7e101000')
exec_command_and_wait_for_pattern(self, 'halt', 'reboot: System halted')
# TODO: Raspberry Pi4 doesn't shut down properly with recent kernels
# Wait for VM to shut down gracefully
#self.vm.wait()
if __name__ == '__main__':
LinuxKernelTest.main()