 @@ -1,14 +1,14 @@
-/*	$NetBSD: evtchn.h,v 1.20 2011/09/20 00:12:23 jym Exp $	*/
+/*	$NetBSD: evtchn.h,v 1.20.8.1 2015/04/14 14:59:11 msaitoh Exp $	*/
 /*
+ *
  * Copyright (c) 2004 Christian Limpach.
  * All rights reserved.
+ *
  * 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
 @@ -57,15 +57,16 @@ int unbind_pirq_from_evtch(int);
 int unbind_virq_from_evtch(int);
 evtchn_port_t bind_vcpu_to_evtch(cpuid_t);
 struct pintrhand {
 	int pirq;
 	int evtch;
 	int (*func)(void *);
 	void *arg;
 };
 struct pintrhand *pirq_establish(int, int, int (*)(void *), void *, int,
      const char *);
 void pirq_disestablish(struct pintrhand *);
 #endif /*  _XEN_EVENTS_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: evtchn.c,v 1.62.2.1 2013/12/17 22:39:17 riz Exp $	*/
+/*	$NetBSD: evtchn.c,v 1.62.2.2 2015/04/14 14:59:11 msaitoh 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.
+ *
 @@ -44,27 +44,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.62.2.1 2013/12/17 22:39:17 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.62.2.2 2015/04/14 14:59:11 msaitoh Exp $");
 #include "opt_xen.h"
 #include "isa.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/kmem.h>
 #include <sys/reboot.h>
 @@ -544,51 +544,62 @@ struct pintrhand *
 pirq_establish(int pirq, int evtch, int (*func)(void *), void *arg, int level,
     const char *evname)
+{
 	struct pintrhand *ih;
 	physdev_op_t physdev_op;
 	ih = kmem_zalloc(sizeof(struct pintrhand),
 	    cold ? KM_NOSLEEP : KM_SLEEP);
 	if (ih == NULL) {
 		printf("pirq_establish: can't allocate handler info\n");
 		return NULL;
+	}
 	if (event_set_handler(evtch, pirq_interrupt, ih, level, evname) != 0) {
 		kmem_free(ih, sizeof(struct pintrhand));
 		return NULL;
 	ih->pirq = pirq;
 	ih->evtch = evtch;
 	ih->func = func;
 	ih->arg = arg;
 	if (event_set_handler(evtch, pirq_interrupt, ih, level, evname) != 0) {
 		kmem_free(ih, sizeof(struct pintrhand));
 		return NULL;
+	}
 	physdev_op.cmd = PHYSDEVOP_IRQ_STATUS_QUERY;
 	physdev_op.u.irq_status_query.irq = pirq;
 	if (HYPERVISOR_physdev_op(&physdev_op) < 0)
 		panic("HYPERVISOR_physdev_op(PHYSDEVOP_IRQ_STATUS_QUERY)");
 	if (physdev_op.u.irq_status_query.flags &
 	    PHYSDEVOP_IRQ_NEEDS_UNMASK_NOTIFY) {
 		pirq_needs_unmask_notify[evtch >> 5] |= (1 << (evtch & 0x1f));
 #ifdef IRQ_DEBUG
 		printf("pirq %d needs notify\n", pirq);
 #endif
+	}
 	hypervisor_enable_event(evtch);
 	return ih;
+}
 void
 pirq_disestablish(struct pintrhand *ih)
+{
 	int error = event_remove_handler(ih->evtch, pirq_interrupt, ih);
 	if (error) {
 		printf("pirq_disestablish(%p): %d\n", ih, error);
 		return;
+	}
 	kmem_free(ih, sizeof(struct pintrhand));
+}
 int
 pirq_interrupt(void *arg)
+{
 	struct pintrhand *ih = arg;
 	int ret;
 	ret = ih->func(ih->arg);
 #ifdef IRQ_DEBUG
 	if (ih->evtch == IRQ_DEBUG)
 	    printf("pirq_interrupt irq %d ret %d\n", ih->pirq, ret);
 #endif
 	return ret;
 @@ -766,38 +777,38 @@ event_remove_handler(int evtch, int (*fu
 	mutex_spin_enter(&evtlock[evtch]);
 	for (ihp = &evts->ev_handlers, ih = evts->ev_handlers;
 	    ih != NULL;
 	    ihp = &ih->ih_evt_next, ih = ih->ih_evt_next) {
 		if (ih->ih_realfun == func && ih->ih_realarg == arg)
 			break;
+	}
 	if (ih == NULL) {
 		mutex_spin_exit(&evtlock[evtch]);
 		return ENOENT;
+	}
 	ci = ih->ih_cpu;
 	*ihp = ih->ih_evt_next;
 	mutex_spin_exit(&evtlock[evtch]);
 	ipls = ci->ci_isources[ih->ih_level];
 	for (ihp = &ipls->ipl_handlers, ih = ipls->ipl_handlers;
 	    ih != NULL;
 	    ihp = &ih->ih_ipl_next, ih = ih->ih_ipl_next) {
 		if (ih->ih_realfun == func && ih->ih_realarg == arg)
 			break;
+	}
 	if (ih == NULL)
 		panic("event_remove_handler");
 	*ihp = ih->ih_ipl_next;
 	mutex_spin_exit(&evtlock[evtch]);
 	kmem_free(ih, sizeof (struct intrhand));
 	if (evts->ev_handlers == NULL) {
 		xen_atomic_clear_bit(&ci->ci_evtmask[0], evtch);
 		evcnt_detach(&evts->ev_evcnt);
 		kmem_free(evts, sizeof (struct evtsource));
 		evtsource[evtch] = NULL;
 	} else {
 		intr_calculatemasks(evts, evtch, ci);
+	}
 	return 0;
+}
 void

 @@ -1,14 +1,14 @@
-/*      $NetBSD: pci_intr_machdep.c,v 1.15 2011/07/01 18:36:45 dyoung Exp $      */
+/*      $NetBSD: pci_intr_machdep.c,v 1.15.8.1 2015/04/14 14:59:11 msaitoh Exp $      */
 /*
  * Copyright (c) 2005 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.
+ *
 @@ -16,27 +16,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: pci_intr_machdep.c,v 1.15 2011/07/01 18:36:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.15.8.1 2015/04/14 14:59:11 msaitoh Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <machine/bus_private.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <xen/evtchn.h>
 @@ -211,14 +211,15 @@ pci_intr_establish(pci_chipset_tag_t pci
 		snprintf(evname, sizeof(evname), "%s pin %d",
 		    device_xname(pic->sc_dev), APIC_IRQ_PIN(intrh.pirq));
 	} else
 #endif
 		snprintf(evname, sizeof(evname), "irq%d", intrh.pirq);
 	return (void *)pirq_establish(intrh.pirq & 0xff,
 	    intrh.evtch, func, arg, level, evname);
+}
 void
 pci_intr_disestablish(pci_chipset_tag_t pcitag, void *cookie)
+{
 	pirq_disestablish(cookie);
+}