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

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

ACPICA: Utilities: Cleanup to remove useless ACPI_PRINTF/FORMAT_xxx helpers. 

ACPICA commit b60612373a4ef63b64a57c124576d7ddb6d8efb6

For physical addresses, since the address may exceed 32-bit address range
after calculation, we should use 0x%8.8X%8.8X instead of ACPI_PRINTF_UINT
and ACPI_FORMAT_UINT64() instead of
ACPI_FORMAT_NATIVE_UINT()/ACPI_FORMAT_TO_UINT().

This patch also removes above replaced macros as there are no users.

This is a preparation to switch acpi_physical_address to 64-bit on 32-bit
kernel builds.

Link: https://github.com/acpica/acpica/commit/b6061237


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 cc2080b0

drivers/acpi/acpica/acmacros.h

+1 −12
Original line number Diff line number Diff line
@@ -63,23 +63,12 @@ 
#define ACPI_SET64(ptr, val)            (*ACPI_CAST64 (ptr) = (u64) (val))



/*

 * printf() format helpers. These macros are workarounds for the difficulties

 * printf() format helper. This macros is a workaround for the difficulties

 * with emitting 64-bit integers and 64-bit pointers with the same code

 * for both 32-bit and 64-bit hosts.

 */

#define ACPI_FORMAT_UINT64(i)           ACPI_HIDWORD(i), ACPI_LODWORD(i)



#if ACPI_MACHINE_WIDTH == 64

#define ACPI_FORMAT_NATIVE_UINT(i)      ACPI_FORMAT_UINT64(i)

#define ACPI_FORMAT_TO_UINT(i)          ACPI_FORMAT_UINT64(i)

#define ACPI_PRINTF_UINT                 "0x%8.8X%8.8X"



#else

#define ACPI_FORMAT_NATIVE_UINT(i)      0, (u32) (i)

#define ACPI_FORMAT_TO_UINT(i)          (u32) (i)

#define ACPI_PRINTF_UINT                 "0x%8.8X"

#endif



/*

 * Macros for moving data around to/from buffers that are possibly unaligned.

 * If the hardware supports the transfer of unaligned data, just do the store.

drivers/acpi/acpica/dsopcode.c

+2 −2
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state, 


	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "RgnObj %p Addr %8.8X%8.8X Len %X\n",

			  obj_desc,

			  ACPI_FORMAT_NATIVE_UINT(obj_desc->region.address),

			  ACPI_FORMAT_UINT64(obj_desc->region.address),

			  obj_desc->region.length));



	/* Now the address and length are valid for this opregion */
@@ -544,7 +544,7 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state, 


	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "RgnObj %p Addr %8.8X%8.8X Len %X\n",

			  obj_desc,

			  ACPI_FORMAT_NATIVE_UINT(obj_desc->region.address),

			  ACPI_FORMAT_UINT64(obj_desc->region.address),

			  obj_desc->region.length));



	/* Now the address and length are valid for this opregion */

drivers/acpi/acpica/evregion.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, 
	ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,

			  "Handler %p (@%p) Address %8.8X%8.8X [%s]\n",

			  &region_obj->region.handler->address_space, handler,

			  ACPI_FORMAT_NATIVE_UINT(address),

			  ACPI_FORMAT_UINT64(address),

			  acpi_ut_get_region_name(region_obj->region.

						  space_id)));

drivers/acpi/acpica/exdump.c

+2 −2
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth) 
			acpi_os_printf("\n");

		} else {

			acpi_os_printf(" base %8.8X%8.8X Length %X\n",

				       ACPI_FORMAT_NATIVE_UINT(obj_desc->region.

				       ACPI_FORMAT_UINT64(obj_desc->region.

							  address),

				       obj_desc->region.length);

		}

drivers/acpi/acpica/exregion.c

+3 −5
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ acpi_ex_system_memory_space_handler(u32 function, 
		if (!mem_info->mapped_logical_address) {

			ACPI_ERROR((AE_INFO,

				    "Could not map memory at 0x%8.8X%8.8X, size %u",

				    ACPI_FORMAT_NATIVE_UINT(address),

				    ACPI_FORMAT_UINT64(address),

				    (u32)map_length));

			mem_info->mapped_length = 0;

			return_ACPI_STATUS(AE_NO_MEMORY);
@@ -203,8 +203,7 @@ acpi_ex_system_memory_space_handler(u32 function, 


	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

			  "System-Memory (width %u) R/W %u Address=%8.8X%8.8X\n",

			  bit_width, function,

			  ACPI_FORMAT_NATIVE_UINT(address)));

			  bit_width, function, ACPI_FORMAT_UINT64(address)));



	/*

	 * Perform the memory read or write
@@ -319,8 +318,7 @@ acpi_ex_system_io_space_handler(u32 function, 


	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

			  "System-IO (width %u) R/W %u Address=%8.8X%8.8X\n",

			  bit_width, function,

			  ACPI_FORMAT_NATIVE_UINT(address)));

			  bit_width, function, ACPI_FORMAT_UINT64(address)));



	/* Decode the function parameter */