Changeset 712c4ba in mainline for kernel/genarch/src

Timestamp:

2011-05-20T16:09:24Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b6f3e7e

Parents:

326bf65

Message:

avoid spinlocks to be taken in the direct code path to physically outputing kconsole characters to the framebuffer (this fixes ticket #243)
the spinlock in printf() (kernel) was sacrificed, this might lead potentially to scrambled kconsole output
the hack of ignoring spinlocks whose names start with "*" in the livelock detector can be removed

Location:

kernel/genarch/src

Files:

• drivers/ega/ega.c (modified) (7 diffs)
• fb/fb.c (modified) (5 diffs)

kernel/genarch/src/drivers/ega/ega.c

@@ -40 +40 @@
 #include <mm/as.h>
 #include <mm/slab.h>
+#include <synch/mutex.h>
 #include <arch/mm/page.h>
-#include <synch/spinlock.h>
 #include <typedefs.h>
 #include <arch/asm.h>
@@ -63 +63 @@
 
 typedef struct {
-        IRQ_SPINLOCK_DECLARE(lock);
+        mutex_t mtx;
         
         uint32_t cursor;
@@ -540 +540 @@
         ega_instance_t *instance = (ega_instance_t *) dev->data;
         
-        irq_spinlock_lock(&instance->lock, true);
+        mutex_lock(&instance->mtx);
         
         switch (ch) {
@@ -563 +563 @@
         ega_move_cursor(instance, silent);
         
-        irq_spinlock_unlock(&instance->lock, true);
+        mutex_unlock(&instance->mtx);
 }
 
@@ -570 +570 @@
         ega_instance_t *instance = (ega_instance_t *) dev->data;
         
-        irq_spinlock_lock(&instance->lock, true);
+        mutex_lock(&instance->mtx);
         
         memcpy(instance->addr, instance->backbuf, EGA_VRAM_SIZE);
@@ -576 +576 @@
         ega_show_cursor(instance, silent);
         
-        irq_spinlock_unlock(&instance->lock, true);
+        mutex_unlock(&instance->mtx);
 }
 
@@ -594 +594 @@
         egadev->data = instance;
         
-        irq_spinlock_initialize(&instance->lock, "*ega.instance.lock");
+        mutex_initialize(&instance->mtx, MUTEX_PASSIVE);
         
         instance->base = base;

kernel/genarch/src/fb/fb.c

@@ -80 +80 @@
 
 typedef struct {
-        SPINLOCK_DECLARE(lock);
+        mutex_t mtx;
         
         uint8_t *addr;
@@ -365 +365 @@
 {
         fb_instance_t *instance = (fb_instance_t *) dev->data;
-        spinlock_lock(&instance->lock);
+        mutex_lock(&instance->mtx);
         
         switch (ch) {
@@ -406 +406 @@
         cursor_put(instance, silent);
         
-        spinlock_unlock(&instance->lock);
+        mutex_unlock(&instance->mtx);
 }
 
@@ -473 +473 @@
         fb_instance_t *instance = (fb_instance_t *) dev->data;
         
-        spinlock_lock(&instance->lock);
+        mutex_lock(&instance->mtx);
         fb_redraw_internal(instance);
-        spinlock_unlock(&instance->lock);
+        mutex_unlock(&instance->mtx);
 }
 
@@ -554 +554 @@
         fbdev->data = instance;
         
-        spinlock_initialize(&instance->lock, "*fb.instance.lock");
+        mutex_initialize(&instance->mtx, MUTEX_PASSIVE);
         instance->rgb_conv = rgb_conv;
         instance->pixelbytes = pixelbytes;