$ avocado --show=app,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_raspi0_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 Feb 12
20:11:02 GMT 2019
console: [ 0.000000] CPU: ARMv6-compatible processor [410fb767] revision 7
(ARMv7), cr=00c5387d
console: [ 0.000000] CPU: VIPT aliasing data cache, unknown instruction
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
pages: 113680
console: [ 0.000000] Kernel command line: printk.time=0
earlycon=uart8250,mmio32,0x20215040 console=ttyS1,115200
PASS (13.31 s)
(2/3)
tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi1_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 Feb 12
20:11:02 GMT 2019
console: [ 0.000000] CPU: ARMv6-compatible processor [410fb767] revision 7
(ARMv7), cr=00c5387d
console: [ 0.000000] CPU: VIPT aliasing data cache, unknown instruction
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
pages: 113680
console: [ 0.000000] Kernel command line: printk.time=0
earlycon=uart8250,mmio32,0x20215040 console=ttyS1,115200
PASS (13.39 s)
(3/3)
tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_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=10c5387d
console: [ 0.000000] CPU: div instructions available: patching division
code
console: [ 0.000000] CPU: PIPT / VIPT nonaliasing data cache, VIPT
aliasing 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 r8192
d22720 u69632
console: [ 0.000000] Built 1 zonelists, mobility grouping on. Total
pages: 243600
console: [ 0.000000] Kernel command line: printk.time=0
earlycon=uart8250,mmio32,0x3f215040 console=ttyS1,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é <f4...@amsat.org>
---
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 df6600ab2f..7210acd977 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -337,6 +337,14 @@ class BootLinuxConsole(Test):
1: 'earlycon=pl011,0x20201000 console=ttyAMA0',
2: 'earlycon=pl011,0x3f201000 console=ttyAMA0',
},
+ 'bcm2835_aux': {
+ 0: 'earlycon=uart8250,mmio32,0x20215040 console=ttyS1,115200',
+ 1: 'earlycon=uart8250,mmio32,0x20215040 console=ttyS1,115200',
+ 2: 'earlycon=uart8250,mmio32,0x3f215040 console=ttyS1,115200',
+ },
+ }
+ uart_id = {
+ 'pl011': 0, 'bcm2835_aux': 1,
}
kernel = {
0: '/boot/kernel.img',
@@ -356,7 +364,7 @@ class BootLinuxConsole(Test):
kernel_path = self.extract_from_deb(deb_path, kernel[version])
dtb_path = self.extract_from_deb(deb_path, dtb[version])
- self.vm.set_console()
+ self.vm.set_console(console_index=uart_id[uart_model])
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
serial_kernel_cmdline[uart_model][version])
self.vm.add_args('-kernel', kernel_path,
@@ -375,6 +383,15 @@ class BootLinuxConsole(Test):
"""
self.do_test_arm_raspi(0, 'pl011')
+ def test_arm_raspi0_uart1(self):
+ """
+ :avocado: tags=arch:arm
+ :avocado: tags=machine:raspi0
+ :avocado: tags=cpu:arm1176
+ :avocado: tags=device:bcm2835_aux
+ """
+ self.do_test_arm_raspi(0, 'bcm2835_aux')
+
def test_arm_raspi1_uart0(self):
"""
:avocado: tags=arch:arm
@@ -384,6 +401,15 @@ class BootLinuxConsole(Test):
"""
self.do_test_arm_raspi(1, 'pl011')
+ def test_arm_raspi1_uart1(self):
+ """
+ :avocado: tags=arch:arm
+ :avocado: tags=machine:raspi1
+ :avocado: tags=cpu:arm1176
+ :avocado: tags=device:bcm2835_aux
+ """
+ self.do_test_arm_raspi(1, 'bcm2835_aux')
+
def test_arm_raspi2_uart0(self):
"""
:avocado: tags=arch:arm
@@ -393,6 +419,15 @@ class BootLinuxConsole(Test):
"""
self.do_test_arm_raspi(2, 'pl011')
+ def test_arm_raspi2_uart1(self):
+ """
+ :avocado: tags=arch:arm
+ :avocado: tags=machine:raspi2
+ :avocado: tags=cpu:cortex-a7
+ :avocado: tags=device:bcm2835_aux
+ """
+ self.do_test_arm_raspi(2, 'bcm2835_aux')
+
def test_arm_exynos4210_initrd(self):
"""
:avocado: tags=arch:arm
--
2.21.1
