Make user input prompt appear automatically if autobooting fails

Author: jmbaur

boards/qemu-aarch64/config.nix

@@ -12,7 +12,7 @@
     debug = true;
     linux = {
       kconfig = with lib.kernel; {
-        GPIOLIB = yes;
+        ARM_SCMI_TRANSPORT_VIRTIO = yes;
         GPIO_PL061 = yes;
         MEMORY_HOTPLUG = yes;
         MEMORY_HOTREMOVE = yes;

kernel-configs/aarch64.nix

@@ -26,6 +26,8 @@
       ARM_PSCI_CPUIDLE = yes;
       ARM_PSCI_FW = yes;
       ARM_SCMI_PROTOCOL = yes;
+      ARM_SCMI_TRANSPORT_MAILBOX = yes;
+      ARM_SCMI_TRANSPORT_SMC = yes;
       ARM_SCPI_PROTOCOL = yes;
       ARM_SMMU = yes;
       ARM_SMMU_V3 = yes;

src/console.zig

@@ -672,8 +672,8 @@ pub fn handleStdin(self: *Console, boot_loaders: []*BootLoader) !?Event {
     // We may already have a prompt from a boot timeout, so don't print
     // a prompt if we already have one.
     if (self.tty == null) {
+        try system.setConsole(.off);
         self.tty = try system.setupTty(IN, .user_input);
-        std.log.debug("user presence detected", .{});
         self.shell.prompt(self.context);
     }
 

src/tboot-loader.zig

@@ -285,6 +285,13 @@ fn run(self: *TbootLoader) !posix.RebootCommand {
                 if (self.handleTimer()) |outcome| {
                     return outcome;
                 }
+                // Autobooting did not work, thus we go into user input mode.
+                // This will block on console input, though that is fine
+                // because we don't have anything else to try since we've
+                // already tried autobooting.
+                else if (try self.handleConsoleInput()) |outcome| {
+                    return outcome;
+                }
             } else {
                 std.debug.panic("unknown event: {}", .{event});
             }

tests/module.nix

@@ -4,6 +4,7 @@ let
 in
 {
   virtualisation = {
+    graphics = false;
     directBoot.enable = false;
     qemu.options = [
       "-kernel ${tinyboot.linux}/kernel"