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

Commit 3334861b authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Update the conditions to enable the utility resource dump strings. 



This patch enables resource dump functions for debugging purpose where
ACPI_DEBUG_OUTPUT is enabled.  Such functions are useful for developers
to track kernel issues when composing debugging patches.  They will be
optimized out during link stage for normal builds.

This patch updates the compilation condition used for the resource dump
related string tables to match the compilation environment used for
rsdump.c and rsdumpinfo.c.

This patch can help to improve the ACPICA release automation.  Lv Zheng.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent eb60c4d3

drivers/acpi/acpica/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ acpi-y += \ 
	rsaddr.o	\

	rscalc.o	\

	rscreate.o	\

	rsdump.o	\

	rsdumpinfo.o	\

	rsinfo.o	\

	rsio.o		\

	rsirq.o		\
@@ -132,8 +134,6 @@ acpi-y += \ 
	rsutils.o	\

	rsxface.o



acpi-$(ACPI_FUTURE_USAGE) += rsdump.o rsdumpinfo.o



acpi-y +=		\

	tbfadt.o	\

	tbfind.o	\

drivers/acpi/acpica/acutils.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ extern const u8 acpi_gbl_resource_aml_serial_bus_sizes[]; 


/* Strings used by the disassembler and debugger resource dump routines */



#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)

#if defined(ACPI_DEBUG_OUTPUT) || defined (ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)



extern const char *acpi_gbl_bm_decode[];

extern const char *acpi_gbl_config_decode[];

drivers/acpi/acpica/rsdump.c

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ 


#define _COMPONENT          ACPI_RESOURCES

ACPI_MODULE_NAME("rsdump")

#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)



#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DISASSEMBER) || defined(ACPI_DEBUGGER)

/* Local prototypes */

static void acpi_rs_out_string(char *title, char *value);

drivers/acpi/acpica/rsdumpinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
#define _COMPONENT          ACPI_RESOURCES

ACPI_MODULE_NAME("rsdumpinfo")



#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)

#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUGGER)

#define ACPI_RSD_OFFSET(f)          (u8) ACPI_OFFSET (union acpi_resource_data,f)

#define ACPI_PRT_OFFSET(f)          (u8) ACPI_OFFSET (struct acpi_pci_routing_table,f)

#define ACPI_RSD_TABLE_SIZE(name)   (sizeof(name) / sizeof (struct acpi_rsdump_info))

drivers/acpi/acpica/rsinfo.c

+1 −3
Original line number Diff line number Diff line
@@ -132,8 +132,7 @@ struct acpi_rsconvert_info *acpi_gbl_convert_resource_serial_bus_dispatch[] = { 
	acpi_rs_convert_uart_serial_bus,

};



#ifdef ACPI_FUTURE_USAGE

#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)

#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUGGER)



/* Dispatch table for resource dump functions */
@@ -168,7 +167,6 @@ struct acpi_rsdump_info *acpi_gbl_dump_serial_bus_dispatch[] = { 
};

#endif



#endif				/* ACPI_FUTURE_USAGE */

/*

 * Base sizes for external AML resource descriptors, indexed by internal type.

 * Includes size of the descriptor header (1 byte for small descriptors,