Merge branch 'acpica'
* acpica: ACPICA: Update version to 20190405 ACPICA: Namespace: add check to avoid null pointer dereference ACPICA: Update version to 20190329 ACPICA: utilities: fix spelling of PCC to platform_comm_channel ACPICA: Rename nameseg length macro/define for clarity ACPICA: Rename nameseg compare macro for clarity ACPICA: Rename nameseg copy macro for clarity
This commit is contained in:
@ -109,7 +109,7 @@ static ssize_t acpi_table_signature_show(struct config_item *cfg, char *str)
|
||||
if (!h)
|
||||
return -EINVAL;
|
||||
|
||||
return sprintf(str, "%.*s\n", ACPI_NAME_SIZE, h->signature);
|
||||
return sprintf(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->signature);
|
||||
}
|
||||
|
||||
static ssize_t acpi_table_length_show(struct config_item *cfg, char *str)
|
||||
@ -170,7 +170,7 @@ static ssize_t acpi_table_asl_compiler_id_show(struct config_item *cfg,
|
||||
if (!h)
|
||||
return -EINVAL;
|
||||
|
||||
return sprintf(str, "%.*s\n", ACPI_NAME_SIZE, h->asl_compiler_id);
|
||||
return sprintf(str, "%.*s\n", ACPI_NAMESEG_SIZE, h->asl_compiler_id);
|
||||
}
|
||||
|
||||
static ssize_t acpi_table_asl_compiler_revision_show(struct config_item *cfg,
|
||||
|
@ -293,7 +293,7 @@ acpi_status (*acpi_internal_method) (struct acpi_walk_state * walk_state);
|
||||
* expected_return_btypes - Allowed type(s) for the return value
|
||||
*/
|
||||
struct acpi_name_info {
|
||||
char name[ACPI_NAME_SIZE];
|
||||
char name[ACPI_NAMESEG_SIZE];
|
||||
u16 argument_list;
|
||||
u8 expected_btypes;
|
||||
};
|
||||
@ -370,7 +370,7 @@ typedef acpi_status (*acpi_object_converter) (struct acpi_namespace_node *
|
||||
converted_object);
|
||||
|
||||
struct acpi_simple_repair_info {
|
||||
char name[ACPI_NAME_SIZE];
|
||||
char name[ACPI_NAMESEG_SIZE];
|
||||
u32 unexpected_btypes;
|
||||
u32 package_index;
|
||||
acpi_object_converter object_converter;
|
||||
|
@ -453,7 +453,7 @@ acpi_db_execute(char *name, char **args, acpi_object_type *types, u32 flags)
|
||||
|
||||
/* Dump a _PLD buffer if present */
|
||||
|
||||
if (ACPI_COMPARE_NAME
|
||||
if (ACPI_COMPARE_NAMESEG
|
||||
((ACPI_CAST_PTR
|
||||
(struct acpi_namespace_node,
|
||||
acpi_gbl_db_method_info.method)->name.ascii),
|
||||
|
@ -354,7 +354,7 @@ acpi_status acpi_db_find_name_in_namespace(char *name_arg)
|
||||
char acpi_name[5] = "____";
|
||||
char *acpi_name_ptr = acpi_name;
|
||||
|
||||
if (strlen(name_arg) > ACPI_NAME_SIZE) {
|
||||
if (strlen(name_arg) > ACPI_NAMESEG_SIZE) {
|
||||
acpi_os_printf("Name must be no longer than 4 characters\n");
|
||||
return (AE_OK);
|
||||
}
|
||||
|
@ -200,7 +200,7 @@ acpi_ds_initialize_objects(u32 table_index,
|
||||
|
||||
/* DSDT is always the first AML table */
|
||||
|
||||
if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_DSDT)) {
|
||||
if (ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_DSDT)) {
|
||||
ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
|
||||
"\nInitializing Namespace objects:\n"));
|
||||
}
|
||||
|
@ -292,7 +292,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
|
||||
acpi_status status;
|
||||
u32 gpe_number;
|
||||
u8 temp_gpe_number;
|
||||
char name[ACPI_NAME_SIZE + 1];
|
||||
char name[ACPI_NAMESEG_SIZE + 1];
|
||||
u8 type;
|
||||
|
||||
ACPI_FUNCTION_TRACE(ev_match_gpe_method);
|
||||
@ -310,7 +310,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
|
||||
* 1) Extract the method name and null terminate it
|
||||
*/
|
||||
ACPI_MOVE_32_TO_32(name, &method_node->name.integer);
|
||||
name[ACPI_NAME_SIZE] = 0;
|
||||
name[ACPI_NAMESEG_SIZE] = 0;
|
||||
|
||||
/* 2) Name must begin with an underscore */
|
||||
|
||||
|
@ -53,10 +53,10 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
|
||||
|
||||
/* Special case for root */
|
||||
|
||||
size_needed = 1 + (ACPI_NAME_SIZE * num_name_segs) + 2 + 1;
|
||||
size_needed = 1 + (ACPI_NAMESEG_SIZE * num_name_segs) + 2 + 1;
|
||||
} else {
|
||||
size_needed =
|
||||
prefix_count + (ACPI_NAME_SIZE * num_name_segs) + 2 + 1;
|
||||
prefix_count + (ACPI_NAMESEG_SIZE * num_name_segs) + 2 + 1;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -141,7 +141,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
|
||||
}
|
||||
|
||||
for (index = 0;
|
||||
(index < ACPI_NAME_SIZE)
|
||||
(index < ACPI_NAMESEG_SIZE)
|
||||
&& (acpi_ut_valid_name_char(*aml_address, 0)); index++) {
|
||||
char_buf[index] = *aml_address++;
|
||||
}
|
||||
|
@ -683,7 +683,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
|
||||
|
||||
/* Point to next name segment and make this node current */
|
||||
|
||||
path += ACPI_NAME_SIZE;
|
||||
path += ACPI_NAMESEG_SIZE;
|
||||
current_node = this_node;
|
||||
}
|
||||
|
||||
|
@ -74,6 +74,10 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)
|
||||
|
||||
ACPI_FUNCTION_NAME(ns_delete_node);
|
||||
|
||||
if (!node) {
|
||||
return_VOID;
|
||||
}
|
||||
|
||||
/* Detach an object if there is one */
|
||||
|
||||
acpi_ns_detach_object(node);
|
||||
|
@ -70,7 +70,7 @@ void acpi_ns_print_pathname(u32 num_segments, const char *pathname)
|
||||
acpi_os_printf("?");
|
||||
}
|
||||
|
||||
pathname += ACPI_NAME_SIZE;
|
||||
pathname += ACPI_NAMESEG_SIZE;
|
||||
num_segments--;
|
||||
if (num_segments) {
|
||||
acpi_os_printf(".");
|
||||
|
@ -478,7 +478,7 @@ acpi_ns_find_ini_methods(acpi_handle obj_handle,
|
||||
|
||||
/* We are only looking for methods named _INI */
|
||||
|
||||
if (!ACPI_COMPARE_NAME(node->name.ascii, METHOD_NAME__INI)) {
|
||||
if (!ACPI_COMPARE_NAMESEG(node->name.ascii, METHOD_NAME__INI)) {
|
||||
return (AE_OK);
|
||||
}
|
||||
|
||||
@ -641,7 +641,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
|
||||
* Note: We know there is an _INI within this subtree, but it may not be
|
||||
* under this particular device, it may be lower in the branch.
|
||||
*/
|
||||
if (!ACPI_COMPARE_NAME(device_node->name.ascii, "_SB_") ||
|
||||
if (!ACPI_COMPARE_NAMESEG(device_node->name.ascii, "_SB_") ||
|
||||
device_node->parent != acpi_gbl_root_node) {
|
||||
ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
|
||||
(ACPI_TYPE_METHOD, device_node,
|
||||
|
@ -108,8 +108,8 @@ acpi_ns_handle_to_name(acpi_handle target_handle, struct acpi_buffer *buffer)
|
||||
/* Just copy the ACPI name from the Node and zero terminate it */
|
||||
|
||||
node_name = acpi_ut_get_node_name(node);
|
||||
ACPI_MOVE_NAME(buffer->pointer, node_name);
|
||||
((char *)buffer->pointer)[ACPI_NAME_SIZE] = 0;
|
||||
ACPI_COPY_NAMESEG(buffer->pointer, node_name);
|
||||
((char *)buffer->pointer)[ACPI_NAMESEG_SIZE] = 0;
|
||||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%4.4s\n", (char *)buffer->pointer));
|
||||
return_ACPI_STATUS(AE_OK);
|
||||
@ -198,7 +198,7 @@ acpi_ns_build_normalized_path(struct acpi_namespace_node *node,
|
||||
char *full_path, u32 path_size, u8 no_trailing)
|
||||
{
|
||||
u32 length = 0, i;
|
||||
char name[ACPI_NAME_SIZE];
|
||||
char name[ACPI_NAMESEG_SIZE];
|
||||
u8 do_no_trailing;
|
||||
char c, *left, *right;
|
||||
struct acpi_namespace_node *next_node;
|
||||
@ -446,7 +446,7 @@ static void acpi_ns_normalize_pathname(char *original_path)
|
||||
|
||||
/* Do one nameseg at a time */
|
||||
|
||||
for (i = 0; (i < ACPI_NAME_SIZE) && *input_path; i++) {
|
||||
for (i = 0; (i < ACPI_NAMESEG_SIZE) && *input_path; i++) {
|
||||
if ((i == 0) || (*input_path != '_')) { /* First char is allowed to be underscore */
|
||||
*new_path = *input_path;
|
||||
new_path++;
|
||||
|
@ -203,7 +203,7 @@ acpi_ns_one_complete_parse(u32 pass_number,
|
||||
|
||||
/* Found OSDT table, enable the namespace override feature */
|
||||
|
||||
if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_OSDT) &&
|
||||
if (ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_OSDT) &&
|
||||
pass_number == ACPI_IMODE_LOAD_PASS1) {
|
||||
walk_state->namespace_override = TRUE;
|
||||
}
|
||||
|
@ -316,7 +316,7 @@ static const struct acpi_simple_repair_info *acpi_ns_match_simple_repair(struct
|
||||
|
||||
this_name = acpi_object_repair_info;
|
||||
while (this_name->object_converter) {
|
||||
if (ACPI_COMPARE_NAME(node->name.ascii, this_name->name)) {
|
||||
if (ACPI_COMPARE_NAMESEG(node->name.ascii, this_name->name)) {
|
||||
|
||||
/* Check if we can actually repair this name/type combination */
|
||||
|
||||
|
@ -25,7 +25,7 @@ acpi_status (*acpi_repair_function) (struct acpi_evaluate_info * info,
|
||||
return_object_ptr);
|
||||
|
||||
typedef struct acpi_repair_info {
|
||||
char name[ACPI_NAME_SIZE];
|
||||
char name[ACPI_NAMESEG_SIZE];
|
||||
acpi_repair_function repair_function;
|
||||
|
||||
} acpi_repair_info;
|
||||
@ -188,7 +188,7 @@ static const struct acpi_repair_info *acpi_ns_match_complex_repair(struct
|
||||
|
||||
this_name = acpi_ns_repairable_names;
|
||||
while (this_name->repair_function) {
|
||||
if (ACPI_COMPARE_NAME(node->name.ascii, this_name->name)) {
|
||||
if (ACPI_COMPARE_NAMESEG(node->name.ascii, this_name->name)) {
|
||||
return (this_name);
|
||||
}
|
||||
|
||||
|
@ -178,7 +178,7 @@ void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info)
|
||||
}
|
||||
}
|
||||
|
||||
info->length = (ACPI_NAME_SIZE * info->num_segments) +
|
||||
info->length = (ACPI_NAMESEG_SIZE * info->num_segments) +
|
||||
4 + info->num_carats;
|
||||
|
||||
info->next_external_char = next_external_char;
|
||||
@ -249,7 +249,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
|
||||
/* Build the name (minus path separators) */
|
||||
|
||||
for (; num_segments; num_segments--) {
|
||||
for (i = 0; i < ACPI_NAME_SIZE; i++) {
|
||||
for (i = 0; i < ACPI_NAMESEG_SIZE; i++) {
|
||||
if (ACPI_IS_PATH_SEPARATOR(*external_name) ||
|
||||
(*external_name == 0)) {
|
||||
|
||||
@ -274,7 +274,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
|
||||
/* Move on the next segment */
|
||||
|
||||
external_name++;
|
||||
result += ACPI_NAME_SIZE;
|
||||
result += ACPI_NAMESEG_SIZE;
|
||||
}
|
||||
|
||||
/* Terminate the string */
|
||||
@ -489,12 +489,12 @@ acpi_ns_externalize_name(u32 internal_name_length,
|
||||
|
||||
/* Copy and validate the 4-char name segment */
|
||||
|
||||
ACPI_MOVE_NAME(&(*converted_name)[j],
|
||||
&internal_name[names_index]);
|
||||
ACPI_COPY_NAMESEG(&(*converted_name)[j],
|
||||
&internal_name[names_index]);
|
||||
acpi_ut_repair_name(&(*converted_name)[j]);
|
||||
|
||||
j += ACPI_NAME_SIZE;
|
||||
names_index += ACPI_NAME_SIZE;
|
||||
j += ACPI_NAMESEG_SIZE;
|
||||
names_index += ACPI_NAMESEG_SIZE;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -495,8 +495,8 @@ acpi_status acpi_install_method(u8 *buffer)
|
||||
|
||||
/* Table must be a DSDT or SSDT */
|
||||
|
||||
if (!ACPI_COMPARE_NAME(table->signature, ACPI_SIG_DSDT) &&
|
||||
!ACPI_COMPARE_NAME(table->signature, ACPI_SIG_SSDT)) {
|
||||
if (!ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_DSDT) &&
|
||||
!ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_SSDT)) {
|
||||
return (AE_BAD_HEADER);
|
||||
}
|
||||
|
||||
|
@ -150,21 +150,21 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
|
||||
|
||||
/* Two name segments */
|
||||
|
||||
end += 1 + (2 * ACPI_NAME_SIZE);
|
||||
end += 1 + (2 * ACPI_NAMESEG_SIZE);
|
||||
break;
|
||||
|
||||
case AML_MULTI_NAME_PREFIX:
|
||||
|
||||
/* Multiple name segments, 4 chars each, count in next byte */
|
||||
|
||||
end += 2 + (*(end + 1) * ACPI_NAME_SIZE);
|
||||
end += 2 + (*(end + 1) * ACPI_NAMESEG_SIZE);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
/* Single name segment */
|
||||
|
||||
end += ACPI_NAME_SIZE;
|
||||
end += ACPI_NAMESEG_SIZE;
|
||||
break;
|
||||
}
|
||||
|
||||
@ -522,7 +522,7 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
|
||||
|
||||
ACPI_MOVE_32_TO_32(&name, parser_state->aml);
|
||||
acpi_ps_set_name(field, name);
|
||||
parser_state->aml += ACPI_NAME_SIZE;
|
||||
parser_state->aml += ACPI_NAMESEG_SIZE;
|
||||
|
||||
ASL_CV_CAPTURE_COMMENTS_ONLY(parser_state);
|
||||
|
||||
|
@ -603,10 +603,10 @@ acpi_walk_resources(acpi_handle device_handle,
|
||||
/* Parameter validation */
|
||||
|
||||
if (!device_handle || !user_function || !name ||
|
||||
(!ACPI_COMPARE_NAME(name, METHOD_NAME__CRS) &&
|
||||
!ACPI_COMPARE_NAME(name, METHOD_NAME__PRS) &&
|
||||
!ACPI_COMPARE_NAME(name, METHOD_NAME__AEI) &&
|
||||
!ACPI_COMPARE_NAME(name, METHOD_NAME__DMA))) {
|
||||
(!ACPI_COMPARE_NAMESEG(name, METHOD_NAME__CRS) &&
|
||||
!ACPI_COMPARE_NAMESEG(name, METHOD_NAME__PRS) &&
|
||||
!ACPI_COMPARE_NAMESEG(name, METHOD_NAME__AEI) &&
|
||||
!ACPI_COMPARE_NAMESEG(name, METHOD_NAME__DMA))) {
|
||||
return_ACPI_STATUS(AE_BAD_PARAMETER);
|
||||
}
|
||||
|
||||
|
@ -480,7 +480,8 @@ acpi_tb_verify_temp_table(struct acpi_table_desc *table_desc,
|
||||
|
||||
/* If a particular signature is expected (DSDT/FACS), it must match */
|
||||
|
||||
if (signature && !ACPI_COMPARE_NAME(&table_desc->signature, signature)) {
|
||||
if (signature &&
|
||||
!ACPI_COMPARE_NAMESEG(&table_desc->signature, signature)) {
|
||||
ACPI_BIOS_ERROR((AE_INFO,
|
||||
"Invalid signature 0x%X for ACPI table, expected [%s]",
|
||||
table_desc->signature.integer, signature));
|
||||
|
@ -56,7 +56,7 @@ acpi_tb_find_table(char *signature,
|
||||
/* Normalize the input strings */
|
||||
|
||||
memset(&header, 0, sizeof(struct acpi_table_header));
|
||||
ACPI_MOVE_NAME(header.signature, signature);
|
||||
ACPI_COPY_NAMESEG(header.signature, signature);
|
||||
strncpy(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
|
||||
strncpy(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
|
||||
|
||||
@ -65,7 +65,7 @@ acpi_tb_find_table(char *signature,
|
||||
(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
|
||||
for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
|
||||
if (memcmp(&(acpi_gbl_root_table_list.tables[i].signature),
|
||||
header.signature, ACPI_NAME_SIZE)) {
|
||||
header.signature, ACPI_NAMESEG_SIZE)) {
|
||||
|
||||
/* Not the requested table */
|
||||
|
||||
@ -94,14 +94,14 @@ acpi_tb_find_table(char *signature,
|
||||
|
||||
if (!memcmp
|
||||
(acpi_gbl_root_table_list.tables[i].pointer->signature,
|
||||
header.signature, ACPI_NAME_SIZE) && (!oem_id[0]
|
||||
||
|
||||
!memcmp
|
||||
(acpi_gbl_root_table_list.
|
||||
tables[i].pointer->
|
||||
oem_id,
|
||||
header.oem_id,
|
||||
ACPI_OEM_ID_SIZE))
|
||||
header.signature, ACPI_NAMESEG_SIZE) && (!oem_id[0]
|
||||
||
|
||||
!memcmp
|
||||
(acpi_gbl_root_table_list.
|
||||
tables[i].
|
||||
pointer->oem_id,
|
||||
header.oem_id,
|
||||
ACPI_OEM_ID_SIZE))
|
||||
&& (!oem_table_id[0]
|
||||
|| !memcmp(acpi_gbl_root_table_list.tables[i].pointer->
|
||||
oem_table_id, header.oem_table_id,
|
||||
|
@ -120,7 +120,7 @@ acpi_tb_install_standard_table(acpi_physical_address address,
|
||||
*/
|
||||
if (!reload &&
|
||||
acpi_gbl_disable_ssdt_table_install &&
|
||||
ACPI_COMPARE_NAME(&new_table_desc.signature, ACPI_SIG_SSDT)) {
|
||||
ACPI_COMPARE_NAMESEG(&new_table_desc.signature, ACPI_SIG_SSDT)) {
|
||||
ACPI_INFO(("Ignoring installation of %4.4s at %8.8X%8.8X",
|
||||
new_table_desc.signature.ascii,
|
||||
ACPI_FORMAT_UINT64(address)));
|
||||
|
@ -69,10 +69,10 @@ acpi_tb_cleanup_table_header(struct acpi_table_header *out_header,
|
||||
|
||||
memcpy(out_header, header, sizeof(struct acpi_table_header));
|
||||
|
||||
acpi_tb_fix_string(out_header->signature, ACPI_NAME_SIZE);
|
||||
acpi_tb_fix_string(out_header->signature, ACPI_NAMESEG_SIZE);
|
||||
acpi_tb_fix_string(out_header->oem_id, ACPI_OEM_ID_SIZE);
|
||||
acpi_tb_fix_string(out_header->oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
|
||||
acpi_tb_fix_string(out_header->asl_compiler_id, ACPI_NAME_SIZE);
|
||||
acpi_tb_fix_string(out_header->asl_compiler_id, ACPI_NAMESEG_SIZE);
|
||||
}
|
||||
|
||||
/*******************************************************************************
|
||||
@ -94,7 +94,7 @@ acpi_tb_print_table_header(acpi_physical_address address,
|
||||
{
|
||||
struct acpi_table_header local_header;
|
||||
|
||||
if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_FACS)) {
|
||||
if (ACPI_COMPARE_NAMESEG(header->signature, ACPI_SIG_FACS)) {
|
||||
|
||||
/* FACS only has signature and length fields */
|
||||
|
||||
@ -158,8 +158,8 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
|
||||
* They are the odd tables, have no standard ACPI header and no checksum
|
||||
*/
|
||||
|
||||
if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_S3PT) ||
|
||||
ACPI_COMPARE_NAME(table->signature, ACPI_SIG_FACS)) {
|
||||
if (ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_S3PT) ||
|
||||
ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_FACS)) {
|
||||
return (AE_OK);
|
||||
}
|
||||
|
||||
|
@ -332,9 +332,9 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
|
||||
&table_index);
|
||||
|
||||
if (ACPI_SUCCESS(status) &&
|
||||
ACPI_COMPARE_NAME(&acpi_gbl_root_table_list.
|
||||
tables[table_index].signature,
|
||||
ACPI_SIG_FADT)) {
|
||||
ACPI_COMPARE_NAMESEG(&acpi_gbl_root_table_list.
|
||||
tables[table_index].signature,
|
||||
ACPI_SIG_FADT)) {
|
||||
acpi_gbl_fadt_index = table_index;
|
||||
acpi_tb_parse_fadt();
|
||||
}
|
||||
|
@ -230,7 +230,7 @@ acpi_get_table_header(char *signature,
|
||||
|
||||
for (i = 0, j = 0; i < acpi_gbl_root_table_list.current_table_count;
|
||||
i++) {
|
||||
if (!ACPI_COMPARE_NAME
|
||||
if (!ACPI_COMPARE_NAMESEG
|
||||
(&(acpi_gbl_root_table_list.tables[i].signature),
|
||||
signature)) {
|
||||
continue;
|
||||
@ -323,7 +323,7 @@ acpi_get_table(char *signature,
|
||||
i++) {
|
||||
table_desc = &acpi_gbl_root_table_list.tables[i];
|
||||
|
||||
if (!ACPI_COMPARE_NAME(&table_desc->signature, signature)) {
|
||||
if (!ACPI_COMPARE_NAMESEG(&table_desc->signature, signature)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -118,7 +118,7 @@ acpi_status acpi_tb_load_namespace(void)
|
||||
table = &acpi_gbl_root_table_list.tables[acpi_gbl_dsdt_index];
|
||||
|
||||
if (!acpi_gbl_root_table_list.current_table_count ||
|
||||
!ACPI_COMPARE_NAME(table->signature.ascii, ACPI_SIG_DSDT) ||
|
||||
!ACPI_COMPARE_NAMESEG(table->signature.ascii, ACPI_SIG_DSDT) ||
|
||||
ACPI_FAILURE(acpi_tb_validate_table(table))) {
|
||||
status = AE_NO_ACPI_TABLES;
|
||||
goto unlock_and_exit;
|
||||
@ -170,11 +170,12 @@ acpi_status acpi_tb_load_namespace(void)
|
||||
table = &acpi_gbl_root_table_list.tables[i];
|
||||
|
||||
if (!table->address ||
|
||||
(!ACPI_COMPARE_NAME(table->signature.ascii, ACPI_SIG_SSDT)
|
||||
&& !ACPI_COMPARE_NAME(table->signature.ascii,
|
||||
ACPI_SIG_PSDT)
|
||||
&& !ACPI_COMPARE_NAME(table->signature.ascii,
|
||||
ACPI_SIG_OSDT))
|
||||
(!ACPI_COMPARE_NAMESEG
|
||||
(table->signature.ascii, ACPI_SIG_SSDT)
|
||||
&& !ACPI_COMPARE_NAMESEG(table->signature.ascii,
|
||||
ACPI_SIG_PSDT)
|
||||
&& !ACPI_COMPARE_NAMESEG(table->signature.ascii,
|
||||
ACPI_SIG_OSDT))
|
||||
|| ACPI_FAILURE(acpi_tb_validate_table(table))) {
|
||||
continue;
|
||||
}
|
||||
@ -364,7 +365,7 @@ acpi_status acpi_unload_parent_table(acpi_handle object)
|
||||
* only these types can contain AML and thus are the only types
|
||||
* that can create namespace objects.
|
||||
*/
|
||||
if (ACPI_COMPARE_NAME
|
||||
if (ACPI_COMPARE_NAMESEG
|
||||
(acpi_gbl_root_table_list.tables[i].signature.ascii,
|
||||
ACPI_SIG_DSDT)) {
|
||||
status = AE_TYPE;
|
||||
|
@ -30,7 +30,7 @@ u8 acpi_ut_valid_nameseg(char *name)
|
||||
|
||||
/* Validate each character in the signature */
|
||||
|
||||
for (i = 0; i < ACPI_NAME_SIZE; i++) {
|
||||
for (i = 0; i < ACPI_NAMESEG_SIZE; i++) {
|
||||
if (!acpi_ut_valid_name_char(name[i], i)) {
|
||||
return (FALSE);
|
||||
}
|
||||
|
@ -78,7 +78,7 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
|
||||
"IPMI", /* 0x07 */
|
||||
"GeneralPurposeIo", /* 0x08 */
|
||||
"GenericSerialBus", /* 0x09 */
|
||||
"PCC" /* 0x0A */
|
||||
"PlatformCommChannel" /* 0x0A */
|
||||
};
|
||||
|
||||
const char *acpi_ut_get_region_name(u8 space_id)
|
||||
@ -239,7 +239,7 @@ const char *acpi_ut_get_node_name(void *object)
|
||||
{
|
||||
struct acpi_namespace_node *node = (struct acpi_namespace_node *)object;
|
||||
|
||||
/* Must return a string of exactly 4 characters == ACPI_NAME_SIZE */
|
||||
/* Must return a string of exactly 4 characters == ACPI_NAMESEG_SIZE */
|
||||
|
||||
if (!object) {
|
||||
return ("NULL");
|
||||
|
@ -59,10 +59,10 @@ u8 acpi_ut_is_aml_table(struct acpi_table_header *table)
|
||||
|
||||
/* These are the only tables that contain executable AML */
|
||||
|
||||
if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_DSDT) ||
|
||||
ACPI_COMPARE_NAME(table->signature, ACPI_SIG_PSDT) ||
|
||||
ACPI_COMPARE_NAME(table->signature, ACPI_SIG_SSDT) ||
|
||||
ACPI_COMPARE_NAME(table->signature, ACPI_SIG_OSDT) ||
|
||||
if (ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_DSDT) ||
|
||||
ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_PSDT) ||
|
||||
ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_SSDT) ||
|
||||
ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_OSDT) ||
|
||||
ACPI_IS_OEM_SIG(table->signature)) {
|
||||
return (TRUE);
|
||||
}
|
||||
|
@ -84,7 +84,7 @@ const union acpi_predefined_info *acpi_ut_match_predefined_method(char *name)
|
||||
|
||||
this_name = acpi_gbl_predefined_methods;
|
||||
while (this_name->info.name[0]) {
|
||||
if (ACPI_COMPARE_NAME(name, this_name->info.name)) {
|
||||
if (ACPI_COMPARE_NAMESEG(name, this_name->info.name)) {
|
||||
return (this_name);
|
||||
}
|
||||
|
||||
@ -201,7 +201,7 @@ const union acpi_predefined_info *acpi_ut_match_resource_name(char *name)
|
||||
|
||||
this_name = acpi_gbl_resource_names;
|
||||
while (this_name->info.name[0]) {
|
||||
if (ACPI_COMPARE_NAME(name, this_name->info.name)) {
|
||||
if (ACPI_COMPARE_NAMESEG(name, this_name->info.name)) {
|
||||
return (this_name);
|
||||
}
|
||||
|
||||
|
@ -141,15 +141,15 @@ void acpi_ut_repair_name(char *name)
|
||||
* Special case for the root node. This can happen if we get an
|
||||
* error during the execution of module-level code.
|
||||
*/
|
||||
if (ACPI_COMPARE_NAME(name, ACPI_ROOT_PATHNAME)) {
|
||||
if (ACPI_COMPARE_NAMESEG(name, ACPI_ROOT_PATHNAME)) {
|
||||
return;
|
||||
}
|
||||
|
||||
ACPI_MOVE_NAME(&original_name, name);
|
||||
ACPI_COPY_NAMESEG(&original_name, name);
|
||||
|
||||
/* Check each character in the name */
|
||||
|
||||
for (i = 0; i < ACPI_NAME_SIZE; i++) {
|
||||
for (i = 0; i < ACPI_NAMESEG_SIZE; i++) {
|
||||
if (acpi_ut_valid_name_char(name[i], i)) {
|
||||
continue;
|
||||
}
|
||||
|
@ -2260,7 +2260,7 @@ int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr)
|
||||
|
||||
mutex_lock(&acpi_probe_mutex);
|
||||
for (ape = ap_head; nr; ape++, nr--) {
|
||||
if (ACPI_COMPARE_NAME(ACPI_SIG_MADT, ape->id)) {
|
||||
if (ACPI_COMPARE_NAMESEG(ACPI_SIG_MADT, ape->id)) {
|
||||
acpi_probe_count = 0;
|
||||
acpi_table_parse_madt(ape->type, acpi_match_madt, 0);
|
||||
count += acpi_probe_count;
|
||||
|
@ -327,9 +327,9 @@ static struct kobject *hotplug_kobj;
|
||||
|
||||
struct acpi_table_attr {
|
||||
struct bin_attribute attr;
|
||||
char name[ACPI_NAME_SIZE];
|
||||
char name[ACPI_NAMESEG_SIZE];
|
||||
int instance;
|
||||
char filename[ACPI_NAME_SIZE+ACPI_INST_SIZE];
|
||||
char filename[ACPI_NAMESEG_SIZE+ACPI_INST_SIZE];
|
||||
struct list_head node;
|
||||
};
|
||||
|
||||
@ -368,10 +368,10 @@ static int acpi_table_attr_init(struct kobject *tables_obj,
|
||||
char instance_str[ACPI_INST_SIZE];
|
||||
|
||||
sysfs_attr_init(&table_attr->attr.attr);
|
||||
ACPI_MOVE_NAME(table_attr->name, table_header->signature);
|
||||
ACPI_COPY_NAMESEG(table_attr->name, table_header->signature);
|
||||
|
||||
list_for_each_entry(attr, &acpi_table_attr_list, node) {
|
||||
if (ACPI_COMPARE_NAME(table_attr->name, attr->name))
|
||||
if (ACPI_COMPARE_NAMESEG(table_attr->name, attr->name))
|
||||
if (table_attr->instance < attr->instance)
|
||||
table_attr->instance = attr->instance;
|
||||
}
|
||||
@ -382,8 +382,8 @@ static int acpi_table_attr_init(struct kobject *tables_obj,
|
||||
return -ERANGE;
|
||||
}
|
||||
|
||||
ACPI_MOVE_NAME(table_attr->filename, table_header->signature);
|
||||
table_attr->filename[ACPI_NAME_SIZE] = '\0';
|
||||
ACPI_COPY_NAMESEG(table_attr->filename, table_header->signature);
|
||||
table_attr->filename[ACPI_NAMESEG_SIZE] = '\0';
|
||||
if (table_attr->instance > 1 || (table_attr->instance == 1 &&
|
||||
!acpi_get_table
|
||||
(table_header->signature, 2, &header))) {
|
||||
@ -484,7 +484,7 @@ static int acpi_table_data_init(struct acpi_table_header *th)
|
||||
int i;
|
||||
|
||||
for (i = 0; i < NUM_ACPI_DATA_OBJS; i++) {
|
||||
if (ACPI_COMPARE_NAME(th->signature, acpi_data_objs[i].name)) {
|
||||
if (ACPI_COMPARE_NAMESEG(th->signature, acpi_data_objs[i].name)) {
|
||||
data_attr = kzalloc(sizeof(*data_attr), GFP_KERNEL);
|
||||
if (!data_attr)
|
||||
return -ENOMEM;
|
||||
|
@ -670,8 +670,8 @@ static void __init acpi_table_initrd_scan(void)
|
||||
table_length = table->length;
|
||||
|
||||
/* Skip RSDT/XSDT which should only be used for override */
|
||||
if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_RSDT) ||
|
||||
ACPI_COMPARE_NAME(table->signature, ACPI_SIG_XSDT)) {
|
||||
if (ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_RSDT) ||
|
||||
ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_XSDT)) {
|
||||
acpi_os_unmap_memory(table, ACPI_HEADER_SIZE);
|
||||
goto next_table;
|
||||
}
|
||||
|
Reference in New Issue
Block a user