From fe3013ebf55edd20d57e7e806c445a5a5e2e7b11 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 13 Nov 2014 20:58:18 +0100 Subject: [PATCH] kernel/acpica: Restrict 'options ACPI_DEBUG' to printing debug output. For now, stop compiling the debugger/disassembler into the kernel when ACPI_DEBUG is in the config. It seems they are really only meant for userland and getting them to compile for the kernel isn't easily possible with newer ACPI releases (starting with 20140926). Also, our ACPI module build wasn't set up properly for calling them from DDB anyway. The code is just commented out and it might all get fixed at a later point in time. --- sys/conf/files | 48 +++++++++---------- .../source/include/platform/acdragonfly.h | 4 +- sys/dev/acpica/Makefile | 10 ++-- sys/dev/acpica/Osd/OsdDebug.c | 2 + sys/dev/acpica/acpivar.h | 2 + 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 85c5588456..8ef4f43883 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2031,30 +2031,30 @@ kern/dsched/bfq/wf2q.c optional dsched_bfq kern/dsched/bfq/bfq_helper_thread.c optional dsched_bfq # ACPICA code -${ACPICA_COMP_DIR}/debugger/dbcmds.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/debugger/dbconvert.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/debugger/dbdisply.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/debugger/dbexec.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/debugger/dbfileio.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/debugger/dbhistry.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/debugger/dbinput.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/debugger/dbmethod.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/debugger/dbnames.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/debugger/dbstats.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/debugger/dbtest.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/debugger/dbutils.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/debugger/dbxface.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/disassembler/dmbuffer.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/disassembler/dmdeferred.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/disassembler/dmnames.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/disassembler/dmobject.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/disassembler/dmopcode.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/disassembler/dmresrc.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/disassembler/dmresrcl.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/disassembler/dmresrcl2.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/disassembler/dmresrcs.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/disassembler/dmutils.c optional acpi acpi_debug -${ACPICA_COMP_DIR}/disassembler/dmwalk.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbcmds.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbconvert.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbdisply.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbexec.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbfileio.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbhistry.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbinput.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbmethod.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbnames.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbstats.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbtest.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbutils.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/debugger/dbxface.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/disassembler/dmbuffer.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/disassembler/dmdeferred.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/disassembler/dmnames.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/disassembler/dmobject.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/disassembler/dmopcode.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/disassembler/dmresrc.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/disassembler/dmresrcl.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/disassembler/dmresrcl2.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/disassembler/dmresrcs.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/disassembler/dmutils.c optional acpi acpi_debug +#${ACPICA_COMP_DIR}/disassembler/dmwalk.c optional acpi acpi_debug ${ACPICA_COMP_DIR}/dispatcher/dsargs.c optional acpi ${ACPICA_COMP_DIR}/dispatcher/dscontrol.c optional acpi ${ACPICA_COMP_DIR}/dispatcher/dsfield.c optional acpi diff --git a/sys/contrib/dev/acpica/source/include/platform/acdragonfly.h b/sys/contrib/dev/acpica/source/include/platform/acdragonfly.h index 1154b9b3f5..686d3592f3 100644 --- a/sys/contrib/dev/acpica/source/include/platform/acdragonfly.h +++ b/sys/contrib/dev/acpica/source/include/platform/acdragonfly.h @@ -139,13 +139,15 @@ #define DEBUGGER_THREADING 0 /* integrated with DDB */ #ifdef ACPI_DEBUG -#define ACPI_DEBUG_OUTPUT /* for backward compatibility */ +#define ACPI_DEBUG_OUTPUT /* enable debug output */ +#if 0 /* XXX */ #include "opt_ddb.h" #ifdef DDB #define ACPI_DEBUGGER #endif /* DDB */ #define ACPI_DISASSEMBLER #endif +#endif #ifdef ACPI_DEBUG_CACHE #define ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsReleaseObject diff --git a/sys/dev/acpica/Makefile b/sys/dev/acpica/Makefile index 845f737efa..9b542038f2 100644 --- a/sys/dev/acpica/Makefile +++ b/sys/dev/acpica/Makefile @@ -31,11 +31,11 @@ KMOD = acpi # ACPICA sources SRCS+= ahids.c ahuuids.c -SRCS+= dbcmds.c dbconvert.c dbdisply.c dbexec.c dbfileio.c dbhistry.c -SRCS+= dbinput.c dbstats.c dbtest.c dbutils.c dbxface.c -SRCS+= dbmethod.c dbnames.c -SRCS+= dmbuffer.c dmdeferred.c dmnames.c dmobject.c dmopcode.c -SRCS+= dmresrc.c dmresrcl.c dmresrcl2.c dmresrcs.c dmutils.c dmwalk.c +#SRCS+= dbcmds.c dbconvert.c dbdisply.c dbexec.c dbfileio.c dbhistry.c +#SRCS+= dbinput.c dbstats.c dbtest.c dbutils.c dbxface.c +#SRCS+= dbmethod.c dbnames.c +#SRCS+= dmbuffer.c dmdeferred.c dmnames.c dmobject.c dmopcode.c +#SRCS+= dmresrc.c dmresrcl.c dmresrcl2.c dmresrcs.c dmutils.c dmwalk.c SRCS+= dsfield.c dsinit.c dsmethod.c dsmthdat.c SRCS+= dsobject.c dsopcode.c dsutils.c dswexec.c dswload.c SRCS+= dswscope.c dswstate.c dsargs.c dscontrol.c dswload2.c diff --git a/sys/dev/acpica/Osd/OsdDebug.c b/sys/dev/acpica/Osd/OsdDebug.c index 297cb09312..f1d5f367b6 100644 --- a/sys/dev/acpica/Osd/OsdDebug.c +++ b/sys/dev/acpica/Osd/OsdDebug.c @@ -92,6 +92,7 @@ AcpiOsSignal(UINT32 Function, void *Info) return (AE_OK); } +#if 0 /* XXX */ #ifdef ACPI_DEBUGGER void acpi_EnterDebugger(void) @@ -109,3 +110,4 @@ acpi_EnterDebugger(void) AcpiDbUserCommands('A', &obj); } #endif /* ACPI_DEBUGGER */ +#endif diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index bf6964d5bc..1851300af1 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -302,9 +302,11 @@ acpi_TimerDelta(uint32_t end, uint32_t start) return (end - start); } +#if 0 /* XXX */ #ifdef ACPI_DEBUGGER void acpi_EnterDebugger(void); #endif +#endif #ifdef ACPI_DEBUG #include -- 2.41.0