Commit 6d582d7e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica:
  ACPICA: Update version to 20200214
  ACPICA: Fix a couple of typos
  ACPICA: use acpi_size instead of u32 for prefix_path_length
  ACPICA: cast length arguement to acpi_ns_build_normalized_path() as u32
  ACPICA: cast the result of the pointer difference to u32
  ACPICA: Table Manager: Update comments in a function header
  ACPICA: Enable sleep button on ACPI legacy wake
  ACPICA: Fix a comment "enable" fixed events -> "disable" all fixed events.
  ACPICA: ASL-ASL+ converter: make root file a parameter for cv_init_file_tree
  ACPICA: ASL-ASL+ converter: remove function parameters from cv_init_file_tree()
parents ecb9c790 c7be17a6

drivers/acpi/acpica/acconvert.h

+1 −3
Original line number Diff line number Diff line
@@ -65,9 +65,7 @@ void cg_write_aml_comment(union acpi_parse_object *op); 
/*

 * cvparser

 */

void

cv_init_file_tree(struct acpi_table_header *table,

		  u8 *aml_start, u32 aml_length);

void cv_init_file_tree(struct acpi_table_header *table, FILE * root_file);



void cv_clear_op_comments(union acpi_parse_object *op);

drivers/acpi/acpica/acmacros.h

+2 −2
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ 
#define ASL_CV_PRINT_ONE_COMMENT(a,b,c,d) cv_print_one_comment_type (a,b,c,d);

#define ASL_CV_PRINT_ONE_COMMENT_LIST(a,b) cv_print_one_comment_list (a,b);

#define ASL_CV_FILE_HAS_SWITCHED(a)       cv_file_has_switched(a)

#define ASL_CV_INIT_FILETREE(a,b,c)      cv_init_file_tree(a,b,c);

#define ASL_CV_INIT_FILETREE(a,b)      cv_init_file_tree(a,b);



#else
@@ -492,7 +492,7 @@ 
#define ASL_CV_PRINT_ONE_COMMENT(a,b,c,d)

#define ASL_CV_PRINT_ONE_COMMENT_LIST(a,b)

#define ASL_CV_FILE_HAS_SWITCHED(a)       0

#define ASL_CV_INIT_FILETREE(a,b,c)

#define ASL_CV_INIT_FILETREE(a,b)



#endif

drivers/acpi/acpica/evevent.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static acpi_status acpi_ev_fixed_event_initialize(void) 


	/*

	 * Initialize the structure that keeps track of fixed event handlers and

	 * enable the fixed events.

	 * disable all of the fixed events.

	 */

	for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {

		acpi_gbl_fixed_event_handlers[i].handler = NULL;

drivers/acpi/acpica/hwsleep.c

+12 −0
Original line number Diff line number Diff line
@@ -300,6 +300,18 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state) 
				    [ACPI_EVENT_POWER_BUTTON].

				    status_register_id, ACPI_CLEAR_STATUS);



	/* Enable sleep button */



	(void)

	    acpi_write_bit_register(acpi_gbl_fixed_event_info

				    [ACPI_EVENT_SLEEP_BUTTON].

				    enable_register_id, ACPI_ENABLE_EVENT);



	(void)

	    acpi_write_bit_register(acpi_gbl_fixed_event_info

				    [ACPI_EVENT_SLEEP_BUTTON].

				    status_register_id, ACPI_CLEAR_STATUS);



	acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING);

	return_ACPI_STATUS(status);

}

drivers/acpi/acpica/nsnames.c

+3 −3
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle, 
	/* Build the path in the caller buffer */



	(void)acpi_ns_build_normalized_path(node, buffer->pointer,

					    required_size, no_trailing);

					    (u32)required_size, no_trailing);



	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%X]\n",

			  (char *)buffer->pointer, (u32) required_size));
@@ -315,7 +315,7 @@ char *acpi_ns_get_normalized_pathname(struct acpi_namespace_node *node, 


	/* Build the path in the allocated buffer */



	(void)acpi_ns_build_normalized_path(node, name_buffer, size,

	(void)acpi_ns_build_normalized_path(node, name_buffer, (u32)size,

					    no_trailing);



	ACPI_DEBUG_PRINT_RAW((ACPI_DB_NAMES, "%s: Path \"%s\"\n",
@@ -346,7 +346,7 @@ char *acpi_ns_build_prefixed_pathname(union acpi_generic_state *prefix_scope, 
	char *full_path = NULL;

	char *external_path = NULL;

	char *prefix_path = NULL;

	u32 prefix_path_length = 0;

	acpi_size prefix_path_length = 0;



	/* If there is a prefix, get the pathname to it */

CRA Git | Maintained and supported by SUSTech CRA and CCSE