Module Name: src
Committed By: pooka
Date: Fri Aug 21 14:22:14 UTC 2015
Modified Files:
src/sys/arch/amd64/include: types.h
src/sys/arch/i386/include: types.h
Log Message:
Make it possible to explicitly disable MSI/MSIX with NO_PCI_MSI_MSIX.
Some platforms, e.g. linux uio-pci-generic, do not support MSI at all.
XXX: does MSI being defined intentionally depend on _KERNEL_OPT on amd64
but not i386?
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amd64/include/types.h
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/i386/include/types.h
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/amd64/include/types.h
diff -u src/sys/arch/amd64/include/types.h:1.46 src/sys/arch/amd64/include/types.h:1.47
--- src/sys/arch/amd64/include/types.h:1.46 Mon Apr 27 07:03:57 2015
+++ src/sys/arch/amd64/include/types.h Fri Aug 21 14:22:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.46 2015/04/27 07:03:57 knakahara Exp $ */
+/* $NetBSD: types.h,v 1.47 2015/08/21 14:22:14 pooka Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -103,9 +103,11 @@ typedef volatile unsigned char __cpu_si
#define __HAVE_MM_MD_DIRECT_MAPPED_IO
#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
#define __HAVE_CPU_UAREA_ROUTINES
+#if !defined(NO_PCI_MSI_MSIX)
#define __HAVE_PCI_MSI_MSIX
#endif
#endif
+#endif
#else /* !__x86_64__ */
Index: src/sys/arch/i386/include/types.h
diff -u src/sys/arch/i386/include/types.h:1.81 src/sys/arch/i386/include/types.h:1.82
--- src/sys/arch/i386/include/types.h:1.81 Mon Apr 27 07:03:58 2015
+++ src/sys/arch/i386/include/types.h Fri Aug 21 14:22:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.81 2015/04/27 07:03:58 knakahara Exp $ */
+/* $NetBSD: types.h,v 1.82 2015/08/21 14:22:14 pooka Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -130,7 +130,7 @@ typedef volatile unsigned char __cpu_si
#if defined(_KERNEL)
#define __HAVE_RAS
-#if !defined(XEN)
+#if !defined(XEN) && !defined(NO_PCI_MSI_MSIX)
#define __HAVE_PCI_MSI_MSIX
#endif
#endif
