[src/trunk]: src/sys/arch Make it possible to explicitly disable MSI/MSIX wit...

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

details:   https://anonhg.NetBSD.org/src/rev/526eeafed353
branches:  trunk
changeset: 340078:526eeafed353
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Aug 21 14:22:14 2015 +0000

description:
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?

diffstat:

 sys/arch/amd64/include/types.h |  4 +++-
 sys/arch/i386/include/types.h  |  4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r c1e09efbabf8 -r 526eeafed353 sys/arch/amd64/include/types.h
--- a/sys/arch/amd64/include/types.h    Fri Aug 21 14:19:10 2015 +0000
+++ b/sys/arch/amd64/include/types.h    Fri Aug 21 14:22:14 2015 +0000
@@ -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 @@
 #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__     */
 
diff -r c1e09efbabf8 -r 526eeafed353 sys/arch/i386/include/types.h
--- a/sys/arch/i386/include/types.h     Fri Aug 21 14:19:10 2015 +0000
+++ b/sys/arch/i386/include/types.h     Fri Aug 21 14:22:14 2015 +0000
@@ -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 @@
 #if defined(_KERNEL)
 #define        __HAVE_RAS
 
-#if !defined(XEN)
+#if !defined(XEN) && !defined(NO_PCI_MSI_MSIX)
 #define __HAVE_PCI_MSI_MSIX
 #endif
 #endif