 @@ -1,14 +1,14 @@
-/*	$NetBSD: intr.h,v 1.53 2019/12/23 13:35:37 thorpej Exp $	*/
+/*	$NetBSD: intr.h,v 1.54 2020/04/21 19:03:51 jdolecek Exp $	*/
 /*	NetBSD intr.h,v 1.15 2004/10/31 10:39:34 yamt Exp	*/
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, and by Jason R. Thorpe.
+ *
  * 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
 @@ -85,16 +85,19 @@ void xen_broadcast_ipi(uint32_t);
 #define xen_ipi_init(_1) ((void) 0) /* nothing */
 #define xen_send_ipi(_i1, _i2) (0) /* nothing */
 #define xen_broadcast_ipi(_i1) ((void) 0) /* nothing */
 #endif /* MULTIPROCESSOR */
 void *xen_intr_establish_xname(int, struct pic *, int, int, int, int (*)(void *),
     void *, bool, const char *);
 void *xen_intr_establish(int, struct pic *, int, int, int, int (*)(void *),
     void *, bool);
 void xen_intr_mask(struct intrhand *);
 void xen_intr_unmask(struct intrhand *);
 void xen_intr_disestablish(struct intrhand *);
 struct intrsource *xen_intr_allocate_io_intrsource(const char *);
 void xen_intr_free_io_intrsource(const char *);
 #endif /* !_LOCORE */
 #endif /* _XEN_INTR_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xen_intr.c,v 1.22 2020/04/13 22:54:12 bouyer Exp $	*/
+/*	$NetBSD: xen_intr.c,v 1.23 2020/04/21 19:03:51 jdolecek Exp $	*/
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, and by Jason R. Thorpe.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR 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 FOUNDATION OR CONTRIBUTORS
  * 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: xen_intr.c,v 1.22 2020/04/13 22:54:12 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_intr.c,v 1.23 2020/04/21 19:03:51 jdolecek Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <xen/evtchn.h>
 #include <xen/xenfunc.h>
 #include <uvm/uvm.h>
 @@ -57,26 +57,30 @@ __KERNEL_RCSID(0, "$NetBSD: xen_intr.c,v
 #include <dev/acpi/acpivar.h>
 #endif
 #if NIOAPIC > 0 || NACPICA > 0
 #include <machine/i82093var.h>
 #endif
 #if NLAPIC > 0
 #include <machine/i82489var.h>
 #endif
 #if NPCI > 0
 #include <dev/pci/ppbreg.h>
 #ifdef __HAVE_PCI_MSI_MSIX
 #include <x86/pci/msipic.h>
 #include <x86/pci/pci_msi_machdep.h>
 #endif
 #endif
 #if defined(MULTIPROCESSOR)
 static const char *xen_ipi_names[XEN_NIPIS] = XEN_IPI_NAMES;
 #endif
 /*
  * Restore a value to cpl (unmasking interrupts).  If any unmasked
  * interrupts are pending, call Xspllower() to process them.
  */
 void xen_spllower(int nlevel);
 void
 @@ -517,29 +521,46 @@ xen_intr_create_intrid(int legacy_irq, s
 #if NIOAPIC > 0 || NACPICA > 0
 	ih = ((pic->pic_apicid << APIC_INT_APIC_SHIFT) & APIC_INT_APIC_MASK)
 	    | ((pin << APIC_INT_PIN_SHIFT) & APIC_INT_PIN_MASK);
 	if (pic->pic_type == PIC_IOAPIC) {
 		ih |= APIC_INT_VIA_APIC;
+	}
 	ih |= pin;
 	return intr_string(ih, buf, len);
 #endif
 	return NULL; /* No pic found! */
+}
 static struct intrsource xen_dummy_intrsource;
 struct intrsource *
 xen_intr_allocate_io_intrsource(const char *intrid)
+{
 	/* Nothing to do, required by MSI code */
 	return &xen_dummy_intrsource;
+}
 void
 xen_intr_free_io_intrsource(const char *intrid)
+{
 	/* Nothing to do, required by MSI code */
+}
 #if !defined(XENPVHVM)
 __strong_alias(spllower, xen_spllower);
 __strong_alias(x86_read_psl, xen_read_psl);
 __strong_alias(x86_write_psl, xen_write_psl);
 __strong_alias(intr_string, xintr_string);
 __strong_alias(intr_create_intrid, xen_intr_create_intrid);
 __strong_alias(intr_establish, xen_intr_establish);
 __strong_alias(intr_establish_xname, xen_intr_establish_xname);
 __strong_alias(intr_mask, xen_intr_mask);
 __strong_alias(intr_unmask, xen_intr_unmask);
 __strong_alias(intr_disestablish, xen_intr_disestablish);
 __strong_alias(cpu_intr_redistribute, xen_cpu_intr_redistribute);
 __strong_alias(cpu_intr_count, xen_cpu_intr_count);
 __strong_alias(cpu_intr_init, xen_cpu_intr_init);
 __strong_alias(intr_allocate_io_intrsource, xen_intr_allocate_io_intrsource);
 __strong_alias(intr_free_io_intrsource, xen_intr_free_io_intrsource);
 #endif /* !XENPVHVM */