Patchwork ACPI: use different default debug value than ACPICA

login
register
mail settings
Submitter Erik Schmauss
Date March 15, 2019, 8:29 p.m.
Message ID <20190315202941.30421-1-erik.schmauss@intel.com>
Download mbox | patch
Permalink /patch/749985/
State New
Headers show

Comments

Erik Schmauss - March 15, 2019, 8:29 p.m.
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>
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/platform/aclinux.h | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)
Rafael J. Wysocki - March 20, 2019, 10:14 a.m.
On Fri, Mar 15, 2019 at 9:40 PM Erik Schmauss <erik.schmauss@intel.com> 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>
> 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/platform/aclinux.h | 5 +++++
>  2 files changed, 5 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/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)

This triggers build warnings from include/linux/acoutput.h in some cases.

> +
>  /* External interface for __KERNEL__, stub is needed */
>
>  #define ACPI_EXTERNAL_RETURN_STATUS(prototype) \
> --
Rafael J. Wysocki - March 20, 2019, 10:21 a.m.
On Wed, Mar 20, 2019 at 11:14 AM Rafael J. Wysocki <rafael@kernel.org> wrote:
>
> On Fri, Mar 15, 2019 at 9:40 PM Erik Schmauss <erik.schmauss@intel.com> 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>
> > 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/platform/aclinux.h | 5 +++++
> >  2 files changed, 5 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/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)
>
> This triggers build warnings from include/linux/acoutput.h in some cases.

Adding #ifndef ACPI_DEBUG_DEFAULT / #endif around the
ACPI_DEBUG_DEFAULT definition in acoutput.h would help I guess.

Patch

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/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) \