Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 798d9103 authored by Thomas Renninger's avatar Thomas Renninger Committed by Len Brown
Browse files

ACPI: create CONFIG_ACPI_DEBUG_FUNC_TRACE 



Split ACPI_DEBUG into function trace enabled and not enabled.

Function trace is most of the ACPI_DEBUG costs, but is
not much of use for kernel ACPI debugging.

Size of kernel image increased on test compile:
+ 48k  (Full ACPI_DEBUG)
+ 35k  (ACPI_DEBUG with function trace compiled out)

Performance without function trace is also much better.

Also remove ACPI_LV_DEBUG_OBJECT from default debug level as
a lot vendors let Store (value, debug) in their code and this
might confuse users when it pops up in syslog.

Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 54ca4123

drivers/acpi/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -280,6 +280,14 @@ config ACPI_DEBUG 
	  of verbosity. Saying Y enables these statements. This will increase

	  your kernel size by around 50K.



config ACPI_DEBUG_FUNC_TRACE

	bool "Additionally enable ACPI function tracing"

	default n

	depends on ACPI_DEBUG

	help

	  ACPI Debug Statements slow down ACPI processing. Function trace

	  is about half of the penalty and is rarely useful.



config ACPI_EC

	bool

	default y

include/acpi/acmacros.h

+23 −0
Original line number Diff line number Diff line
@@ -486,6 +486,8 @@ 
#define ACPI_FUNCTION_NAME(name)

#endif



#ifdef DEBUG_FUNC_TRACE



#define ACPI_FUNCTION_TRACE(a)          ACPI_FUNCTION_NAME(a) \

			  acpi_ut_trace(ACPI_DEBUG_PARAMETERS)

#define ACPI_FUNCTION_TRACE_PTR(a,b)    ACPI_FUNCTION_NAME(a) \
@@ -563,6 +565,27 @@ 


#endif				/* ACPI_SIMPLE_RETURN_MACROS */



#else /* !DEBUG_FUNC_TRACE */



#define ACPI_FUNCTION_TRACE(a)

#define ACPI_FUNCTION_TRACE_PTR(a,b)

#define ACPI_FUNCTION_TRACE_U32(a,b)

#define ACPI_FUNCTION_TRACE_STR(a,b)

#define ACPI_FUNCTION_EXIT

#define ACPI_FUNCTION_STATUS_EXIT(s)

#define ACPI_FUNCTION_VALUE_EXIT(s)

#define ACPI_FUNCTION_TRACE(a)

#define ACPI_FUNCTION_ENTRY()



#define return_VOID                     return

#define return_ACPI_STATUS(s)           return(s)

#define return_VALUE(s)                 return(s)

#define return_UINT8(s)                 return(s)

#define return_UINT32(s)                return(s)

#define return_PTR(s)                   return(s)



#endif /* DEBUG_FUNC_TRACE */



/* Conditional execution */



#define ACPI_DEBUG_EXEC(a)              a

include/acpi/acoutput.h

+2 −2
Original line number Diff line number Diff line
@@ -178,8 +178,8 @@ 


/* Defaults for debug_level, debug and normal */



#define ACPI_DEBUG_DEFAULT          (ACPI_LV_INIT | ACPI_LV_WARN | ACPI_LV_ERROR | ACPI_LV_DEBUG_OBJECT)

#define ACPI_NORMAL_DEFAULT         (ACPI_LV_INIT | ACPI_LV_WARN | ACPI_LV_ERROR | ACPI_LV_DEBUG_OBJECT)

#define ACPI_DEBUG_DEFAULT          (ACPI_LV_INIT | ACPI_LV_WARN | ACPI_LV_ERROR)

#define ACPI_NORMAL_DEFAULT         (ACPI_LV_INIT | ACPI_LV_WARN | ACPI_LV_ERROR)

#define ACPI_DEBUG_ALL              (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL)



#endif				/* __ACOUTPUT_H__ */