[src/trunk]: src Enable 'options NO_PCI_MSI_MSIX' to DTRT in x86 builds.

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

details:   https://anonhg.NetBSD.org/src/rev/696058241dcd
branches:  trunk
changeset: 995394:696058241dcd
user:      cherry <cherry%NetBSD.org@localhost>
date:      Thu Dec 20 10:33:41 2018 +0000

description:
Enable 'options NO_PCI_MSI_MSIX' to DTRT in x86 builds.

Document 'options NO_PCI_MSI_MSIX' in options(4).

diffstat:

 share/man/man4/options.4    |  7 ++++++-
 sys/arch/x86/conf/files.x86 |  6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r de7dbd2941d6 -r 696058241dcd share/man/man4/options.4
--- a/share/man/man4/options.4  Thu Dec 20 09:47:15 2018 +0000
+++ b/share/man/man4/options.4  Thu Dec 20 10:33:41 2018 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: options.4,v 1.495 2018/12/20 09:17:04 cherry Exp $
+.\"    $NetBSD: options.4,v 1.496 2018/12/20 10:33:41 cherry Exp $
 .\"
 .\" Copyright (c) 1996
 .\"    Perry E. Metzger.  All rights reserved.
@@ -2688,6 +2688,11 @@
 .El
 .Ss x86-specific Options
 .Bl -ohang
+.It Cd options NO_PCI_MSI_MSIX
+Disable support for MSI/MSIX in the kernel.
+See
+.Xr pci_msi 9
+for details of MSI/MSIX support
 .It Cd options NO_PREEMPTION
 Disables
 .Xr kpreempt 9
diff -r de7dbd2941d6 -r 696058241dcd sys/arch/x86/conf/files.x86
--- a/sys/arch/x86/conf/files.x86       Thu Dec 20 09:47:15 2018 +0000
+++ b/sys/arch/x86/conf/files.x86       Thu Dec 20 10:33:41 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.x86,v 1.104 2018/12/07 15:47:11 maxv Exp $
+#      $NetBSD: files.x86,v 1.105 2018/12/20 10:33:41 cherry Exp $
 
 # options for MP configuration through the MP spec
 defflag opt_mpbios.h MPBIOS MPDEBUG MPBIOS_SCANPCI
@@ -155,8 +155,8 @@
 file   arch/x86/pci/pci_machdep.c      pci
 #file  arch/x86/pci/pci_ranges.c       pci
 file   arch/x86/pci/pci_intr_machdep.c pci
-file   arch/x86/pci/pci_msi_machdep.c  pci
-file   arch/x86/pci/msipic.c           pci
+file   arch/x86/pci/pci_msi_machdep.c  pci & ! no_pci_msi_msix
+file   arch/x86/pci/msipic.c           pci & ! no_pci_msi_msix
 
 file   arch/x86/pci/pciide_machdep.c   pciide_common