Hi Philippe,

On Sat, Jan 18, 2020 at 8:16 PM Philippe Mathieu-Daudé <f4...@amsat.org>
wrote:

> This test boots U-Boot then NetBSD (stored on a SD card) on
> a OrangePi PC board.
>
> As it requires ~1.3GB of storage, it is disabled by default.
>
> U-Boot is built by the Debian project [1], and the SD card image
> is provided by the NetBSD organization [2].
>

Thanks a lot for sending this patch, it very nicely complements the linux
tests to
prove that the ARM/Allwinner-H3 emulation is working properly!

I also see that you have used a pre-compiled binary from Debian to automate
it.
That works very well indeed.


> Once the compressed SD card image is downloaded (304MB) and
> extracted, this test is fast:
>
>   $ AVOCADO_ALLOW_LARGE_STORAGE=yes \
>     avocado --show=app,console run -t machine:orangepi-pc \
>       tests/acceptance/boot_linux_console.py
>   console: U-Boot SPL 2020.01+dfsg-1 (Jan 08 2020 - 08:19:44 +0000)
>   console: DRAM: 1024 MiB
>   console: U-Boot 2020.01+dfsg-1 (Jan 08 2020 - 08:19:44 +0000) Allwinner
> Technology
>   console: CPU:   Allwinner H3 (SUN8I 0000)
>   console: scanning bus usb@1c1b000 for devices... 1 USB Device(s) found
>   console: scanning bus usb@1c1d000 for devices... 1 USB Device(s) found
>   console: scanning usb for storage devices... 0 Storage Device(s) found
>   console: Hit any key to stop autoboot:  0
>   console: => setenv bootargs root=ld0a
>   console: => setenv kernel netbsd-GENERIC.ub
>   console: => setenv fdtfile dtb/sun8i-h3-orangepi-pc.dtb
>   console: => boot
>   console: ## Booting kernel from Legacy Image at 42000000 ...
>   console: Image Name:   NetBSD/earmv7hf 9.0_RC1
>   console: Image Type:   ARM Linux Kernel Image (no loading done)
> (uncompressed)
>   console: XIP Kernel Image (no loading done)
>   console: Loading Device Tree to 49ff6000, end 49fffe01 ... OK
>   console: Starting kernel ...
>   console: [   1.0000000] NetBSD/evbarm (fdt) booting ...
>   console: [   1.0000000] NetBSD 9.0_RC1 (GENERIC) #0: Wed Nov 27 16:14:52
> UTC 2019
>   console: [   1.0000000] simplebus0 at armfdt0: Xunlong Orange Pi PC
>   console: [   1.0000000] cpu0 at cpus0: Cortex-A7 r0p5 (Cortex V7A core)
>   console: [   1.0000000] cpu0: DC enabled IC enabled WB enabled LABT
> branch prediction enabled
>   console: [   1.0000000] cpu0: 32KB/64B 2-way L1 VIPT Instruction cache
>   console: [   1.0000000] cpu0: 32KB/64B 2-way write-back-locking-C L1
> PIPT Data cache
>   console: [   1.0000000] cpu0: 2304KB/64B 16-way write-through L2 PIPT
> Unified cache
>   console: [   1.0000000] vfp0 at cpu0: NEON MPE (VFP 3.0+), rounding, NaN
> propagation, denormals
>   ...
>   console: [   2.8171937] sdmmc0: SD card status: 4-bit, C0
>   console: [   2.8234040] ld0 at sdmmc0:
> <0xaa:0x5859:QEMU!:0x01:0xdeadbeef:0x062>
>   console: [   2.8743967] ld0: 1290 MB, 655 cyl, 64 head, 63 sec, 512
> bytes/sect x 2642944 sectors
>   console: [   3.1588850] ld0: 4-bit width, High-Speed/SDR25, 50.000 MHz
>   console: [   4.9942260] WARNING: 4 errors while detecting hardware;
> check system log.
>   console: [   5.0142912] boot device: ld0
>   console: [   5.0551260] root on ld0a dumps on ld0b
>   console: [   5.2175484] root file system type: ffs
>   console: [   5.2858559] kern.module.path=/stand/evbarm/9.0/modules
>   console: Tue Jan 18 18:15:15 UTC 2050
>   console: Starting root file system check:
>   PASS (35.96 s)
>   RESULTS    : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 |
> CANCEL 0
>   JOB TIME   : 36.09 s
>
> Note, this test only took ~65 seconds to run on Travis-CI, see: [3].
>

It is very fast, on my laptop it only took 23 seconds!


>
> This test is based on a description from Niek Linnenbank from [4].
>
> [1]
> https://wiki.debian.org/InstallingDebianOn/Allwinner#Creating_a_bootable_SD_Card_with_u-boot
> [2] https://wiki.netbsd.org/ports/evbarm/allwinner/
> [3] https://travis-ci.org/philmd/qemu/jobs/638823612#L3778
> [4] https://www.mail-archive.com/qemu-devel@nongnu.org/msg669347.html
>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
>
Tested-by: Niek Linnenbank <nieklinnenb...@gmail.com>

Regards,
Niek


> ---
>  tests/acceptance/boot_linux_console.py | 63 ++++++++++++++++++++++++++
>  1 file changed, 63 insertions(+)
>
> diff --git a/tests/acceptance/boot_linux_console.py
> b/tests/acceptance/boot_linux_console.py
> index 55d0b8b036..56d3d6e9eb 100644
> --- a/tests/acceptance/boot_linux_console.py
> +++ b/tests/acceptance/boot_linux_console.py
> @@ -16,6 +16,7 @@ import shutil
>  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
> @@ -551,6 +552,68 @@ class BootLinuxConsole(Test):
>                                        'to <orangepipc>')
>          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=arch:arm
> +        :avocado: tags=machine:orangepi-pc
> +        """
> +        # This test download a 304MB compressed image and expand it to
> 1.3GB...
> +        deb_url = ('http://snapshot.debian.org/archive/debian/'
> +                   '20200108T145233Z/pool/main/u/u-boot/'
> +                   'u-boot-sunxi_2020.01%2Bdfsg-1_armhf.deb')
> +        deb_hash = 'f67f404a80753ca3d1258f13e38f2b060e13db99'
> +        deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
> +        # We use the common OrangePi PC 'plus' build of U-Boot for our
> secondary
> +        # program loader (SPL). We will then set the path to the more
> specific
> +        # OrangePi "PC" device tree blob with 'setenv fdtfile' in U-Boot
> prompt,
> +        # before to boot NetBSD.
> +        uboot_path =
> '/usr/lib/u-boot/orangepi_plus/u-boot-sunxi-with-spl.bin'
> +        uboot_path = self.extract_from_deb(deb_path, uboot_path)
> +        image_url = ('https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.0_RC1/'
> +                     'evbarm-earmv7hf/binary/gzimg/armv7.img.gz')
> +        image_hash = '7f58d5c36600430a8bcebe7e999a8945a2be4d1f'
> +        image_path_gz = self.fetch_asset(image_url, asset_hash=image_hash)
> +        image_path = os.path.join(self.workdir, 'armv7.img')
> +        image_drive_args = 'if=sd,format=raw,snapshot=on,file=' +
> image_path
> +        archive.gzip_uncompress(image_path_gz, image_path)
> +
> +        # dd if=u-boot-sunxi-with-spl.bin of=armv7.img bs=1K seek=8
> conv=notrunc
> +        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,
> +                         '-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, '', '=>')
> +        cmd = 'setenv bootargs root=ld0a'
> +        exec_command_and_wait_for_pattern(self, cmd, '=>')
> +        cmd = 'setenv kernel netbsd-GENERIC.ub'
> +        exec_command_and_wait_for_pattern(self, cmd, '=>')
> +        cmd = 'setenv fdtfile dtb/sun8i-h3-orangepi-pc.dtb'
> +        exec_command_and_wait_for_pattern(self, cmd, '=>')
> +        cmd = ("setenv bootcmd 'fatload mmc 0:1 ${kernel_addr_r}
> ${kernel}; "
> +               "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, '=>')
> +
> +        exec_command_and_wait_for_pattern(self, 'boot',
> +                                          'Booting kernel from Legacy
> Image')
> +        wait_for_console_pattern(self, 'Starting kernel ...')
> +        wait_for_console_pattern(self, 'NetBSD 9.0_RC1 (GENERIC)')
> +        # Wait for user-space
> +        wait_for_console_pattern(self, 'Starting root file system check')
> +
>      def test_s390x_s390_ccw_virtio(self):
>          """
>          :avocado: tags=arch:s390x
> --
> 2.21.1
>
>

-- 
Niek Linnenbank

Reply via email to