Changeset 1b1be5f in mainline

Timestamp:

2019-04-15T17:26:37Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4099129, 8c5586c

Parents:

b63f4e89

Message:

Add support for serial kernel console on sun4u

This feature is currently disabled by default (CONFIG_SUN_TTY) due to
the following behavior observed with QEMU 3.1. After producing a couple
of lines of serial output, the kernel seems to hang on an IO read of the
NS 16550's LSR register (which it needs in order to test for
LSR_TH_READY). Providing some input on the serial console results in
unblocking the kernel for a while until it blocks again a couple of
lines of output later.

Files:

• HelenOS.config (modified) (2 diffs)
• kernel/arch/sparc64/Makefile.inc (modified) (1 diff)
• kernel/arch/sparc64/include/arch/drivers/tty.h (added)
• kernel/arch/sparc64/src/console.c (modified) (2 diffs)
• kernel/arch/sparc64/src/drivers/tty.c (added)

HelenOS.config

@@ -554 +554 @@
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64&MACHINE=generic&CONFIG_NS16550=y] CONFIG_SUN_KBD (y)
 
+% Sun serial console support
+! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64&MACHINE=generic&CONFIG_NS16550=y] CONFIG_SUN_TTY (n/y)
+
 % Macintosh ADB keyboard support
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=ppc32&(CONFIG_VIA_CUDA=y)] CONFIG_MAC_KBD (y)
@@ -564 +567 @@
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_PL011_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_UART=y)|(PLATFORM=arm64&CONFIG_PL011_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)|(PLATFORM=arm32&MACHINE=raspberrypi&CONFIG_PL011_UART=y)|(PLATFORM=ia32&CONFIG_NS16550=y)|(PLATFORM=amd64&CONFIG_NS16550=y)|(PLATFORM=mips32&CONFIG_NS16550=y)] CONFIG_SRLN (y)
+! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_PL011_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_UART=y)|(PLATFORM=arm64&CONFIG_PL011_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)|(PLATFORM=arm32&MACHINE=raspberrypi&CONFIG_PL011_UART=y)|(PLATFORM=ia32&CONFIG_NS16550=y)|(PLATFORM=amd64&CONFIG_NS16550=y)|(PLATFORM=mips32&CONFIG_NS16550=y)|(PLATFORM=sparc64&CONFIG_SUN_TTY=y)] CONFIG_SRLN (y)
 
 % EGA support

kernel/arch/sparc64/Makefile.inc

@@ -82 +82 @@
         arch/$(KARCH)/src/drivers/tick.c \
         arch/$(KARCH)/src/drivers/kbd.c \
+        arch/$(KARCH)/src/drivers/tty.c \
         arch/$(KARCH)/src/drivers/pci.c \
         arch/$(KARCH)/src/trap/$(USARCH)/interrupt.c

kernel/arch/sparc64/src/console.c

@@ -37 +37 @@
 #include <arch/drivers/scr.h>
 #include <arch/drivers/kbd.h>
+#include <arch/drivers/tty.h>
 #include <genarch/srln/srln.h>
 #include <console/chardev.h>
@@ -84 +85 @@
         kbd_init(keyboard);
 #endif
+
+#ifdef CONFIG_SUN_TTY
+        ofw_tree_property_t *prop_tty = ofw_tree_getprop(aliases, "ttya");
+        if (prop_tty && prop_tty->value) {
+                ofw_tree_node_t *tty = ofw_tree_lookup(prop_tty->value);
+                if (tty)
+                        tty_init(tty);
+        }
+#endif
 }