Index: HelenOS.config =================================================================== --- HelenOS.config (revision b63f4e8923acb50eeb87d363e82f2908a460b2a9) +++ HelenOS.config (revision 1b1be5f1a71e1f658889ccb441f5fe8ad9bc216f) @@ -554,4 +554,7 @@ ! [(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,5 +567,5 @@ % 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 Index: kernel/arch/sparc64/Makefile.inc =================================================================== --- kernel/arch/sparc64/Makefile.inc (revision b63f4e8923acb50eeb87d363e82f2908a460b2a9) +++ kernel/arch/sparc64/Makefile.inc (revision 1b1be5f1a71e1f658889ccb441f5fe8ad9bc216f) @@ -82,4 +82,5 @@ 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 Index: kernel/arch/sparc64/include/arch/drivers/tty.h =================================================================== --- kernel/arch/sparc64/include/arch/drivers/tty.h (revision 1b1be5f1a71e1f658889ccb441f5fe8ad9bc216f) +++ kernel/arch/sparc64/include/arch/drivers/tty.h (revision 1b1be5f1a71e1f658889ccb441f5fe8ad9bc216f) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2019 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup kernel_sparc64 + * @{ + */ +/** @file + */ + +#ifndef KERN_sparc64_TTY_H_ +#define KERN_sparc64_TTY_H_ + +#include + +extern void tty_init(ofw_tree_node_t *node); + +#endif + +/** @} + */ Index: kernel/arch/sparc64/src/console.c =================================================================== --- kernel/arch/sparc64/src/console.c (revision b63f4e8923acb50eeb87d363e82f2908a460b2a9) +++ kernel/arch/sparc64/src/console.c (revision 1b1be5f1a71e1f658889ccb441f5fe8ad9bc216f) @@ -37,4 +37,5 @@ #include #include +#include #include #include @@ -84,4 +85,13 @@ 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 } Index: kernel/arch/sparc64/src/drivers/tty.c =================================================================== --- kernel/arch/sparc64/src/drivers/tty.c (revision 1b1be5f1a71e1f658889ccb441f5fe8ad9bc216f) +++ kernel/arch/sparc64/src/drivers/tty.c (revision 1b1be5f1a71e1f658889ccb441f5fe8ad9bc216f) @@ -0,0 +1,141 @@ +/* + * Copyright (c) 2019 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup kernel_sparc64 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef CONFIG_SUN_TTY +#include +#endif + +#ifdef CONFIG_NS16550 +#include +#endif + +#ifdef CONFIG_SUN_TTY + +#ifdef CONFIG_NS16550 + +static bool tty_ns16550_init(ofw_tree_node_t *node) +{ + const char *name = ofw_tree_node_name(node); + + if (str_cmp(name, "su") != 0) + return false; + + /* + * Read 'interrupts' property. + */ + ofw_tree_property_t *prop = ofw_tree_getprop(node, "interrupts"); + if ((!prop) || (!prop->value)) { + log(LF_ARCH, LVL_ERROR, + "ns16550: Unable to find interrupts property"); + return false; + } + + uint32_t interrupts = *((uint32_t *) prop->value); + + /* + * Read 'reg' property. + */ + prop = ofw_tree_getprop(node, "reg"); + if ((!prop) || (!prop->value)) { + log(LF_ARCH, LVL_ERROR, + "ns16550: Unable to find reg property"); + return false; + } + + uintptr_t pa = 0; // Prevent -Werror=maybe-uninitialized + if (!ofw_ebus_apply_ranges(node->parent, + ((ofw_ebus_reg_t *) prop->value), &pa)) { + log(LF_ARCH, LVL_ERROR, + "ns16550: Failed to determine address"); + return false; + } + + inr_t inr; + cir_t cir; + void *cir_arg; + if (!ofw_ebus_map_interrupt(node->parent, + ((ofw_ebus_reg_t *) prop->value), interrupts, &inr, &cir, + &cir_arg)) { + log(LF_ARCH, LVL_ERROR, + "ns16550: Failed to determine interrupt"); + return false; + } + + outdev_t *ns16550_out; + ns16550_instance_t *ns16550_instance = ns16550_init((ioport8_t *) pa, 0, + inr, cir, cir_arg, &ns16550_out); + if (ns16550_instance) { + srln_instance_t *srln_instance = srln_init(); + if (srln_instance) { + indev_t *sink = stdin_wire(); + indev_t *srln = srln_wire(srln_instance, sink); + ns16550_wire(ns16550_instance, srln); + } + stdout_wire(ns16550_out); + } + + return true; +} + +#endif /* CONFIG_NS16550 */ + +/** Initialize tty. + * + * Traverse OpenFirmware device tree in order to find necessary + * info about the keyboard device. + * + * @param node Keyboard device node. + * + */ +void tty_init(ofw_tree_node_t *node) +{ +#ifdef CONFIG_NS16550 + tty_ns16550_init(node); +#endif +} + +#endif /* CONFIG_SUN_TTY */ + +/** @} + */