[src/trunk]: src/sys/dev/acpi Limit building & calling ACPI MCFG to kernels w...

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

details:   https://anonhg.NetBSD.org/src/rev/296e36e14689
branches:  trunk
changeset: 830219:296e36e14689
user:      maya <maya%NetBSD.org@localhost>
date:      Thu Mar 01 06:00:49 2018 +0000

description:
Limit building & calling ACPI MCFG to kernels with PCI and ACPI.

pci_quirks.c requires pci
acpi_mcfg.c was recently changed to use pci_quirks.c functions.

as a result, ia64 kernels with acpi but no pci failed to link.

tested an ia64 and amd64 kernels build.

diffstat:

 sys/dev/acpi/acpi.c     |  7 +++++--
 sys/dev/acpi/files.acpi |  4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r 218009478d9e -r 296e36e14689 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c       Thu Mar 01 05:47:22 2018 +0000
+++ b/sys/dev/acpi/acpi.c       Thu Mar 01 06:00:49 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi.c,v 1.265 2017/11/23 15:48:24 jmcneill Exp $      */
+/*     $NetBSD: acpi.c,v 1.266 2018/03/01 06:00:49 maya Exp $  */
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,9 +100,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.265 2017/11/23 15:48:24 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.266 2018/03/01 06:00:49 maya Exp $");
 
 #include "opt_acpi.h"
+#include "opt_pci.h"
 #include "opt_pcifixup.h"
 
 #include <sys/param.h>
@@ -487,10 +488,12 @@
         */
        acpi_build_tree(sc);
 
+#ifdef NPCI
        /*
         * Probe MCFG table
         */
        acpimcfg_probe(sc);
+#endif
 
        acpi_md_callback(sc);
 
diff -r 218009478d9e -r 296e36e14689 sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi   Thu Mar 01 05:47:22 2018 +0000
+++ b/sys/dev/acpi/files.acpi   Thu Mar 01 06:00:49 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.acpi,v 1.100 2017/12/10 16:51:30 bouyer Exp $
+#      $NetBSD: files.acpi,v 1.101 2018/03/01 06:00:49 maya Exp $
 
 include "dev/acpi/acpica/files.acpica"
 
@@ -19,7 +19,7 @@
 file   dev/acpi/acpi.c                 acpi
 file   dev/acpi/acpi_debug.c           acpi
 file   dev/acpi/acpi_i2c.c             acpi
-file   dev/acpi/acpi_mcfg.c            acpi
+file   dev/acpi/acpi_mcfg.c            acpi & pci
 file   dev/acpi/acpi_pci.c             acpi
 file   dev/acpi/acpi_pci_link.c        acpi
 file   dev/acpi/acpi_power.c           acpi