test: Add a test for booting Ubuntu 24.04

Now that U-Boot can boot this quickly, using kvm, add a test that the
installer starts up correctly.

Use the qemu-x86_64 board in the SJG lab.

Series-to: u-boot
Series-cc: bin
Series-version: 5
Series-links: 447304 2:445849 1:444626
Series-changes: 2
- Add more patches to support booting with kvm
- Add new patch with a test for booting Ubuntu 24.04

Series-changes: 3
- Significantly expanded to correct e820 and other issues

Series-changes: 5
- Drop timeouts patch
- Use Ctrl-N instead of down-arrow to make the test more reliable
- Add more logging into the test

Cover-letter:
x86: Improve operation under QEMU
U-Boot can start and boot an OS in both qemu-x86 and qemu-x86_64 but it
is not perfect.

With both builds, executing the VESA ROM causes an intermittent hang, at
least on some AMD CPUs.

With qemu-x86_64 kvm cannot be used since the move to long mode (64-bit)
is done in a way that works on real hardware but not with QEMU. This
means that performance is 4-5x slower than it could be, at least on my
CPU.

We can work around the first problem by using Bochs, which is anyway a
better choice than VESA for QEMU. The second can be addressed by using
the same descriptor across the jump to long mode.

With an MTRR fix this allows booting into Ubuntu on qemu-x86_64

In v3 some e820 patches are included to make booting reliable and avoid
ACPI tables being dropped. Also, several MTTR problems are addressed, to
support memory sizes above 4GB reliably.
END

Signed-off-by: Simon Glass <sjg@chromium.org>

.gitlab-ci.yml

@@ -572,7 +572,7 @@ coreboot test.py:
     - export USE_LABGRID_SJG=1
     # export verbose="-v"
     - ${SRC}/test/py/test.py --role ${ROLE} --build-dir "${OUT}"
-        --capture=tee-sys -k "not bootstd" || ret=$?
+        --capture=tee-sys -k "not bootstd ${TEST_PY_TEST_SPEC}" || ret=$?
     - U_BOOT_BOARD_IDENTITY="${ROLE}" u-boot-test-release || true
     - if [[ $ret -ne 0 ]]; then
         exit $ret;
@@ -751,4 +751,5 @@ zybo:
 qemu-x86_64:
   variables:
     ROLE: qemu-x86_64
+    TEST_PY_TEST_SPEC: "and not sleep"
   <<: *lab_dfn

test/py/console_base.py

@@ -464,7 +464,7 @@ class ConsoleBase(object):
         finally:
             self.p.timeout = orig_timeout
 
-    def ensure_spawned(self, expect_reset=False, timeout=None):
+    def ensure_spawned(self, expect_reset=False):
         """Ensure a connection to a correctly running U-Boot instance.
 
         This may require spawning a new Sandbox process or resetting target
@@ -485,7 +485,7 @@ class ConsoleBase(object):
             # Reset the console timeout value as some tests may change
             # its default value during the execution
             if not self.config.gdbserver:
-                self.p.timeout = timeout or TIMEOUT_MS
+                self.p.timeout = TIMEOUT_MS
             return
         try:
             self.log.start_section('Starting U-Boot')
@@ -496,7 +496,7 @@ class ConsoleBase(object):
             # future, possibly per-test to be optimal. This works for 'help'
             # on board 'seaboard'.
             if not self.config.gdbserver:
-                self.p.timeout = timeout or TIMEOUT_MS
+                self.p.timeout = TIMEOUT_MS
             self.p.logfile_read = self.logstream
             if self.config.use_running_system:
                 # Send an empty command to set up the 'expect' logic. This has
@@ -544,7 +544,7 @@ class ConsoleBase(object):
     def restart_uboot(self, expect_reset=False):
         """Shut down and restart U-Boot."""
         self.cleanup_spawn()
-        self.ensure_spawned(expect_reset, 60 * 1000)
+        self.ensure_spawned(expect_reset)
 
     def get_spawn_output(self):
         """Return the start-up output from U-Boot

test/py/tests/test_distro.py

@@ -4,8 +4,6 @@
 
 import pytest
 
-DOWN = '\x1b\x5b\x42\x0d'
-
 # Enable early console so that the test can see if something goes wrong
 CONSOLE = 'earlycon=uart8250,io,0x3f8 console=uart8250,io,0x3f8'
 
@@ -21,24 +19,34 @@ def test_distro(ubman):
         ubman.p.expect(['Try or Install Ubuntu'])
 
         # Press 'e' to edit the command line
+        ubman.log.info("Pressing 'e'")
         ubman.run_command('e', wait_for_prompt=False, send_nl=False)
 
         # Wait until we see the editor appear
         ubman.p.expect(['/casper/initrd'])
 
-        # Go down to the 'linux' line
-        ubman.send(DOWN * 3)
+        # Go down to the 'linux' line. Avoid using down-arrow as that includes
+        # an Escape character, which may be parsed by Grub as such, causing it
+        # to return to the top menu
+        ubman.log.info("Going DOWN")
+        ubman.ctrl('N')
+        ubman.ctrl('N')
+        ubman.ctrl('N')
 
         # Go to end of line
+        ubman.log.info("Going to EOL")
         ubman.ctrl('E')
 
         # Backspace to remove 'quiet splash'
+        ubman.log.info("Erasing quiet and splash")
         ubman.send('\b' * len('quiet splash'))
 
         # Send our noisy console
+        ubman.log.info("Noisy console")
         ubman.send(CONSOLE)
 
         # Tell grub to boot
+        ubman.log.info("boot")
         ubman.ctrl('X')
         ubman.p.expect(['Booting a command list'])
 

test/py/tests/test_sleep.py

@@ -19,7 +19,6 @@ env__sleep_margin = 0.25
 
 """
 
-@pytest.mark.role('!qemu-x86_64')
 def test_sleep(ubman):
     """Test the sleep command, and validate that it sleeps for approximately
     the correct amount of time."""