Patch "ACPICA: Utilities: Cleanup to convert physical address printing formats." has been added to the 3.10-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
ACPICA: Utilities: Cleanup to convert physical address printing formats.
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
acpica-utilities-cleanup-to-convert-physical-address-printing-formats.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
cc2080b0e5a7c6c33ef5e9ffccbc2b8f6f861393Mon Sep 17 00:00:00 2001
From: Lv Zheng <[email protected]>
Date: Mon, 13 Apr 2015 11:48:46 +0800
Subject: ACPICA: Utilities: Cleanup to convert physical address printing formats.
From: Lv Zheng <[email protected]>
commit cc2080b0e5a7c6c33ef5e9ffccbc2b8f6f861393 upstream.
ACPICA commit 7f06739db43a85083a70371c14141008f20b2198
For physical addresses, since the address may exceed 32-bit address range after calculation, we should use %8.8X%8.8X (see ACPI_FORMAT_UINT64()) to convert the %p formats.
This is a preparation to switch acpi_physical_address to 64-bit on 32-bit kernel builds.
[gdavis: Move tbinstall.c changes to tbutils.c due to lack of commit
"42f4786 ACPICA: Split table print utilities to a new a separate file" in linux-3.10.y]
--- drivers/acpi/acpica/exfldio.c | 10 ++++------ drivers/acpi/acpica/hwvalid.c | 16 ++++++++-------- drivers/acpi/acpica/nsdump.c | 7 +++---- drivers/acpi/acpica/tbutils.c | 4 ++-- drivers/acpi/acpica/utaddress.c | 24 +++++++++++------------- 5 files changed, 28 insertions(+), 33 deletions(-)
drivers/acpi/acpica/exfldio.c +4 -6
@@ -269,17 +269,15 @@ acpi_ex_access_region(union acpi_operand }ACPI_DEBUG_PRINT_RAW ((ACPI_DB_BFIELD , -" Region [%s:%X], Width %X, ByteBase %X, Offset %X at %p\n" , +" Region [%s:%X], Width %X, ByteBase %X, Offset %X at %8.8X%8.8X\n" ,acpi_ut_get_region_name (rgn_desc->region. space_id), rgn_desc->region.space_id, obj_desc->common_field.access_byte_width, obj_desc->common_field.base_byte_offset, - field_datum_byte_offset,ACPI_CAST_PTR (void, - (rgn_desc-> - region. - address + - region_offset)))); + field_datum_byte_offset, +ACPI_FORMAT_UINT64 (rgn_desc->region.address + + region_offset)));/* Invoke the appropriate address_space/op_region handler */
drivers/acpi/acpica/hwvalid.c +8 -8
@@ -142,17 +142,17 @@ acpi_hw_validate_io_request(acpi_io_addr byte_width =ACPI_DIV_8 (bit_width); last_address = address + byte_width -1 ; -ACPI_DEBUG_PRINT ((ACPI_DB_IO ,"Address %p LastAddress %p Length %X" , -ACPI_CAST_PTR (void, address),ACPI_CAST_PTR (void, - last_address), - byte_width)); +ACPI_DEBUG_PRINT ((ACPI_DB_IO , +"Address %8.8X%8.8X LastAddress %8.8X%8.8X Length %X" , +ACPI_FORMAT_UINT64 (address), +ACPI_FORMAT_UINT64 (last_address), byte_width));/* Maximum 16-bit address in I/O space */ if (last_address >ACPI_UINT16_MAX ) {ACPI_ERROR ((AE_INFO , -"Illegal I/O port address/length above 64K: %p/0x%X" , -ACPI_CAST_PTR (void, address), byte_width)); +"Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X" , +ACPI_FORMAT_UINT64 (address), byte_width));return_ACPI_STATUS (AE_LIMIT ); }
@@ -181,8 +181,8 @@ acpi_hw_validate_io_request(acpi_io_addrif (acpi_gbl_osi_data >= port_info->osi_dependency) {ACPI_DEBUG_PRINT ((ACPI_DB_IO , -"Denied AML access to port 0x%p/%X (%s 0x%.4X-0x%.4X)" , -ACPI_CAST_PTR (void, address), +"Denied AML access to port 0x%8.8X%8.8X/%X (%s 0x%.4X-0x%.4X)" , +ACPI_FORMAT_UINT64 (address), byte_width, port_info->name, port_info->start, port_info->end));
drivers/acpi/acpica/nsdump.c +3 -4
@@ -258,12 +258,11 @@ acpi_ns_dump_one_object(acpi_handle obj_switch (type) {case ACPI_TYPE_PROCESSOR : -acpi_os_printf ("ID %02X Len %02X Addr %p\n" , +acpi_os_printf ("ID %02X Len %02X Addr %8.8X%8.8X\n" , obj_desc->processor.proc_id, obj_desc->processor.length, -ACPI_CAST_PTR (void, - obj_desc->processor. - address)); +ACPI_FORMAT_UINT64 (obj_desc->processor. + address));break ;case ACPI_TYPE_DEVICE :
drivers/acpi/acpica/tbutils.c +2 -2
@@ -474,8 +474,8 @@ acpi_tb_install_table(acpi_physical_addr table =acpi_os_map_memory (address,sizeof (struct acpi_table_header ));if (!table) {ACPI_ERROR ((AE_INFO , -"Could not map memory for table [%s] at %p" , - signature,ACPI_CAST_PTR (void, address))); +"Could not map memory for table [%s] at %8.8X%8.8X" , + signature,ACPI_FORMAT_UINT64 (address)));return ; }
drivers/acpi/acpica/utaddress.c +11 -13
@@ -107,10 +107,10 @@ acpi_ut_add_address_range(acpi_adr_space acpi_gbl_address_range_list[space_id] = range_info;ACPI_DEBUG_PRINT ((ACPI_DB_NAMES , -"\nAdded [%4.4s] address range: 0x%p-0x%p\n" , +"\nAdded [%4.4s] address range: 0x%8.8X%8.8X-0x%8.8X%8.8X\n" ,acpi_ut_get_node_name (range_info->region_node), -ACPI_CAST_PTR (void, address), -ACPI_CAST_PTR (void, range_info->end_address))); +ACPI_FORMAT_UINT64 (address), +ACPI_FORMAT_UINT64 (range_info->end_address))); (void )acpi_ut_release_mutex (ACPI_MTX_NAMESPACE );return_ACPI_STATUS (AE_OK );
@@ -160,15 +160,13 @@ acpi_ut_remove_address_range(acpi_adr_sp }ACPI_DEBUG_PRINT ((ACPI_DB_NAMES , -"\nRemoved [%4.4s] address range: 0x%p-0x%p\n" , +"\nRemoved [%4.4s] address range: 0x%8.8X%8.8X-0x%8.8X%8.8X\n" ,acpi_ut_get_node_name (range_info-> region_node), -ACPI_CAST_PTR (void, - range_info-> - start_address), -ACPI_CAST_PTR (void, - range_info-> - end_address))); +ACPI_FORMAT_UINT64 (range_info-> + start_address), +ACPI_FORMAT_UINT64 (range_info-> + end_address)));ACPI_FREE (range_info); return_VOID;
@@ -244,9 +242,9 @@ acpi_ut_check_address_range(acpi_adr_spa region_node);ACPI_WARNING ((AE_INFO , -"0x%p-0x%p %s conflicts with Region %s %d" , -ACPI_CAST_PTR (void, address), -ACPI_CAST_PTR (void, end_address), +"0x%8.8X%8.8X-0x%8.8X%8.8X %s conflicts with Region %s %d" , +ACPI_FORMAT_UINT64 (address), +ACPI_FORMAT_UINT64 (end_address),acpi_ut_get_region_name (space_id), pathname, overlap_count));ACPI_FREE (pathname);
Patches currently in stable-queue which might be from [email protected] are
queue-3.10/acpica-utilities-cleanup-to-convert-physical-address-printing-formats.patch queue-3.10/acpica-utilities-cleanup-to-remove-useless-acpi_printf-format_xxx-helpers.patch