CVS commit: src/sys/arch/xen

[Jaromir Dolecek]

Module Name:    src
Committed By:   jdolecek
Date:           Tue Apr 21 19:03:51 UTC 2020

Modified Files:
        src/sys/arch/xen/include: intr.h
        src/sys/arch/xen/x86: xen_intr.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/xen/include/intr.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/xen/x86/xen_intr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/xen/include/intr.h
diff -u src/sys/arch/xen/include/intr.h:1.53 src/sys/arch/xen/include/intr.h:1.54
--- src/sys/arch/xen/include/intr.h:1.53	Mon Dec 23 13:35:37 2019
+++ src/sys/arch/xen/include/intr.h	Tue Apr 21 19:03:51 2020
@@ -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_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_ */

Index: src/sys/arch/xen/x86/xen_intr.c
diff -u src/sys/arch/xen/x86/xen_intr.c:1.22 src/sys/arch/xen/x86/xen_intr.c:1.23
--- src/sys/arch/xen/x86/xen_intr.c:1.22	Mon Apr 13 22:54:12 2020
+++ src/sys/arch/xen/x86/xen_intr.c	Tue Apr 21 19:03:51 2020
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: xen_intr.c,v
 
 #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 @@ xen_intr_create_intrid(int legacy_irq, s
 	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(intr_disestablish, xen_in
 __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 */