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

Commit 4fb80c37 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: acpidump: Convert the default behavior to dump from /sys/firmware/acpi/tables 

ACPICA commit 04c3bd7e9d6aeb2b3edebe99c90dc271ae4e6353

In order to work without any additional option to dump tables when /dev/mem
doesn't exist, this patch switches the default behavior of acpidump to dump
from /sys/firmware/acpi/tables. Reported by Al Stone, Fixed by Lv Zheng.

Link: https://github.com/acpica/acpica/commit/04c3bd7e


Reported-by: default avatarAl Stone <ahs3@redhat.com>
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 428394df

tools/power/acpi/tools/acpidump/acpidump.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
EXTERN u8 INIT_GLOBAL(gbl_summary_mode, FALSE);

EXTERN u8 INIT_GLOBAL(gbl_verbose_mode, FALSE);

EXTERN u8 INIT_GLOBAL(gbl_binary_mode, FALSE);

EXTERN u8 INIT_GLOBAL(gbl_dump_customized_tables, FALSE);

EXTERN u8 INIT_GLOBAL(gbl_dump_customized_tables, TRUE);

EXTERN u8 INIT_GLOBAL(gbl_do_not_dump_xsdt, FALSE);

EXTERN ACPI_FILE INIT_GLOBAL(gbl_output_file, NULL);

EXTERN char INIT_GLOBAL(*gbl_output_filename, NULL);

tools/power/acpi/tools/acpidump/apmain.c

+12 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ struct ap_dump_action action_table[AP_MAX_ACTIONS]; 
u32 current_action = 0;



#define AP_UTILITY_NAME             "ACPI Binary Table Dump Utility"

#define AP_SUPPORTED_OPTIONS        "?a:bcf:hn:o:r:svxz"

#define AP_SUPPORTED_OPTIONS        "?a:bc:f:hn:o:r:svxz"



/******************************************************************************

 *
@@ -96,7 +96,6 @@ static void ap_display_usage(void) 
	ACPI_USAGE_HEADER("acpidump [options]");



	ACPI_OPTION("-b", "Dump tables to binary files");

	ACPI_OPTION("-c", "Dump customized tables");

	ACPI_OPTION("-h -?", "This help message");

	ACPI_OPTION("-o <File>", "Redirect output to file");

	ACPI_OPTION("-r <Address>", "Dump tables from specified RSDP");
@@ -107,6 +106,7 @@ static void ap_display_usage(void) 
	ACPI_USAGE_TEXT("\nTable Options:\n");



	ACPI_OPTION("-a <Address>", "Get table via a physical address");

	ACPI_OPTION("-c <on|off>", "Turning on/off customized table dumping");

	ACPI_OPTION("-f <BinaryFile>", "Get table via a binary file");

	ACPI_OPTION("-n <Signature>", "Get table via a name/signature");

	ACPI_OPTION("-x", "Do not use but dump XSDT");
@@ -181,7 +181,16 @@ static int ap_do_options(int argc, char **argv) 


		case 'c':	/* Dump customized tables */



			if (!strcmp(acpi_gbl_optarg, "on")) {

				gbl_dump_customized_tables = TRUE;

			} else if (!strcmp(acpi_gbl_optarg, "off")) {

				gbl_dump_customized_tables = FALSE;

			} else {

				acpi_log_error

				    ("%s: Cannot handle this switch, please use on|off\n",

				     acpi_gbl_optarg);

				return (-1);

			}

			continue;



		case 'h':