Commit 713608a3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica:
  ACPICA: Update version to 20191018
  ACPICA: debugger: remove leading whitespaces when converting a string to a buffer
  ACPICA: acpiexec: initialize all simple types and field units from user input
  ACPICA: debugger: add field unit support for acpi_db_get_next_token
  ACPICA: debugger: surround field unit output with braces '{'
  ACPICA: debugger: add command to dump all fields of particular subtype
  ACPICA: utilities: add flag to only display data when dumping buffers
  ACPICA: make acpi_load_table() return table index
  ACPICA: Add new external interface, acpi_unload_table()
  ACPICA: More Clang changes
  ACPICA: Win OSL: Replace get_tick_count with get_tick_count64
  ACPICA: Results from Clang
parents b4447c0d c7ccf10b

drivers/acpi/acpi_configfs.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static ssize_t acpi_table_aml_write(struct config_item *cfg, 
	if (!table->header)

		return -ENOMEM;



	ret = acpi_load_table(table->header);

	ret = acpi_load_table(table->header, &table->index);

	if (ret) {

		kfree(table->header);

		table->header = NULL;
@@ -223,7 +223,7 @@ static void acpi_table_drop_item(struct config_group *group, 
	struct acpi_table *table = container_of(cfg, struct acpi_table, cfg);



	ACPI_INFO(("Host-directed Dynamic ACPI Table Unload"));

	acpi_tb_unload_table(table->index);

	acpi_unload_table(table->index);

}



static struct configfs_group_operations acpi_table_group_ops = {

drivers/acpi/acpica/acdebug.h

+2 −0
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ void acpi_db_find_references(char *object_arg); 


void acpi_db_get_bus_info(void);



acpi_status acpi_db_display_fields(u32 address_space_id);



/*

 * dbdisply - debug display commands

 */

drivers/acpi/acpica/acstruct.h

+10 −0
Original line number Diff line number Diff line
@@ -192,6 +192,16 @@ struct acpi_device_walk_info { 
	u32 num_INI;

};



/* Info used by Acpi  acpi_db_display_fields */



struct acpi_region_walk_info {

	u32 debug_level;

	u32 count;

	acpi_owner_id owner_id;

	u8 display_type;

	u32 address_space_id;

};



/* TBD: [Restructure] Merge with struct above */



struct acpi_walk_info {

drivers/acpi/acpica/acutils.h

+5 −4
Original line number Diff line number Diff line
@@ -142,10 +142,11 @@ struct acpi_pkg_info { 


/* acpi_ut_dump_buffer */



#define DB_BYTE_DISPLAY     1

#define DB_WORD_DISPLAY     2

#define DB_DWORD_DISPLAY    4

#define DB_QWORD_DISPLAY    8

#define DB_BYTE_DISPLAY      0x01

#define DB_WORD_DISPLAY      0x02

#define DB_DWORD_DISPLAY     0x04

#define DB_QWORD_DISPLAY     0x08

#define DB_DISPLAY_DATA_ONLY 0x10



/*

 * utascii - ASCII utilities

drivers/acpi/acpica/dbconvert.c

+4 −0
Original line number Diff line number Diff line
@@ -106,6 +106,10 @@ acpi_db_convert_to_buffer(char *string, union acpi_object *object) 
	u8 *buffer;

	acpi_status status;



	/* Skip all preceding white space */



	acpi_ut_remove_whitespace(&string);



	/* Generate the final buffer length */



	for (i = 0, length = 0; string[i];) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE