Module Name: src
Committed By: jmcneill
Date: Tue Oct 16 00:30:08 UTC 2018
Modified Files:
src/sys/dev/acpi: acpi.c acpi_timer.c files.acpi
Log Message:
Add ACPI_REDUCED_HARDWARE defflag (used by ACPICA) and fix acpi build with this
option set.
To generate a diff of this commit:
cvs rdiff -u -r1.274 -r1.275 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/acpi/acpi_timer.c
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/acpi/files.acpi
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.274 src/sys/dev/acpi/acpi.c:1.275
--- src/sys/dev/acpi/acpi.c:1.274 Fri Oct 12 21:35:54 2018
+++ src/sys/dev/acpi/acpi.c Tue Oct 16 00:30:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.274 2018/10/12 21:35:54 jmcneill Exp $ */
+/* $NetBSD: acpi.c,v 1.275 2018/10/16 00:30:08 jmcneill 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.274 2018/10/12 21:35:54 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.275 2018/10/16 00:30:08 jmcneill Exp $");
#include "pci.h"
#include "opt_acpi.h"
@@ -525,8 +525,9 @@ acpi_attach(device_t parent, device_t se
acpi_active = 1;
/* Show SCI interrupt. */
- aprint_verbose_dev(self, "SCI interrupting at int %u\n",
- AcpiGbl_FADT.SciInterrupt);
+ if (AcpiGbl_FADT.SciInterrupt != 0)
+ aprint_verbose_dev(self, "SCI interrupting at int %u\n",
+ AcpiGbl_FADT.SciInterrupt);
/*
* Install fixed-event handlers.
@@ -1409,7 +1410,9 @@ acpi_enter_sleep_state(int state)
AcpiClearEvent(ACPI_EVENT_POWER_BUTTON);
AcpiClearEvent(ACPI_EVENT_SLEEP_BUTTON);
AcpiClearEvent(ACPI_EVENT_RTC);
+#if !defined(ACPI_REDUCED_HARDWARE)
AcpiHwDisableAllGpes();
+#endif
acpi_md_OsEnableInterrupt();
rv = AcpiLeaveSleepState(state);
Index: src/sys/dev/acpi/acpi_timer.c
diff -u src/sys/dev/acpi/acpi_timer.c:1.23 src/sys/dev/acpi/acpi_timer.c:1.24
--- src/sys/dev/acpi/acpi_timer.c:1.23 Mon Oct 15 11:33:09 2018
+++ src/sys/dev/acpi/acpi_timer.c Tue Oct 16 00:30:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_timer.c,v 1.23 2018/10/15 11:33:09 jmcneill Exp $ */
+/* $NetBSD: acpi_timer.c,v 1.24 2018/10/16 00:30:08 jmcneill Exp $ */
/*-
* Copyright (c) 2006 Matthias Drochner <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.23 2018/10/15 11:33:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.24 2018/10/16 00:30:08 jmcneill Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -39,6 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_timer.c
#include <machine/acpi_machdep.h>
+#if !defined(ACPI_REDUCED_HARDWARE)
static int acpitimer_test(void);
static struct timecounter acpi_timecounter = {
@@ -57,10 +58,12 @@ acpitimer_supported(void)
{
return AcpiGbl_FADT.PmTimerLength != 0;
}
+#endif
int
acpitimer_init(struct acpi_softc *sc)
{
+#if !defined(ACPI_REDUCED_HARDWARE)
ACPI_STATUS rv;
uint32_t bits;
int i, j;
@@ -91,18 +94,25 @@ acpitimer_init(struct acpi_softc *sc)
acpi_timecounter.tc_name, bits);
return 0;
+#else
+ return -1;
+#endif
}
int
acpitimer_detach(void)
{
-
+#if !defined(ACPI_REDUCED_HARDWARE)
if (!acpitimer_supported())
return -1;
return tc_detach(&acpi_timecounter);
+#else
+ return -1;
+#endif
}
+#if !defined(ACPI_REDUCED_HARDWARE)
u_int
acpitimer_read_fast(struct timecounter *tc)
{
@@ -190,3 +200,4 @@ acpitimer_test(void)
return n;
}
+#endif
Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.104 src/sys/dev/acpi/files.acpi:1.105
--- src/sys/dev/acpi/files.acpi:1.104 Mon Oct 15 23:59:16 2018
+++ src/sys/dev/acpi/files.acpi Tue Oct 16 00:30:08 2018
@@ -1,10 +1,10 @@
-# $NetBSD: files.acpi,v 1.104 2018/10/15 23:59:16 jmcneill Exp $
+# $NetBSD: files.acpi,v 1.105 2018/10/16 00:30:08 jmcneill Exp $
include "dev/acpi/acpica/files.acpica"
defflag opt_acpi.h ACPIVERBOSE ACPI_DEBUG ACPI_ACTIVATE_DEV
ACPI_DSDT_OVERRIDE ACPI_SCANPCI ACPI_BREAKPOINT
- ACPI__DIS_IS_BROKEN
+ ACPI_REDUCED_HARDWARE ACPI__DIS_IS_BROKEN
defparam opt_acpi.h ACPI_DSDT_FILE := "\"/dev/null\""
defparam opt_acpi.h ACPI_BLACKLIST_YEAR = 2000
