Commit 0e166e4f authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki

ACPICA: Debugger: reduce old external path format

ACPICA commit 75c0da9e796bdf9bdd46d75f028a3e1779903214

In the error logs and debugger outputs, use new external path format that
does not contain a trailing underscore.

This patch takes care of acpi_ns_get_external_pathname() invocations, chaning
them into acpi_ns_get_normalized_pathname(TRUE) where possible. Along with some
error log fixes, the following debugger commands are fixed: resources,
handlers, paths. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/75c0da9eSigned-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 ac9b64a0
...@@ -798,7 +798,7 @@ acpi_db_device_resources(acpi_handle obj_handle, ...@@ -798,7 +798,7 @@ acpi_db_device_resources(acpi_handle obj_handle,
acpi_status status; acpi_status status;
node = ACPI_CAST_PTR(struct acpi_namespace_node, obj_handle); node = ACPI_CAST_PTR(struct acpi_namespace_node, obj_handle);
parent_path = acpi_ns_get_external_pathname(node); parent_path = acpi_ns_get_normalized_pathname(node, TRUE);
if (!parent_path) { if (!parent_path) {
return (AE_NO_MEMORY); return (AE_NO_MEMORY);
} }
......
...@@ -1091,7 +1091,7 @@ acpi_db_display_non_root_handlers(acpi_handle obj_handle, ...@@ -1091,7 +1091,7 @@ acpi_db_display_non_root_handlers(acpi_handle obj_handle,
return (AE_OK); return (AE_OK);
} }
pathname = acpi_ns_get_external_pathname(node); pathname = acpi_ns_get_normalized_pathname(node, TRUE);
if (!pathname) { if (!pathname) {
return (AE_OK); return (AE_OK);
} }
......
...@@ -438,7 +438,7 @@ acpi_db_walk_for_predefined_names(acpi_handle obj_handle, ...@@ -438,7 +438,7 @@ acpi_db_walk_for_predefined_names(acpi_handle obj_handle,
return (AE_OK); return (AE_OK);
} }
pathname = acpi_ns_get_external_pathname(node); pathname = acpi_ns_get_normalized_pathname(node, TRUE);
if (!pathname) { if (!pathname) {
return (AE_OK); return (AE_OK);
} }
......
...@@ -953,7 +953,7 @@ acpi_db_evaluate_one_predefined_name(acpi_handle obj_handle, ...@@ -953,7 +953,7 @@ acpi_db_evaluate_one_predefined_name(acpi_handle obj_handle,
return (AE_OK); return (AE_OK);
} }
pathname = acpi_ns_get_external_pathname(node); pathname = acpi_ns_get_normalized_pathname(node, TRUE);
if (!pathname) { if (!pathname) {
return (AE_OK); return (AE_OK);
} }
......
...@@ -717,7 +717,7 @@ acpi_ns_dump_one_object_path(acpi_handle obj_handle, ...@@ -717,7 +717,7 @@ acpi_ns_dump_one_object_path(acpi_handle obj_handle,
return (AE_OK); return (AE_OK);
} }
pathname = acpi_ns_get_external_pathname(node); pathname = acpi_ns_get_normalized_pathname(node, TRUE);
path_indent = 1; path_indent = 1;
if (level <= max_level) { if (level <= max_level) {
......
...@@ -135,7 +135,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info) ...@@ -135,7 +135,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
/* Get the full pathname to the object, for use in warning messages */ /* Get the full pathname to the object, for use in warning messages */
info->full_pathname = acpi_ns_get_external_pathname(info->node); info->full_pathname = acpi_ns_get_normalized_pathname(info->node, TRUE);
if (!info->full_pathname) { if (!info->full_pathname) {
return_ACPI_STATUS(AE_NO_MEMORY); return_ACPI_STATUS(AE_NO_MEMORY);
} }
......
...@@ -582,7 +582,8 @@ acpi_ns_init_one_device(acpi_handle obj_handle, ...@@ -582,7 +582,8 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
/* Ignore error and move on to next device */ /* Ignore error and move on to next device */
char *scope_name = acpi_ns_get_external_pathname(device_node); char *scope_name =
acpi_ns_get_normalized_pathname(device_node, TRUE);
ACPI_EXCEPTION((AE_INFO, status, "during %s._INI execution", ACPI_EXCEPTION((AE_INFO, status, "during %s._INI execution",
scope_name)); scope_name));
......
...@@ -105,7 +105,7 @@ acpi_ns_search_one_scope(u32 target_name, ...@@ -105,7 +105,7 @@ acpi_ns_search_one_scope(u32 target_name,
if (ACPI_LV_NAMES & acpi_dbg_level) { if (ACPI_LV_NAMES & acpi_dbg_level) {
char *scope_name; char *scope_name;
scope_name = acpi_ns_get_external_pathname(parent_node); scope_name = acpi_ns_get_normalized_pathname(parent_node, TRUE);
if (scope_name) { if (scope_name) {
ACPI_DEBUG_PRINT((ACPI_DB_NAMES, ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
"Searching %s (%p) For [%4.4s] (%s)\n", "Searching %s (%p) For [%4.4s] (%s)\n",
......
...@@ -239,8 +239,9 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id, ...@@ -239,8 +239,9 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id,
overlap_count++; overlap_count++;
if (warn) { /* Optional warning message */ if (warn) { /* Optional warning message */
pathname = pathname =
acpi_ns_get_external_pathname(range_info-> acpi_ns_get_normalized_pathname(range_info->
region_node); region_node,
TRUE);
ACPI_WARNING((AE_INFO, ACPI_WARNING((AE_INFO,
"%s range 0x%8.8X%8.8X-0x%8.8X%8.8X conflicts with OpRegion 0x%8.8X%8.8X-0x%8.8X%8.8X (%s)", "%s range 0x%8.8X%8.8X-0x%8.8X%8.8X conflicts with OpRegion 0x%8.8X%8.8X-0x%8.8X%8.8X (%s)",
......
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