Module Name: src
Committed By: mrg
Date: Tue May 31 20:28:57 UTC 2022
Modified Files:
src/sys/dev/acpi: acpi.c acpi_power.c acpi_verbose.c acpi_wakedev.c
src/sys/dev/acpi/acpica: OsdHardware.c
Log Message:
allow ACPI to compile without PCI support. fixes ia64 build.
To generate a diff of this commit:
cvs rdiff -u -r1.297 -r1.298 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/acpi/acpi_power.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/acpi/acpi_verbose.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/acpi_wakedev.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/acpica/OsdHardware.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/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.297 src/sys/dev/acpi/acpi.c:1.298
--- src/sys/dev/acpi/acpi.c:1.297 Sun Feb 27 21:22:09 2022
+++ src/sys/dev/acpi/acpi.c Tue May 31 20:28:57 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.297 2022/02/27 21:22:09 riastradh Exp $ */
+/* $NetBSD: acpi.c,v 1.298 2022/05/31 20:28:57 mrg Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.297 2022/02/27 21:22:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.298 2022/05/31 20:28:57 mrg Exp $");
#include "pci.h"
#include "opt_acpi.h"
@@ -698,10 +698,12 @@ acpi_build_tree(struct acpi_softc *sc)
(void)AcpiWalkNamespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, UINT32_MAX,
acpi_make_devnode, acpi_make_devnode_post, &awc, NULL);
+#if NPCI > 0
/*
* Scan the internal namespace.
*/
(void)acpi_pcidev_scan(sc->sc_root);
+#endif
}
static void
Index: src/sys/dev/acpi/acpi_power.c
diff -u src/sys/dev/acpi/acpi_power.c:1.35 src/sys/dev/acpi/acpi_power.c:1.36
--- src/sys/dev/acpi/acpi_power.c:1.35 Thu Jun 1 02:45:09 2017
+++ src/sys/dev/acpi/acpi_power.c Tue May 31 20:28:57 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_power.c,v 1.35 2017/06/01 02:45:09 chs Exp $ */
+/* $NetBSD: acpi_power.c,v 1.36 2022/05/31 20:28:57 mrg Exp $ */
/*-
* Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
@@ -56,7 +56,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.35 2017/06/01 02:45:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.36 2022/05/31 20:28:57 mrg Exp $");
+
+#include "pci.h"
#include <sys/param.h>
#include <sys/kmem.h>
@@ -670,7 +672,6 @@ void
acpi_power_add(struct acpi_devnode *ad)
{
const char *str = NULL;
- device_t dev;
int err;
KASSERT(ad != NULL && ad->ad_root != NULL);
@@ -682,12 +683,14 @@ acpi_power_add(struct acpi_devnode *ad)
if (ad->ad_device != NULL)
str = device_xname(ad->ad_device);
+#if NPCI > 0
else {
- dev = acpi_pcidev_find_dev(ad);
+ device_t dev = acpi_pcidev_find_dev(ad);
if (dev != NULL)
str = device_xname(dev);
}
+#endif
if (str == NULL)
return;
Index: src/sys/dev/acpi/acpi_verbose.c
diff -u src/sys/dev/acpi/acpi_verbose.c:1.20 src/sys/dev/acpi/acpi_verbose.c:1.21
--- src/sys/dev/acpi/acpi_verbose.c:1.20 Mon Dec 20 11:17:40 2021
+++ src/sys/dev/acpi/acpi_verbose.c Tue May 31 20:28:57 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_verbose.c,v 1.20 2021/12/20 11:17:40 skrll Exp $ */
+/* $NetBSD: acpi_verbose.c,v 1.21 2022/05/31 20:28:57 mrg Exp $ */
/*-
* Copyright (c) 2003, 2007, 2010 The NetBSD Foundation, Inc.
@@ -65,7 +65,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.20 2021/12/20 11:17:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.21 2022/05/31 20:28:57 mrg Exp $");
+
+#include "pci.h"
#include <sys/param.h>
#include <sys/device.h>
@@ -515,6 +517,7 @@ acpi_print_tree(struct acpi_devnode *ad,
if (ad->ad_device != NULL)
aprint_normal(" <%s>", device_xname(ad->ad_device));
+#if NPCI > 0
if (ad->ad_pciinfo != NULL) {
aprint_normal(" (PCI)");
@@ -539,6 +542,7 @@ acpi_print_tree(struct acpi_devnode *ad,
if (dev != NULL)
aprint_normal(" <%s>", device_xname(dev));
}
+#endif
aprint_normal("\n");
Index: src/sys/dev/acpi/acpi_wakedev.c
diff -u src/sys/dev/acpi/acpi_wakedev.c:1.28 src/sys/dev/acpi/acpi_wakedev.c:1.29
--- src/sys/dev/acpi/acpi_wakedev.c:1.28 Mon Dec 20 11:17:40 2021
+++ src/sys/dev/acpi/acpi_wakedev.c Tue May 31 20:28:57 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.c,v 1.28 2021/12/20 11:17:40 skrll Exp $ */
+/* $NetBSD: acpi_wakedev.c,v 1.29 2022/05/31 20:28:57 mrg Exp $ */
/*-
* Copyright (c) 2009, 2010, 2011 Jared D. McNeill <[email protected]>
@@ -27,7 +27,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.28 2021/12/20 11:17:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.29 2022/05/31 20:28:57 mrg Exp $");
+
+#include "pci.h"
#include <sys/param.h>
#include <sys/device.h>
@@ -210,7 +212,6 @@ acpi_wakedev_add(struct acpi_devnode *ad
{
struct acpi_wakedev *aw;
const char *str = NULL;
- device_t dev;
int err;
KASSERT(ad != NULL && ad->ad_wakedev != NULL);
@@ -228,12 +229,14 @@ acpi_wakedev_add(struct acpi_devnode *ad
if (ad->ad_device != NULL)
str = device_xname(ad->ad_device);
+#if NPCI > 0
else {
- dev = acpi_pcidev_find_dev(ad);
+ device_t dev = acpi_pcidev_find_dev(ad);
if (dev != NULL)
str = device_xname(dev);
}
+#endif
if (str == NULL)
return;
Index: src/sys/dev/acpi/acpica/OsdHardware.c
diff -u src/sys/dev/acpi/acpica/OsdHardware.c:1.13 src/sys/dev/acpi/acpica/OsdHardware.c:1.14
--- src/sys/dev/acpi/acpica/OsdHardware.c:1.13 Fri Dec 31 17:22:15 2021
+++ src/sys/dev/acpi/acpica/OsdHardware.c Tue May 31 20:28:57 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdHardware.c,v 1.13 2021/12/31 17:22:15 riastradh Exp $ */
+/* $NetBSD: OsdHardware.c,v 1.14 2022/05/31 20:28:57 mrg Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -44,7 +44,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdHardware.c,v 1.13 2021/12/31 17:22:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdHardware.c,v 1.14 2022/05/31 20:28:57 mrg Exp $");
+
+#include "pci.h"
#include <sys/param.h>
#include <sys/device.h>
@@ -210,6 +212,7 @@ ACPI_STATUS
AcpiOsReadPciConfiguration(ACPI_PCI_ID *PciId, UINT32 Register, UINT64 *Value,
UINT32 Width)
{
+#if NPCI > 0
pci_chipset_tag_t pc;
pcitag_t tag;
pcireg_t tmp;
@@ -240,6 +243,9 @@ AcpiOsReadPciConfiguration(ACPI_PCI_ID *
}
return AE_OK;
+#else
+ return AE_BAD_PARAMETER;
+#endif
}
/*
@@ -251,6 +257,7 @@ ACPI_STATUS
AcpiOsWritePciConfiguration(ACPI_PCI_ID *PciId, UINT32 Register,
ACPI_INTEGER Value, UINT32 Width)
{
+#if NPCI > 0
pci_chipset_tag_t pc;
pcitag_t tag;
pcireg_t tmp;
@@ -282,4 +289,7 @@ AcpiOsWritePciConfiguration(ACPI_PCI_ID
pci_conf_write(pc, tag, Register & ~3, tmp);
return AE_OK;
+#else
+ return AE_BAD_PARAMETER;
+#endif
}
