Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc2080b0 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Utilities: Cleanup to convert physical address printing formats. 

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.

Link: https://github.com/acpica/acpica/commit/7f06739d


Signed-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 6d3fd3cc

drivers/acpi/acpica/exfldio.c

+4 −6
Original line number Diff line number Diff line
@@ -263,17 +263,15 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc, 
	}



	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
Original line number Diff line number Diff line
@@ -142,17 +142,17 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) 
	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_address address, u32 bit_width) 


			if (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
Original line number Diff line number Diff line
@@ -271,11 +271,10 @@ acpi_ns_dump_one_object(acpi_handle obj_handle, 
		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.

				       ACPI_FORMAT_UINT64(obj_desc->processor.

							  address));

			break;

drivers/acpi/acpica/tbinstal.c

+9 −6
Original line number Diff line number Diff line
@@ -187,8 +187,9 @@ acpi_tb_install_fixed_table(acpi_physical_address address, 
	status = acpi_tb_acquire_temp_table(&new_table_desc, address,

					    ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL);

	if (ACPI_FAILURE(status)) {

		ACPI_ERROR((AE_INFO, "Could not acquire table length at %p",

			    ACPI_PHYSADDR_TO_PTR(address)));

		ACPI_ERROR((AE_INFO,

			    "Could not acquire table length at %8.8X%8.8X",

			    ACPI_FORMAT_UINT64(address)));

		return_ACPI_STATUS(status);

	}
@@ -246,8 +247,9 @@ acpi_tb_install_standard_table(acpi_physical_address address, 


	status = acpi_tb_acquire_temp_table(&new_table_desc, address, flags);

	if (ACPI_FAILURE(status)) {

		ACPI_ERROR((AE_INFO, "Could not acquire table length at %p",

			    ACPI_PHYSADDR_TO_PTR(address)));

		ACPI_ERROR((AE_INFO,

			    "Could not acquire table length at %8.8X%8.8X",

			    ACPI_FORMAT_UINT64(address)));

		return_ACPI_STATUS(status);

	}
@@ -258,9 +260,10 @@ 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_INFO((AE_INFO, "Ignoring installation of %4.4s at %p",

		ACPI_INFO((AE_INFO,

			   "Ignoring installation of %4.4s at %8.8X%8.8X",

			   new_table_desc.signature.ascii,

			   ACPI_PHYSADDR_TO_PTR(address)));

			   ACPI_FORMAT_UINT64(address)));

		goto release_and_exit;

	}

drivers/acpi/acpica/utaddress.c

+15 −19
Original line number Diff line number Diff line
@@ -107,10 +107,10 @@ acpi_ut_add_address_range(acpi_adr_space_type space_id, 
	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,14 +160,12 @@ acpi_ut_remove_address_range(acpi_adr_space_type space_id, 
			}



			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->

					  ACPI_FORMAT_UINT64(range_info->

							     start_address),

					  ACPI_CAST_PTR(void,

							range_info->

					  ACPI_FORMAT_UINT64(range_info->

							     end_address)));



			ACPI_FREE(range_info);
@@ -245,15 +243,13 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id, 
								  region_node);



				ACPI_WARNING((AE_INFO,

					      "%s range 0x%p-0x%p conflicts with OpRegion 0x%p-0x%p (%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)",

					      acpi_ut_get_region_name(space_id),

					      ACPI_CAST_PTR(void, address),

					      ACPI_CAST_PTR(void, end_address),

					      ACPI_CAST_PTR(void,

							    range_info->

					      ACPI_FORMAT_UINT64(address),

					      ACPI_FORMAT_UINT64(end_address),

					      ACPI_FORMAT_UINT64(range_info->

								 start_address),

					      ACPI_CAST_PTR(void,

							    range_info->

					      ACPI_FORMAT_UINT64(range_info->

								 end_address),

					      pathname));

				ACPI_FREE(pathname);