Changeset 3dea17f in mainline for kernel/arch

Timestamp:

2006-10-19T17:33:08Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f0450658

Parents:

80ca47e

Message:

Add mutual exclusion to keyboard grab and release
functions on sparc64, ppc32, mips32 and ia64.

Location:

kernel/arch

Files:

• ia64/src/ski/ski.c (modified) (1 diff)
• mips32/src/drivers/msim.c (modified) (1 diff)
• ppc32/src/drivers/cuda.c (modified) (2 diffs)
• ppc32/src/drivers/pic.c (modified) (1 diff)

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

@@ -242 +242 @@
 void ski_kbd_grab(void)
 {
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&ski_kbd_irq.lock);
         ski_kbd_irq.notif_cfg.notify = false;
+        spinlock_unlock(&ski_kbd_irq.lock);
+        interrupts_restore(ipl);
 }
 
 void ski_kbd_release(void)
 {
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&ski_kbd_irq.lock);
         if (ski_kbd_irq.notif_cfg.answerbox)
                 ski_kbd_irq.notif_cfg.notify = true;
+        spinlock_unlock(&ski_kbd_irq.lock);
+        interrupts_restore(ipl);
 }
 

kernel/arch/mips32/src/drivers/msim.c

@@ -121 +121 @@
 void msim_kbd_grab(void)
 {
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&msim_irq.lock);
         msim_irq.notif_cfg.notify = false;
+        spinlock_unlock(&msim_irq.lock);
+        interrupts_restore(ipl);
 }
 
 void msim_kbd_release(void)
 {
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&msim_irq.lock);
         if (msim_irq.notif_cfg.answerbox)
                 msim_irq.notif_cfg.notify = true;
+        spinlock_unlock(&msim_irq.lock);
+        interrupts_restore(ipl);
 }
 

kernel/arch/ppc32/src/drivers/cuda.c

@@ -274 +274 @@
 void cuda_grab(void)
 {
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&cuda_irq.lock);
         cuda_irq.notif_cfg.notify = false;
+        spinlock_unlock(&cuda_irq.lock);
+        interrupts_restore(ipl);
 }
 
@@ -281 +285 @@
 void cuda_release(void)
 {
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&cuda_irq.lock);
         if (cuda_irq.notif_cfg.answerbox)
                 cuda_irq.notif_cfg.notify = true;
+        spinlock_unlock(&cuda_irq.unlock);
+        interrupts_restore(ipl);
 }
 

kernel/arch/ppc32/src/drivers/pic.c

@@ -46 +46 @@
 }
 
-
-
 void pic_enable_interrupt(int intnum)
 {