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

Commit 9c14cc44 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' into acpi-gpe

parents 9a3c4145 c12f07d1

drivers/acpi/acpi_extlog.c

+7 −7
Original line number Diff line number Diff line
@@ -69,11 +69,11 @@ static u32 l1_percpu_entry; 
#define ELOG_ENTRY_ADDR(phyaddr) \

	(phyaddr - elog_base + (u8 *)elog_addr)



static struct acpi_generic_status *extlog_elog_entry_check(int cpu, int bank)

static struct acpi_hest_generic_status *extlog_elog_entry_check(int cpu, int bank)

{

	int idx;

	u64 data;

	struct acpi_generic_status *estatus;

	struct acpi_hest_generic_status *estatus;



	WARN_ON(cpu < 0);

	idx = ELOG_IDX(cpu, bank);
@@ -82,7 +82,7 @@ static struct acpi_generic_status *extlog_elog_entry_check(int cpu, int bank) 
		return NULL;



	data &= EXT_ELOG_ENTRY_MASK;

	estatus = (struct acpi_generic_status *)ELOG_ENTRY_ADDR(data);

	estatus = (struct acpi_hest_generic_status *)ELOG_ENTRY_ADDR(data);



	/* if no valid data in elog entry, just return */

	if (estatus->block_status == 0)
@@ -92,7 +92,7 @@ static struct acpi_generic_status *extlog_elog_entry_check(int cpu, int bank) 
}



static void __print_extlog_rcd(const char *pfx,

			       struct acpi_generic_status *estatus, int cpu)

			       struct acpi_hest_generic_status *estatus, int cpu)

{

	static atomic_t seqno;

	unsigned int curr_seqno;
@@ -111,7 +111,7 @@ static void __print_extlog_rcd(const char *pfx, 
}



static int print_extlog_rcd(const char *pfx,

			    struct acpi_generic_status *estatus, int cpu)

			    struct acpi_hest_generic_status *estatus, int cpu)

{

	/* Not more than 2 messages every 5 seconds */

	static DEFINE_RATELIMIT_STATE(ratelimit_corrected, 5*HZ, 2);
@@ -137,7 +137,7 @@ static int extlog_print(struct notifier_block *nb, unsigned long val, 
	struct mce *mce = (struct mce *)data;

	int	bank = mce->bank;

	int	cpu = mce->extcpu;

	struct acpi_generic_status *estatus;

	struct acpi_hest_generic_status *estatus;

	int rc;



	estatus = extlog_elog_entry_check(cpu, bank);
@@ -148,7 +148,7 @@ static int extlog_print(struct notifier_block *nb, unsigned long val, 
	/* clear record status to enable BIOS to update it again */

	estatus->block_status = 0;



	rc = print_extlog_rcd(NULL, (struct acpi_generic_status *)elog_buf, cpu);

	rc = print_extlog_rcd(NULL, (struct acpi_hest_generic_status *)elog_buf, cpu);



	return NOTIFY_STOP;

}

drivers/acpi/acpica/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -175,5 +175,5 @@ acpi-y += \ 
	utxferror.o	\

	utxfmutex.o



acpi-$(ACPI_FUTURE_USAGE) += uttrack.o utcache.o

acpi-$(ACPI_FUTURE_USAGE) += utfileio.o utprint.o uttrack.o utcache.o

drivers/acpi/acpica/acapps.h

+6 −3
Original line number Diff line number Diff line
@@ -79,10 +79,13 @@ 
/* Macros for usage messages */



#define ACPI_USAGE_HEADER(usage) \

	printf ("Usage: %s\nOptions:\n", usage);

	acpi_os_printf ("Usage: %s\nOptions:\n", usage);



#define ACPI_USAGE_TEXT(description) \

	acpi_os_printf (description);



#define ACPI_OPTION(name, description) \

	printf ("  %-18s%s\n", name, description);

	acpi_os_printf (" %-18s%s\n", name, description);



#define FILE_SUFFIX_DISASSEMBLY     "dsl"

#define ACPI_TABLE_FILE_SUFFIX      ".dat"
@@ -102,7 +105,7 @@ extern char *acpi_gbl_optarg; 
/*

 * cmfsize - Common get file size function

 */

u32 cm_get_file_size(FILE * file);

u32 cm_get_file_size(ACPI_FILE file);



#ifndef ACPI_DUMP_APP

/*

drivers/acpi/acpica/acdebug.h

+0 −3
Original line number Diff line number Diff line
@@ -233,9 +233,6 @@ acpi_status acpi_db_load_acpi_table(char *filename); 
acpi_status

acpi_db_get_table_from_file(char *filename, struct acpi_table_header **table);



acpi_status

acpi_db_read_table_from_file(char *filename, struct acpi_table_header **table);



/*

 * dbhistry - debugger HISTORY command

 */

drivers/acpi/acpica/acglobal.h

+7 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ ACPI_GLOBAL(u32, acpi_gbl_trace_dbg_layer); 
 *

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



ACPI_GLOBAL(u8, acpi_gbl_db_output_flags);

ACPI_INIT_GLOBAL(u8, acpi_gbl_db_output_flags, ACPI_DB_CONSOLE_OUTPUT);



#ifdef ACPI_DISASSEMBLER
@@ -362,6 +362,12 @@ ACPI_GLOBAL(u32, acpi_gbl_num_objects); 
#ifdef ACPI_APPLICATION



ACPI_INIT_GLOBAL(ACPI_FILE, acpi_gbl_debug_file, NULL);

ACPI_INIT_GLOBAL(ACPI_FILE, acpi_gbl_output_file, NULL);



/* Print buffer */



ACPI_GLOBAL(acpi_spinlock, acpi_gbl_print_lock);	/* For print buffer */

ACPI_GLOBAL(char, acpi_gbl_print_buffer[1024]);



#endif				/* ACPI_APPLICATION */