Changeset 5b23a82 in mainline for kernel/arch/xen32/include/asm.h

Timestamp:

2006-08-01T21:12:54Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7c5a8dd

Parents:

7d3d641

Message:

xen32: enable/disable interrupts

File:

• kernel/arch/xen32/include/asm.h (modified) (5 diffs)

kernel/arch/xen32/include/asm.h

@@ -39 +39 @@
 #include <arch/pm.h>
 #include <arch/types.h>
+#include <arch/barrier.h>
 #include <config.h>
 
@@ -151 +152 @@
 static inline ipl_t interrupts_enable(void)
 {
-        ipl_t v = 0;
-/*      __asm__ volatile (
-                "pushf\n\t"
-                "popl %0\n\t"
-                "sti\n"
-                : "=r" (v)
-        );*/
+        // FIXME SMP
+        
+        ipl_t v = shared_info.vcpu_info[0].evtchn_upcall_mask;
+        write_barrier();
+        shared_info.vcpu_info[0].evtchn_upcall_mask = 0;
+        write_barrier();
+        if (shared_info.vcpu_info[0].evtchn_upcall_pending)
+                force_evtchn_callback();
+        
         return v;
 }
@@ -170 +173 @@
 static inline ipl_t interrupts_disable(void)
 {
-        ipl_t v = 0;
-/*      __asm__ volatile (
-                "pushf\n\t"
-                "popl %0\n\t"
-                "cli\n"
-                : "=r" (v)
-        );*/
+        // FIXME SMP
+        
+        ipl_t v = shared_info.vcpu_info[0].evtchn_upcall_mask;
+        shared_info.vcpu_info[0].evtchn_upcall_mask = 1;
+        write_barrier();
+        
         return v;
 }
@@ -188 +190 @@
 static inline void interrupts_restore(ipl_t ipl)
 {
-/*      __asm__ volatile (
-                "pushl %0\n\t"
-                "popf\n"
-                : : "r" (ipl)
-        );*/
+        if (ipl == 0)
+                interrupts_enable();
+        else
+                interrupts_disable();
 }
 
@@ -201 +202 @@
 static inline ipl_t interrupts_read(void)
 {
-        ipl_t v = 0;
-/*      __asm__ volatile (
-                "pushf\n\t"
-                "popl %0\n"
-                : "=r" (v)
-        );*/
-        return v;
+        // FIXME SMP
+        
+        return shared_info.vcpu_info[0].evtchn_upcall_mask;
 }