Changes in uspace/drv/char/ski-con/ski-con.c [09ab0a9a:cf3a905c] in mainline

File:

• uspace/drv/char/ski-con/ski-con.c (modified) (9 diffs)

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;