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

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
...@@ -65,9 +65,7 @@ void cg_write_aml_comment(union acpi_parse_object *op); ...@@ -65,9 +65,7 @@ void cg_write_aml_comment(union acpi_parse_object *op);
/* /*
* cvparser * cvparser
*/ */
void void cv_init_file_tree(struct acpi_table_header *table, FILE * root_file);
cv_init_file_tree(struct acpi_table_header *table,
u8 *aml_start, u32 aml_length);
void cv_clear_op_comments(union acpi_parse_object *op); void cv_clear_op_comments(union acpi_parse_object *op);
......
...@@ -477,7 +477,7 @@ ...@@ -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(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_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_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 #else
...@@ -492,7 +492,7 @@ ...@@ -492,7 +492,7 @@
#define ASL_CV_PRINT_ONE_COMMENT(a,b,c,d) #define ASL_CV_PRINT_ONE_COMMENT(a,b,c,d)
#define ASL_CV_PRINT_ONE_COMMENT_LIST(a,b) #define ASL_CV_PRINT_ONE_COMMENT_LIST(a,b)
#define ASL_CV_FILE_HAS_SWITCHED(a) 0 #define ASL_CV_FILE_HAS_SWITCHED(a) 0
#define ASL_CV_INIT_FILETREE(a,b,c) #define ASL_CV_INIT_FILETREE(a,b)
#endif #endif
......
...@@ -130,7 +130,7 @@ static acpi_status acpi_ev_fixed_event_initialize(void) ...@@ -130,7 +130,7 @@ static acpi_status acpi_ev_fixed_event_initialize(void)
/* /*
* Initialize the structure that keeps track of fixed event handlers and * 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++) { for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
acpi_gbl_fixed_event_handlers[i].handler = NULL; acpi_gbl_fixed_event_handlers[i].handler = NULL;
......
...@@ -300,6 +300,18 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state) ...@@ -300,6 +300,18 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state)
[ACPI_EVENT_POWER_BUTTON]. [ACPI_EVENT_POWER_BUTTON].
status_register_id, ACPI_CLEAR_STATUS); 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); acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING);
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
} }
......
...@@ -164,7 +164,7 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle, ...@@ -164,7 +164,7 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle,
/* Build the path in the caller buffer */ /* Build the path in the caller buffer */
(void)acpi_ns_build_normalized_path(node, buffer->pointer, (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", ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%X]\n",
(char *)buffer->pointer, (u32) required_size)); (char *)buffer->pointer, (u32) required_size));
...@@ -315,7 +315,7 @@ char *acpi_ns_get_normalized_pathname(struct acpi_namespace_node *node, ...@@ -315,7 +315,7 @@ char *acpi_ns_get_normalized_pathname(struct acpi_namespace_node *node,
/* Build the path in the allocated buffer */ /* 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); no_trailing);
ACPI_DEBUG_PRINT_RAW((ACPI_DB_NAMES, "%s: Path \"%s\"\n", 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, ...@@ -346,7 +346,7 @@ char *acpi_ns_build_prefixed_pathname(union acpi_generic_state *prefix_scope,
char *full_path = NULL; char *full_path = NULL;
char *external_path = NULL; char *external_path = NULL;
char *prefix_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 */ /* If there is a prefix, get the pathname to it */
......
...@@ -516,7 +516,7 @@ acpi_status acpi_install_method(u8 *buffer) ...@@ -516,7 +516,7 @@ acpi_status acpi_install_method(u8 *buffer)
method_flags = *parser_state.aml++; method_flags = *parser_state.aml++;
aml_start = parser_state.aml; aml_start = parser_state.aml;
aml_length = ACPI_PTR_DIFF(parser_state.pkg_end, aml_start); aml_length = (u32)ACPI_PTR_DIFF(parser_state.pkg_end, aml_start);
/* /*
* Allocate resources up-front. We don't want to have to delete a new * Allocate resources up-front. We don't want to have to delete a new
......
...@@ -202,14 +202,14 @@ ACPI_EXPORT_SYMBOL_INIT(acpi_reallocate_root_table) ...@@ -202,14 +202,14 @@ ACPI_EXPORT_SYMBOL_INIT(acpi_reallocate_root_table)
* *
* PARAMETERS: signature - ACPI signature of needed table * PARAMETERS: signature - ACPI signature of needed table
* instance - Which instance (for SSDTs) * instance - Which instance (for SSDTs)
* out_table_header - The pointer to the table header to fill * out_table_header - The pointer to the where the table header
* is returned
* *
* RETURN: Status and pointer to mapped table header * RETURN: Status and a copy of the table header
* *
* DESCRIPTION: Finds an ACPI table header. * DESCRIPTION: Finds and returns an ACPI table header. Caller provides the
* * memory where a copy of the header is to be returned
* NOTE: Caller is responsible in unmapping the header with * (fixed length).
* acpi_os_unmap_memory
* *
******************************************************************************/ ******************************************************************************/
acpi_status acpi_status
......
...@@ -44,7 +44,7 @@ acpi_ut_get_element_length(u8 object_type, ...@@ -44,7 +44,7 @@ acpi_ut_get_element_length(u8 object_type,
* *
* NOTE: We always allocate the worst-case object descriptor because * NOTE: We always allocate the worst-case object descriptor because
* these objects are cached, and we want them to be * these objects are cached, and we want them to be
* one-size-satisifies-any-request. This in itself may not be * one-size-satisfies-any-request. This in itself may not be
* the most memory efficient, but the efficiency of the object * the most memory efficient, but the efficiency of the object
* cache should more than make up for this! * cache should more than make up for this!
* *
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */ /* Current ACPICA subsystem version in YYYYMMDD format */
#define ACPI_CA_VERSION 0x20200110 #define ACPI_CA_VERSION 0x20200214
#include <acpi/acconfig.h> #include <acpi/acconfig.h>
#include <acpi/actypes.h> #include <acpi/actypes.h>
......
...@@ -862,7 +862,7 @@ enum acpi_erst_instructions { ...@@ -862,7 +862,7 @@ enum acpi_erst_instructions {
/* Command status return values */ /* Command status return values */
enum acpi_erst_command_status { enum acpi_erst_command_status {
ACPI_ERST_SUCESS = 0, ACPI_ERST_SUCCESS = 0,
ACPI_ERST_NO_SPACE = 1, ACPI_ERST_NO_SPACE = 1,
ACPI_ERST_NOT_AVAILABLE = 2, ACPI_ERST_NOT_AVAILABLE = 2,
ACPI_ERST_FAILURE = 3, ACPI_ERST_FAILURE = 3,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment