Message ID | 20191028073441.6448-22-philmd@redhat.com |
---|---|
State | New |
Headers | show |
Series | tests/acceptance: Queue for 4.2 | expand |
On Mon, Oct 28, 2019 at 08:34:36AM +0100, Philippe Mathieu-Daudé wrote: > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > The current do_test_arm_raspi2() case tests the PL011 UART0. > Our model also supports the AUX UART (16550 based). > We can very simply test the UART1 with Linux, modifying the > kernel command line. > > Add few lines to expand our previous test and cover the AUX > UART. > > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Reviewed-by: Cleber Rosa <crosa@redhat.com> > Tested-by: Cleber Rosa <crosa@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > tests/acceptance/boot_linux_console.py | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index cc0c73b9c1..1c9ff2bda3 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -301,6 +301,7 @@ class BootLinuxConsole(MachineTest): > """ > serial_kernel_cmdline = { > 0: 'earlycon=pl011,0x3f201000 console=ttyAMA0', > + 1: 'earlycon=uart8250,mmio32,0x3f215040 console=ttyS1,115200' > } > deb_url = ('http://archive.raspberrypi.org/debian/' > 'pool/main/r/raspberrypi-firmware/' > @@ -311,7 +312,7 @@ class BootLinuxConsole(MachineTest): > dtb_path = self.extract_from_deb(deb_path, '/boot/bcm2709-rpi-2-b.dtb') > > self.vm.set_machine('raspi2') > - self.vm.set_console() > + self.vm.set_console(console_index=uart_id) While this was tested and looks good by itself, it depends on a solution to the problem responded on <20191028073441.6448-2-philmd@redhat.com>. - Cleber.
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index cc0c73b9c1..1c9ff2bda3 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -301,6 +301,7 @@ class BootLinuxConsole(MachineTest): """ serial_kernel_cmdline = { 0: 'earlycon=pl011,0x3f201000 console=ttyAMA0', + 1: 'earlycon=uart8250,mmio32,0x3f215040 console=ttyS1,115200' } deb_url = ('http://archive.raspberrypi.org/debian/' 'pool/main/r/raspberrypi-firmware/' @@ -311,7 +312,7 @@ class BootLinuxConsole(MachineTest): dtb_path = self.extract_from_deb(deb_path, '/boot/bcm2709-rpi-2-b.dtb') self.vm.set_machine('raspi2') - self.vm.set_console() + self.vm.set_console(console_index=uart_id) kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + serial_kernel_cmdline[uart_id]) self.vm.add_args('-kernel', kernel_path, @@ -329,6 +330,14 @@ class BootLinuxConsole(MachineTest): """ self.do_test_arm_raspi2(0) + def test_arm_raspi2_uart1(self): + """ + :avocado: tags=arch:arm + :avocado: tags=machine:raspi2 + :avocado: tags=device:bcm2835_aux + """ + self.do_test_arm_raspi2(1) + def test_s390x_s390_ccw_virtio(self): """ :avocado: tags=arch:s390x