Changeset cf3a905c in mainline

Timestamp:

2018-11-23T18:32:50Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04c35fca

Parents:

2519349

git-author:

Jiri Svoboda <jiri@…> (2018-11-22 19:31:08)

git-committer:

Jiri Svoboda <jiri@…> (2018-11-23 18:32:50)

Message:

Arbitrate ski console device using an arbitration parea.

Files:

• kernel/arch/ia64/src/drivers/ski.c (modified) (7 diffs)
• uspace/drv/char/ski-con/ski-con.c (modified) (4 diffs)
• uspace/drv/char/ski-con/ski-con.h (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('?');
         }
 }

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

@@ -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>
@@ -69 +71 @@
         ddf_fun_t *fun = NULL;
         bool bound = false;
+        uintptr_t faddr;
+        void *addr = AS_AREA_ANY;
         errno_t rc;
 
@@ -88 +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) {
@@ -108 +126 @@
         return EOK;
 error:
+        if (addr != AS_AREA_ANY)
+                as_area_destroy(addr);
         if (bound)
                 ddf_fun_unbind(fun);

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;