Changes in kernel/arch/amd64/src/amd64.c [4a5ba372:af9dd1e] in mainline

File:

• kernel/arch/amd64/src/amd64.c (modified) (5 diffs)

kernel/arch/amd64/src/amd64.c

@@ -49 +49 @@
 #include <genarch/drivers/ega/ega.h>
 #include <genarch/drivers/i8042/i8042.h>
+#include <genarch/drivers/ns16550/ns16550.h>
 #include <genarch/drivers/legacy/ia32/io.h>
 #include <genarch/fb/bfb.h>
 #include <genarch/kbrd/kbrd.h>
+#include <genarch/srln/srln.h>
 #include <genarch/multiboot/multiboot.h>
 #include <genarch/multiboot/multiboot2.h>
+#include <arch/pm.h>
+#include <arch/vreg.h>
+#include <arch/kseg.h>
 
 #ifdef CONFIG_SMP
@@ -137 +142 @@
 void arch_post_mm_init(void)
 {
+        vreg_init();
+        kseg_init();
+
         if (config.cpu_active == 1) {
                 /* Initialize IRQ routing */
@@ -168 +176 @@
 }
 
-void arch_post_cpu_init()
+void arch_post_cpu_init(void)
 {
 #ifdef CONFIG_SMP
@@ -212 +220 @@
         }
 #endif
+
+#if (defined(CONFIG_NS16550) || defined(CONFIG_NS16550_OUT))
+        /*
+         * Initialize the ns16550 controller.
+         */
+#ifdef CONFIG_NS16550_OUT
+        outdev_t *ns16550_out;
+        outdev_t **ns16550_out_ptr = &ns16550_out;
+#else
+        outdev_t **ns16550_out_ptr = NULL;
+#endif
+        ns16550_instance_t *ns16550_instance
+            = ns16550_init((ns16550_t *) NS16550_BASE, IRQ_NS16550, NULL, NULL,
+            ns16550_out_ptr);
+        if (ns16550_instance) {
+#ifdef CONFIG_NS16550
+                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);
+                        trap_virtual_enable_irqs(1 << IRQ_NS16550);
+                }
+#endif
+#ifdef CONFIG_NS16550_OUT
+                if (ns16550_out) {
+                        stdout_wire(ns16550_out);
+                }
+#endif
+        }
+#endif
         
         if (irqs_info != NULL)
@@ -229 +268 @@
 }
 
-/** Set thread-local-storage pointer
- *
- * TLS pointer is set in FS register. Unfortunately the 64-bit
- * part can be set only in CPL0 mode.
- *
- * The specs say, that on %fs:0 there is stored contents of %fs register,
- * we need not to go to CPL0 to read it.
- */
-sysarg_t sys_tls_set(uintptr_t addr)
-{
-        THREAD->arch.tls = addr;
-        write_msr(AMD_MSR_FS, addr);
-        
-        return EOK;
-}
-
 /** Construct function pointer
  *