[src/trunk]: src/sys/arch/xen adjust so that this at least compiles and links...

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

details:   https://anonhg.NetBSD.org/src/rev/6d234e7a5eba
branches:  trunk
changeset: 1009364:6d234e7a5eba
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Apr 21 19:03:51 2020 +0000

description:
adjust so that this at least compiles and links with __HAVE_PCI_MSI_MSIX

diffstat:

 sys/arch/xen/include/intr.h |   5 ++++-
 sys/arch/xen/x86/xen_intr.c |  25 +++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diffs (77 lines):

diff -r 71527a53f328 -r 6d234e7a5eba sys/arch/xen/include/intr.h
--- a/sys/arch/xen/include/intr.h       Tue Apr 21 18:25:11 2020 +0000
+++ b/sys/arch/xen/include/intr.h       Tue Apr 21 19:03:51 2020 +0000
@@ -1,4 +1,4 @@
-/*     $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       */
 
 /*-
@@ -95,6 +95,9 @@
 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_ */
diff -r 71527a53f328 -r 6d234e7a5eba sys/arch/xen/x86/xen_intr.c
--- a/sys/arch/xen/x86/xen_intr.c       Tue Apr 21 18:25:11 2020 +0000
+++ b/sys/arch/xen/x86/xen_intr.c       Tue Apr 21 19:03:51 2020 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -30,7 +30,7 @@
  */
 
 #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"
 
@@ -67,6 +67,10 @@
 
 #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)
@@ -527,6 +531,21 @@
        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);
@@ -542,4 +561,6 @@
 __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 */