 @@ -1,14 +1,14 @@
-/*	$NetBSD: evtchn.c,v 1.32 2008/02/19 19:50:53 bouyer Exp $	*/
+/*	$NetBSD: evtchn.c,v 1.33 2008/03/13 22:04:57 bouyer Exp $	*/
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -54,27 +54,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.32 2008/02/19 19:50:53 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.33 2008/03/13 22:04:57 bouyer Exp $");
 #include "opt_xen.h"
 #include "isa.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>
 #include <sys/simplelock.h>
 @@ -180,26 +180,28 @@ init_events()
 	x86_enable_intr();		/* at long last... */
+}
 unsigned int
 evtchn_do_event(int evtch, struct intrframe *regs)
+{
 	struct cpu_info *ci;
 	int ilevel;
 	struct intrhand *ih;
 	int	(*ih_fun)(void *, void *);
 	extern struct uvmexp uvmexp;
 	u_int32_t iplmask;
 	int i;
 	u_int32_t iplbit;
 #ifdef DIAGNOSTIC
 	if (evtch >= NR_EVENT_CHANNELS) {
 		printf("event number %d > NR_IRQS\n", evtch);
 		panic("evtchn_do_event");
+	}
 #endif
 #ifdef IRQ_DEBUG
 	if (evtch == IRQ_DEBUG)
 		printf("evtchn_do_event: evtch %d\n", evtch);
 #endif
 	ci = &cpu_info_primary;
 @@ -243,42 +245,69 @@ evtchn_do_event(int evtch, struct intrfr
 	while (ih != NULL) {
 		if (ih->ih_level <= ilevel) {
 #ifdef IRQ_DEBUG
 		if (evtch == IRQ_DEBUG)
 		    printf("ih->ih_level %d <= ilevel %d\n", ih->ih_level, ilevel);
 #endif
 #ifdef MULTIPROCESSOR
 			x86_intunlock(regs);
 #endif
 			cli();
 			hypervisor_set_ipending(iplmask,
 			    evtch >> LONG_SHIFT, evtch & LONG_MASK);
 			/* leave masked */
-			splx(ilevel);
+			goto splx;
 			return 0;
+		}
 		iplmask &= ~IUNMASK(ci, ih->ih_level);
 		ci->ci_ilevel = ih->ih_level;
 		ih_fun = (void *)ih->ih_fun;
 		ih_fun(ih->ih_arg, regs);
 		ih = ih->ih_evt_next;
+	}
 	cli();
 #ifdef MULTIPROCESSOR
 	x86_intunlock(regs);
 #endif
 	hypervisor_enable_event(evtch);
-	splx(ilevel);
+splx:
 	/*
 	 * C version of spllower(). ASTs will be checked when
 	 * hypevisor_callback() exits, so no need to check here.
 	 */
 	iplbit = 1 << (NIPL - 1);
 	i = (NIPL - 1);
 	while ((iplmask = (IUNMASK(ci, ilevel) & ci->ci_ipending)) != 0) {
 		if (iplbit == 0) {
 			/* another pending ipl went in while running a handler*/
 			iplbit = 1 << (NIPL - 1);
 			i = (NIPL - 1);
+		}
 		if (iplmask & iplbit) {
 			ci->ci_ipending &= ~iplbit;
 			KASSERT(i > ilevel);
 			ci->ci_ilevel = i;
 			for (ih = ci->ci_isources[i]->ipl_handlers; ih != NULL;
 			    ih = ih->ih_ipl_next) {
 				sti();
 				ih_fun = (void *)ih->ih_fun;
 				ih_fun(ih->ih_arg, regs);
 				cli();
+			}
 			hypervisor_enable_ipl(i);
+		}
 		i--;
 		iplbit >>= 1;
+	}
 	ci->ci_ilevel = ilevel;
 	return 0;
+}
 int
 bind_virq_to_evtch(int virq)
+{
 	evtchn_op_t op;
 	int evtchn, s;
 	s = splhigh();
 	simple_lock(&irq_mapping_update_lock);
 	evtchn = virq_to_evtch[virq];