Changes in / [103db908:04c35fca] in mainline

Files:

• kernel/arch/ia64/src/drivers/ski.c (modified) (7 diffs)
• kernel/generic/include/mm/as.h (modified) (1 diff)
• kernel/generic/src/console/console.c (modified) (2 diffs)
• kernel/generic/src/mm/as.c (modified) (1 diff)
• kernel/generic/src/proc/program.c (modified) (3 diffs)
• uspace/drv/char/ski-con/ski-con.c (modified) (9 diffs)
• uspace/drv/char/ski-con/ski-con.h (modified) (1 diff)
• uspace/lib/c/generic/loader.c (modified) (1 diff)

kernel/arch/ia64/src/drivers/ski.c

@@ -37 +37 @@
 #include <console/console.h>
 #include <console/chardev.h>
+#include <ddi/ddi.h>
 #include <sysinfo/sysinfo.h>
 #include <stdint.h>
@@ -69 +70 @@
 
 static ski_instance_t *instance = NULL;
+static parea_t ski_parea;
 
 /** Ask debug console if a key was pressed.
@@ -105 +107 @@
         int count = POLL_LIMIT;
 
+        if (ski_parea.mapped)
+                return;
+
         while (count > 0) {
                 wchar_t ch = ski_getchar();
@@ -122 +127 @@
 
         while (true) {
-                // TODO FIXME:
-                // This currently breaks the kernel console
-                // before we get the override from uspace.
-                if (console_override)
-                        poll_keyboard(instance);
-
+                poll_keyboard(instance);
                 thread_usleep(POLL_INTERVAL);
         }
@@ -140 +140 @@
 static void ski_init(void)
 {
+        uintptr_t faddr;
+
         if (instance)
                 return;
@@ -150 +152 @@
             : "r15", "r8"
         );
+
+        faddr = frame_alloc(1, FRAME_LOWMEM | FRAME_ATOMIC, 0);
+        if (faddr == 0)
+                panic("Cannot allocate page for ski console.");
+
+        ddi_parea_init(&ski_parea);
+        ski_parea.pbase = faddr;
+        ski_parea.frames = 1;
+        ski_parea.unpriv = false;
+        ski_parea.mapped = false;
+        ddi_parea_register(&ski_parea);
+
+        sysinfo_set_item_val("ski.paddr", NULL, (sysarg_t) faddr);
 
         instance = malloc(sizeof(ski_instance_t));
@@ -190 +205 @@
 static void ski_putwchar(outdev_t *dev, wchar_t ch)
 {
-        // TODO FIXME:
-        // This currently breaks the kernel console
-        // before we get the override from uspace.
-        if (console_override) {
-                if (ascii_check(ch)) {
-                        if (ch == '\n')
-                                ski_do_putchar('\r');
-
-                        ski_do_putchar(ch);
-                } else {
-                        ski_do_putchar('?');
-                }
+        if (ski_parea.mapped)
+                return;
+
+        if (ascii_check(ch)) {
+                if (ch == '\n')
+                        ski_do_putchar('\r');
+
+                ski_do_putchar(ch);
+        } else {
+                ski_do_putchar('?');
         }
 }

kernel/generic/include/mm/as.h

@@ -268 +268 @@
 
 extern as_t *as_create(unsigned int);
-extern void as_destroy(as_t *);
 extern void as_hold(as_t *);
 extern void as_release(as_t *);

kernel/generic/src/console/console.c

@@ -209 +209 @@
 void grab_console(void)
 {
+        sysinfo_set_item_val("kconsole", NULL, true);
         event_notify_1(EVENT_KCONSOLE, false, true);
         bool prev = console_override;
@@ -226 +227 @@
 void release_console(void)
 {
+        sysinfo_set_item_val("kconsole", NULL, false);
         console_override = false;
         event_notify_1(EVENT_KCONSOLE, false, false);

kernel/generic/src/mm/as.c

@@ -187 +187 @@
  *
  */
-void as_destroy(as_t *as)
+static void as_destroy(as_t *as)
 {
         DEADLOCK_PROBE_INIT(p_asidlock);

kernel/generic/src/proc/program.c

@@ -150 +150 @@
         prg->loader_status = elf_load((elf_header_t *) image_addr, as);
         if (prg->loader_status != EE_OK) {
-                as_destroy(as);
+                as_release(as);
                 prg->task = NULL;
                 prg->main_thread = NULL;
@@ -176 +176 @@
         void *loader = program_loader;
         if (!loader) {
-                as_destroy(as);
+                as_release(as);
                 log(LF_OTHER, LVL_ERROR,
                     "Cannot spawn loader as none was registered");
@@ -184 +184 @@
         prg->loader_status = elf_load((elf_header_t *) program_loader, as);
         if (prg->loader_status != EE_OK) {
-                as_destroy(as);
+                as_release(as);
                 log(LF_OTHER, LVL_ERROR, "Cannot spawn loader (%s)",
                     elf_error(prg->loader_status));

uspace/drv/char/ski-con/ski-con.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Jakub Jermar
- * Copyright (c) 2017 Jiri Svoboda
+ * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -31 +31 @@
  */
 
+#include <as.h>
 #include <async.h>
 #include <ddf/driver.h>
 #include <ddf/log.h>
+#include <ddi.h>
 #include <errno.h>
 #include <fibril.h>
@@ -40 +42 @@
 #include <stdlib.h>
 #include <stdbool.h>
+#include <sysinfo.h>
 
 #include "ski-con.h"
@@ -68 +71 @@
         ddf_fun_t *fun = NULL;
         bool bound = false;
+        uintptr_t faddr;
+        void *addr = AS_AREA_ANY;
         errno_t rc;
 
@@ -87 +92 @@
         con->cds.sarg = con;
 
+        rc = sysinfo_get_value("ski.paddr", &faddr);
+        if (rc != EOK)
+                faddr = 0; /* No kernel driver to arbitrate with */
+
+        if (faddr != 0) {
+                addr = AS_AREA_ANY;
+                rc = physmem_map(faddr, 1, AS_AREA_READ | AS_AREA_CACHEABLE,
+                    &addr);
+                if (rc != EOK) {
+                        ddf_msg(LVL_ERROR, "Cannot map kernel driver arbitration area.");
+                        goto error;
+                }
+        }
+
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
@@ -107 +126 @@
         return EOK;
 error:
+        if (addr != AS_AREA_ANY)
+                as_area_destroy(addr);
         if (bound)
                 ddf_fun_unbind(fun);
@@ -127 +148 @@
 }
 
+/** Detect if SKI console is in use by the kernel.
+ *
+ * This is needed since the kernel has no way of fencing off the user-space
+ * driver.
+ *
+ * @return @c true if in use by the kernel.
+ */
+static bool ski_con_disabled(void)
+{
+        sysarg_t kconsole;
+
+        /*
+         * XXX Ideally we should get information from our kernel counterpart
+         * driver. But there needs to be a mechanism for the kernel console
+         * to inform the kernel driver.
+         */
+        if (sysinfo_get_value("kconsole", &kconsole) != EOK)
+                return false;
+
+        return kconsole != false;
+}
+
 /** Poll Ski for keypresses. */
 static errno_t ski_con_fibril(void *arg)
@@ -135 +178 @@
 
         while (true) {
-                while (true) {
+                while (!ski_con_disabled()) {
                         c = ski_con_getchar();
                         if (c == 0)
@@ -246 +289 @@
         uint8_t *dp = (uint8_t *) data;
 
-        for (i = 0; i < size; i++)
-                ski_con_putchar(con, dp[i]);
+        if (!ski_con_disabled()) {
+                for (i = 0; i < size; i++) {
+                        ski_con_putchar(con, dp[i]);
+                }
+        }
 
         *nwr = size;

uspace/drv/char/ski-con/ski-con.h

@@ -56 +56 @@
         fibril_mutex_t buf_lock;
         fibril_condvar_t buf_cv;
+        /** Memory area mapped to arbitrate with the kernel driver */
+        void *mem_area;
 } ski_con_t;
 

uspace/lib/c/generic/loader.c

@@ -200 +200 @@
         }
 
-        rc = loader_set_program(ldr, path, fd);
+        rc = loader_set_program(ldr, abspath, fd);
         vfs_put(fd);
         return rc;