[ACPI] ACPICA 20060113
Added 2006 copyright. At SuSE's suggestion, enabled all error messages without enabling function tracing, ie with CONFIG_ACPI_DEBUG=n Replaced all instances of the ACPI_DEBUG_PRINT macro invoked at the ACPI_DB_ERROR and ACPI_DB_WARN debug levels with the ACPI_REPORT_ERROR and ACPI_REPORT_WARNING macros, respectively. This preserves all error and warning messages in the non-debug version of the ACPICA code (this has been referred to as the "debug lite" option.) Over 200 cases were converted to create a total of over 380 error/warning messages across the ACPICA code. This increases the code and data size of the default non-debug version by about 13K. Added ACPI_NO_ERROR_MESSAGES flag to enable deleting all messages. The size of the debug version remains about the same. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
*****************************************************************************/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2000 - 2005, R. Byron Moore
|
||||
* Copyright (C) 2000 - 2006, R. Byron Moore
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
@@ -5,7 +5,7 @@
|
||||
*****************************************************************************/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2000 - 2005, R. Byron Moore
|
||||
* Copyright (C) 2000 - 2006, R. Byron Moore
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -362,8 +362,8 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
|
||||
|
||||
default:
|
||||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid address flags %X\n",
|
||||
address->pointer_type));
|
||||
ACPI_REPORT_ERROR(("Invalid address flags %X\n",
|
||||
address->pointer_type));
|
||||
return_ACPI_STATUS(AE_BAD_PARAMETER);
|
||||
}
|
||||
|
||||
|
@@ -5,7 +5,7 @@
|
||||
*****************************************************************************/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2000 - 2005, R. Byron Moore
|
||||
* Copyright (C) 2000 - 2006, R. Byron Moore
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
@@ -5,7 +5,7 @@
|
||||
*****************************************************************************/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2000 - 2005, R. Byron Moore
|
||||
* Copyright (C) 2000 - 2006, R. Byron Moore
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
@@ -5,7 +5,7 @@
|
||||
*****************************************************************************/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2000 - 2005, R. Byron Moore
|
||||
* Copyright (C) 2000 - 2006, R. Byron Moore
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -176,7 +176,7 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
|
||||
{
|
||||
int no_match;
|
||||
|
||||
ACPI_FUNCTION_NAME("tb_validate_rsdt");
|
||||
ACPI_FUNCTION_ENTRY();
|
||||
|
||||
/*
|
||||
* Search for appropriate signature, RSDT or XSDT
|
||||
@@ -192,15 +192,11 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
|
||||
if (no_match) {
|
||||
/* Invalid RSDT or XSDT signature */
|
||||
|
||||
ACPI_REPORT_ERROR(("Invalid signature where RSDP indicates RSDT/XSDT should be located\n"));
|
||||
ACPI_REPORT_ERROR(("Invalid signature where RSDP indicates RSDT/XSDT should be located. RSDP:\n"));
|
||||
|
||||
ACPI_DUMP_BUFFER(acpi_gbl_RSDP, 20);
|
||||
|
||||
ACPI_DEBUG_PRINT_RAW((ACPI_DB_ERROR,
|
||||
"RSDT/XSDT signature at %X (%p) is invalid\n",
|
||||
acpi_gbl_RSDP->rsdt_physical_address,
|
||||
(void *)(acpi_native_uint) acpi_gbl_RSDP->
|
||||
rsdt_physical_address));
|
||||
ACPI_REPORT_ERROR(("RSDT/XSDT signature at %X (%p) is invalid\n", acpi_gbl_RSDP->rsdt_physical_address, (void *)(acpi_native_uint) acpi_gbl_RSDP->rsdt_physical_address));
|
||||
|
||||
if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
|
||||
ACPI_REPORT_ERROR(("Looking for RSDT\n"))
|
||||
@@ -209,7 +205,6 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
|
||||
}
|
||||
|
||||
ACPI_DUMP_BUFFER((char *)table_ptr, 48);
|
||||
|
||||
return (AE_BAD_SIGNATURE);
|
||||
}
|
||||
|
||||
@@ -243,9 +238,8 @@ acpi_status acpi_tb_get_table_rsdt(void)
|
||||
table_info.type = ACPI_TABLE_XSDT;
|
||||
status = acpi_tb_get_table(&address, &table_info);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"Could not get the RSDT/XSDT, %s\n",
|
||||
acpi_format_exception(status)));
|
||||
ACPI_REPORT_ERROR(("Could not get the RSDT/XSDT, %s\n",
|
||||
acpi_format_exception(status)));
|
||||
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
|
@@ -5,7 +5,7 @@
|
||||
*****************************************************************************/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2000 - 2005, R. Byron Moore
|
||||
* Copyright (C) 2000 - 2006, R. Byron Moore
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -144,14 +144,13 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
|
||||
{
|
||||
acpi_name signature;
|
||||
|
||||
ACPI_FUNCTION_NAME("tb_validate_table_header");
|
||||
ACPI_FUNCTION_ENTRY();
|
||||
|
||||
/* Verify that this is a valid address */
|
||||
|
||||
if (!acpi_os_readable(table_header, sizeof(struct acpi_table_header))) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"Cannot read table header at %p\n",
|
||||
table_header));
|
||||
ACPI_REPORT_ERROR(("Cannot read table header at %p\n",
|
||||
table_header));
|
||||
|
||||
return (AE_BAD_ADDRESS);
|
||||
}
|
||||
@@ -160,12 +159,10 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
|
||||
|
||||
ACPI_MOVE_32_TO_32(&signature, table_header->signature);
|
||||
if (!acpi_ut_valid_acpi_name(signature)) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"Table signature at %p [%p] has invalid characters\n",
|
||||
table_header, &signature));
|
||||
ACPI_REPORT_ERROR(("Table signature at %p [%p] has invalid characters\n", table_header, &signature));
|
||||
|
||||
ACPI_REPORT_WARNING(("Invalid table signature found: [%4.4s]\n",
|
||||
(char *)&signature));
|
||||
ACPI_CAST_PTR(char, &signature)));
|
||||
|
||||
ACPI_DUMP_BUFFER(table_header,
|
||||
sizeof(struct acpi_table_header));
|
||||
@@ -175,9 +172,7 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
|
||||
/* Validate the table length */
|
||||
|
||||
if (table_header->length < sizeof(struct acpi_table_header)) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"Invalid length in table header %p name %4.4s\n",
|
||||
table_header, (char *)&signature));
|
||||
ACPI_REPORT_ERROR(("Invalid length in table header %p name %4.4s\n", table_header, (char *)&signature));
|
||||
|
||||
ACPI_REPORT_WARNING(("Invalid table header length (0x%X) found\n", (u32) table_header->length));
|
||||
|
||||
@@ -291,8 +286,7 @@ acpi_tb_handle_to_object(u16 table_id,
|
||||
}
|
||||
}
|
||||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "table_id=%X does not exist\n",
|
||||
table_id));
|
||||
ACPI_REPORT_ERROR(("table_id=%X does not exist\n", table_id));
|
||||
return (AE_BAD_PARAMETER);
|
||||
}
|
||||
#endif
|
||||
|
@@ -6,7 +6,7 @@
|
||||
*****************************************************************************/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2000 - 2005, R. Byron Moore
|
||||
* Copyright (C) 2000 - 2006, R. Byron Moore
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -75,7 +75,7 @@ acpi_status acpi_load_tables(void)
|
||||
status = acpi_os_get_root_pointer(ACPI_LOGICAL_ADDRESSING,
|
||||
&rsdp_address);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_REPORT_ERROR(("acpi_load_tables: Could not get RSDP, %s\n",
|
||||
ACPI_REPORT_ERROR(("Could not get RSDP, %s\n",
|
||||
acpi_format_exception(status)));
|
||||
goto error_exit;
|
||||
}
|
||||
@@ -86,7 +86,8 @@ acpi_status acpi_load_tables(void)
|
||||
|
||||
status = acpi_tb_verify_rsdp(&rsdp_address);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_REPORT_ERROR(("acpi_load_tables: RSDP Failed validation: %s\n", acpi_format_exception(status)));
|
||||
ACPI_REPORT_ERROR(("RSDP Failed validation: %s\n",
|
||||
acpi_format_exception(status)));
|
||||
goto error_exit;
|
||||
}
|
||||
|
||||
@@ -94,7 +95,8 @@ acpi_status acpi_load_tables(void)
|
||||
|
||||
status = acpi_tb_get_table_rsdt();
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_REPORT_ERROR(("acpi_load_tables: Could not load RSDT: %s\n", acpi_format_exception(status)));
|
||||
ACPI_REPORT_ERROR(("Could not load RSDT: %s\n",
|
||||
acpi_format_exception(status)));
|
||||
goto error_exit;
|
||||
}
|
||||
|
||||
@@ -102,7 +104,7 @@ acpi_status acpi_load_tables(void)
|
||||
|
||||
status = acpi_tb_get_required_tables();
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_REPORT_ERROR(("acpi_load_tables: Error getting required tables (DSDT/FADT/FACS): %s\n", acpi_format_exception(status)));
|
||||
ACPI_REPORT_ERROR(("Could not get all required tables (DSDT/FADT/FACS): %s\n", acpi_format_exception(status)));
|
||||
goto error_exit;
|
||||
}
|
||||
|
||||
@@ -112,14 +114,15 @@ acpi_status acpi_load_tables(void)
|
||||
|
||||
status = acpi_ns_load_namespace();
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_REPORT_ERROR(("acpi_load_tables: Could not load namespace: %s\n", acpi_format_exception(status)));
|
||||
ACPI_REPORT_ERROR(("Could not load namespace: %s\n",
|
||||
acpi_format_exception(status)));
|
||||
goto error_exit;
|
||||
}
|
||||
|
||||
return_ACPI_STATUS(AE_OK);
|
||||
|
||||
error_exit:
|
||||
ACPI_REPORT_ERROR(("acpi_load_tables: Could not load tables: %s\n",
|
||||
ACPI_REPORT_ERROR(("Could not load tables: %s\n",
|
||||
acpi_format_exception(status)));
|
||||
|
||||
return_ACPI_STATUS(status);
|
||||
|
@@ -5,7 +5,7 @@
|
||||
*****************************************************************************/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2000 - 2005, R. Byron Moore
|
||||
* Copyright (C) 2000 - 2006, R. Byron Moore
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -396,9 +396,8 @@ acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address)
|
||||
|
||||
status = acpi_tb_find_rsdp(&table_info, flags);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"RSDP structure not found, %s Flags=%X\n",
|
||||
acpi_format_exception(status), flags));
|
||||
ACPI_REPORT_ERROR(("RSDP structure not found, %s Flags=%X\n",
|
||||
acpi_format_exception(status), flags));
|
||||
|
||||
return_ACPI_STATUS(AE_NO_ACPI_TABLES);
|
||||
}
|
||||
@@ -503,10 +502,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
|
||||
ACPI_EBDA_PTR_LENGTH,
|
||||
(void *)&table_ptr);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"Could not map memory at %8.8X for length %X\n",
|
||||
ACPI_EBDA_PTR_LOCATION,
|
||||
ACPI_EBDA_PTR_LENGTH));
|
||||
ACPI_REPORT_ERROR(("Could not map memory at %8.8X for length %X\n", ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH));
|
||||
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
@@ -530,10 +526,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
|
||||
ACPI_EBDA_WINDOW_SIZE,
|
||||
(void *)&table_ptr);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"Could not map memory at %8.8X for length %X\n",
|
||||
physical_address,
|
||||
ACPI_EBDA_WINDOW_SIZE));
|
||||
ACPI_REPORT_ERROR(("Could not map memory at %8.8X for length %X\n", physical_address, ACPI_EBDA_WINDOW_SIZE));
|
||||
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
@@ -563,10 +556,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
|
||||
(void *)&table_ptr);
|
||||
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"Could not map memory at %8.8X for length %X\n",
|
||||
ACPI_HI_RSDP_WINDOW_BASE,
|
||||
ACPI_HI_RSDP_WINDOW_SIZE));
|
||||
ACPI_REPORT_ERROR(("Could not map memory at %8.8X for length %X\n", ACPI_HI_RSDP_WINDOW_BASE, ACPI_HI_RSDP_WINDOW_SIZE));
|
||||
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
|
Reference in New Issue
Block a user