[src/netbsd-2-0]: src/sys/arch/xen/i386 Pull up revision 1.3 (requested by cl...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/70077533eb1e
branches:  netbsd-2-0
changeset: 561447:70077533eb1e
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Jun 17 09:23:13 2004 +0000

description:
Pull up revision 1.3 (requested by cl in ticket #498):
cleanup low-level bit mangling code

diffstat:

 sys/arch/xen/i386/hypervisor_machdep.c |  39 +++++++++++++++++----------------
 1 files changed, 20 insertions(+), 19 deletions(-)

diffs (98 lines):

diff -r 55bf825e5aa0 -r 70077533eb1e sys/arch/xen/i386/hypervisor_machdep.c
--- a/sys/arch/xen/i386/hypervisor_machdep.c    Thu Jun 17 09:21:20 2004 +0000
+++ b/sys/arch/xen/i386/hypervisor_machdep.c    Thu Jun 17 09:23:13 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hypervisor_machdep.c,v 1.2.2.2 2004/05/22 15:57:24 he Exp $    */
+/*     $NetBSD: hypervisor_machdep.c,v 1.2.2.3 2004/06/17 09:23:13 tron Exp $  */
 
 /*
  *
@@ -59,7 +59,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.2.2.2 2004/05/22 15:57:24 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.2.2.3 2004/06/17 09:23:13 tron Exp $");
 
 #include <sys/cdefs.h>
 #include <sys/param.h>
@@ -69,7 +69,6 @@
 #include <machine/hypervisor.h>
 
 /* static */ unsigned long event_mask = 0;
-static unsigned long ev_err_count;
 
 int stipending(void);
 int
@@ -96,7 +95,7 @@
                 */
                __cli();
 
-               events = xchg(&HYPERVISOR_shared_info->events, 0);
+               events = x86_atomic_xchg(&HYPERVISOR_shared_info->events, 0);
                events &= event_mask;
 
                while (events) {
@@ -140,11 +139,11 @@
 
        do {
                /* Specialised local_irq_save(). */
-               flags = test_and_clear_bit(EVENTS_MASTER_ENABLE_BIT, 
-                   &shared->events_mask);
-               barrier();
+               flags = x86_atomic_test_and_clear_bit(&shared->events_mask,
+                   EVENTS_MASTER_ENABLE_BIT);
+               __insn_barrier();
 
-               events = xchg(&shared->events, 0);
+               events = x86_atomic_xchg(&shared->events, 0);
                events &= event_mask;
 
                /* 'events' now contains some pending events to handle. */
@@ -165,8 +164,9 @@
 
                /* Specialised local_irq_restore(). */
                if (flags)
-                       set_bit(EVENTS_MASTER_ENABLE_BIT, &shared->events_mask);
-               barrier();
+                       x86_atomic_set_bit(&shared->events_mask,
+                           EVENTS_MASTER_ENABLE_BIT);
+               __insn_barrier();
        }
        while ( shared->events );
 
@@ -180,24 +180,25 @@
 
 void hypervisor_enable_event(unsigned int ev)
 {
-       set_bit(ev, &event_mask);
-       set_bit(ev, &HYPERVISOR_shared_info->events_mask);
+       x86_atomic_set_bit(&event_mask, ev);
+       x86_atomic_set_bit(&HYPERVISOR_shared_info->events_mask, ev);
 #if 0
-       if ( test_bit(EVENTS_MASTER_ENABLE_BIT, 
-                &HYPERVISOR_shared_info->events_mask) )
+       if (x86_atomic_test_bit(&HYPERVISOR_shared_info->events_mask,
+               EVENTS_MASTER_ENABLE_BIT))
                do_hypervisor_callback(NULL);
 #endif
 }
 
 void hypervisor_disable_event(unsigned int ev)
 {
-       clear_bit(ev, &event_mask);
-       clear_bit(ev, &HYPERVISOR_shared_info->events_mask);
+
+       x86_atomic_clear_bit(&event_mask, ev);
+       x86_atomic_clear_bit(&HYPERVISOR_shared_info->events_mask, ev);
 }
 
 void hypervisor_acknowledge_event(unsigned int ev)
 {
-       if ( !(event_mask & (1<<ev)) )
-               atomic_inc((atomic_t *)(void *)&ev_err_count);
-       set_bit(ev, &HYPERVISOR_shared_info->events_mask);
+
+       /* XXX add event counter for stray events: !(event_mask & (1<<ev)) */
+       x86_atomic_set_bit(&HYPERVISOR_shared_info->events_mask, ev);
 }