| Message ID | 20190322012021.14043-1-erik.schmauss@intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | [v2] ACPI: use different default debug value than ACPICA | expand |
On Friday, March 22, 2019 2:20:21 AM CET Erik Schmauss wrote: > Rather than setting debug output flags during early init, its makes > more sense to simply re-define ACPI_DEBUG_DEFAULT specifically for > Linux. > > ACPICA commit 60903715711f4b00ca1831779a8a23279a66497d > > Link: https://github.com/acpica/acpica/commit/60903715 > > Fixes: ce5cbf53496b ("ACPI: Set debug output flags independent of ACPICA") > Reported-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> > Tested-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> > Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> > Signed-off-by: Bob Moore <robert.moore@intel.com> > --- > drivers/acpi/bus.c | 3 --- > include/acpi/acoutput.h | 3 +++ > include/acpi/platform/aclinux.h | 5 +++++ > 3 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c > index 6ecbbabf1233..eec263c9019e 100644 > --- a/drivers/acpi/bus.c > +++ b/drivers/acpi/bus.c > @@ -1043,9 +1043,6 @@ void __init acpi_early_init(void) > > acpi_permanent_mmap = true; > > - /* Initialize debug output. Linux does not use ACPICA defaults */ > - acpi_dbg_level = ACPI_LV_INFO | ACPI_LV_REPAIR; > - > #ifdef CONFIG_X86 > /* > * If the machine falls into the DMI check table, > diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h > index 30b1ae53689f..c50542dc71e0 100644 > --- a/include/acpi/acoutput.h > +++ b/include/acpi/acoutput.h > @@ -150,7 +150,10 @@ > > /* Defaults for debug_level, debug and normal */ > > +#ifndef ACPI_DEBUG_DEFAULT > #define ACPI_DEBUG_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_EVALUATION | ACPI_LV_REPAIR) > +#endif > + > #define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_REPAIR) > #define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL) > > diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h > index 9ff328fd946a..624b90b34085 100644 > --- a/include/acpi/platform/aclinux.h > +++ b/include/acpi/platform/aclinux.h > @@ -82,6 +82,11 @@ > #define ACPI_NO_ERROR_MESSAGES > #undef ACPI_DEBUG_OUTPUT > > +/* Use a specific bugging default separate from ACPICA */ > + > +#undef ACPI_DEBUG_DEFAULT > +#define ACPI_DEBUG_DEFAULT (ACPI_LV_INFO | ACPI_LV_REPAIR) > + > /* External interface for __KERNEL__, stub is needed */ > > #define ACPI_EXTERNAL_RETURN_STATUS(prototype) \ > Applied, thanks!
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 6ecbbabf1233..eec263c9019e 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -1043,9 +1043,6 @@ void __init acpi_early_init(void) acpi_permanent_mmap = true; - /* Initialize debug output. Linux does not use ACPICA defaults */ - acpi_dbg_level = ACPI_LV_INFO | ACPI_LV_REPAIR; - #ifdef CONFIG_X86 /* * If the machine falls into the DMI check table, diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h index 30b1ae53689f..c50542dc71e0 100644 --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h @@ -150,7 +150,10 @@ /* Defaults for debug_level, debug and normal */ +#ifndef ACPI_DEBUG_DEFAULT #define ACPI_DEBUG_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_EVALUATION | ACPI_LV_REPAIR) +#endif + #define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_REPAIR) #define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL) diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 9ff328fd946a..624b90b34085 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -82,6 +82,11 @@ #define ACPI_NO_ERROR_MESSAGES #undef ACPI_DEBUG_OUTPUT +/* Use a specific bugging default separate from ACPICA */ + +#undef ACPI_DEBUG_DEFAULT +#define ACPI_DEBUG_DEFAULT (ACPI_LV_INFO | ACPI_LV_REPAIR) + /* External interface for __KERNEL__, stub is needed */ #define ACPI_EXTERNAL_RETURN_STATUS(prototype) \
Rather than setting debug output flags during early init, its makes more sense to simply re-define ACPI_DEBUG_DEFAULT specifically for Linux. ACPICA commit 60903715711f4b00ca1831779a8a23279a66497d Link: https://github.com/acpica/acpica/commit/60903715 Fixes: ce5cbf53496b ("ACPI: Set debug output flags independent of ACPICA") Reported-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Tested-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> --- drivers/acpi/bus.c | 3 --- include/acpi/acoutput.h | 3 +++ include/acpi/platform/aclinux.h | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-)