lkml.org 
[lkml]   [2015]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 142/142] ACPICA: Utilities: Cleanup to remove useless ACPI_PRINTF/FORMAT_xxx helpers.
    Date
    From: Lv Zheng <lv.zheng@intel.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 1d0a0b2f6df2bf2643fadc990eb143361eca6ada upstream.

    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: Lv Zheng <lv.zheng@intel.com>
    Signed-off-by: Bob Moore <robert.moore@intel.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
    Signed-off-by: George G. Davis <george_davis@mentor.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/acpi/acpica/acmacros.h | 10 +++-------
    drivers/acpi/acpica/dsopcode.c | 4 ++--
    drivers/acpi/acpica/evregion.c | 2 +-
    drivers/acpi/acpica/exdump.c | 4 ++--
    drivers/acpi/acpica/exregion.c | 8 +++-----
    drivers/acpi/acpica/nsdump.c | 5 +++--
    drivers/acpi/acpica/tbprint.c | 17 +++++++----------
    7 files changed, 21 insertions(+), 29 deletions(-)

    diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
    index 530a2f8c1252..0a9ee9bbe7ea 100644
    --- a/drivers/acpi/acpica/acmacros.h
    +++ b/drivers/acpi/acpica/acmacros.h
    @@ -63,19 +63,15 @@
    #define ACPI_SET64(ptr, val) (*ACPI_CAST64 (ptr) = (u64) (val))

    /*
    - * printf() format helpers
    + * 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.
    */

    /* Split 64-bit integer into two 32-bit values. Use with %8.8X%8.8X */

    #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)
    -#else
    -#define ACPI_FORMAT_NATIVE_UINT(i) 0, (i)
    -#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.
    diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
    index 541b851a8727..fedb65d774ae 100644
    --- a/drivers/acpi/acpica/dsopcode.c
    +++ b/drivers/acpi/acpica/dsopcode.c
    @@ -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 */
    diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
    index 1788b3870713..63ef6d43f046 100644
    --- a/drivers/acpi/acpica/evregion.c
    +++ b/drivers/acpi/acpica/evregion.c
    @@ -277,7 +277,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)));

    diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c
    index 4d046faac48c..b64fb68aa5d3 100644
    --- a/drivers/acpi/acpica/exdump.c
    +++ b/drivers/acpi/acpica/exdump.c
    @@ -622,8 +622,8 @@ 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.
    - address),
    + ACPI_FORMAT_UINT64(obj_desc->region.
    + address),
    obj_desc->region.length);
    }
    break;
    diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
    index 303429bb4d5d..c678c3714d01 100644
    --- a/drivers/acpi/acpica/exregion.c
    +++ b/drivers/acpi/acpica/exregion.c
    @@ -181,7 +181,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);
    @@ -202,8 +202,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
    @@ -318,8 +317,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 */

    diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
    index 675e1f17e86f..7f449f0eabfe 100644
    --- a/drivers/acpi/acpica/nsdump.c
    +++ b/drivers/acpi/acpica/nsdump.c
    @@ -335,8 +335,9 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
    space_id));
    if (obj_desc->region.flags & AOPOBJ_DATA_VALID) {
    acpi_os_printf(" Addr %8.8X%8.8X Len %.4X\n",
    - ACPI_FORMAT_NATIVE_UINT
    - (obj_desc->region.address),
    + ACPI_FORMAT_UINT64(obj_desc->
    + region.
    + address),
    obj_desc->region.length);
    } else {
    acpi_os_printf
    diff --git a/drivers/acpi/acpica/tbprint.c b/drivers/acpi/acpica/tbprint.c
    index dc963f823d2c..0c529f23e48a 100644
    --- a/drivers/acpi/acpica/tbprint.c
    +++ b/drivers/acpi/acpica/tbprint.c
    @@ -127,16 +127,12 @@ acpi_tb_print_table_header(acpi_physical_address address,
    {
    struct acpi_table_header local_header;

    - /*
    - * The reason that the Address is cast to a void pointer is so that we
    - * can use %p which will work properly on both 32-bit and 64-bit hosts.
    - */
    if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_FACS)) {

    /* FACS only has signature and length fields */

    - ACPI_INFO((AE_INFO, "%4.4s %p %05X",
    - header->signature, ACPI_CAST_PTR(void, address),
    + ACPI_INFO((AE_INFO, "%-4.4s 0x%8.8X%8.8X %05X",
    + header->signature, ACPI_FORMAT_UINT64(address),
    header->length));
    } else if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_RSDP)) {

    @@ -147,8 +143,8 @@ acpi_tb_print_table_header(acpi_physical_address address,
    header)->oem_id, ACPI_OEM_ID_SIZE);
    acpi_tb_fix_string(local_header.oem_id, ACPI_OEM_ID_SIZE);

    - ACPI_INFO((AE_INFO, "RSDP %p %05X (v%.2d %6.6s)",
    - ACPI_CAST_PTR(void, address),
    + ACPI_INFO((AE_INFO, "RSDP 0x%8.8X%8.8X %05X (v%.2d %-6.6s)",
    + ACPI_FORMAT_UINT64(address),
    (ACPI_CAST_PTR(struct acpi_table_rsdp, header)->
    revision >
    0) ? ACPI_CAST_PTR(struct acpi_table_rsdp,
    @@ -162,8 +158,9 @@ acpi_tb_print_table_header(acpi_physical_address address,
    acpi_tb_cleanup_table_header(&local_header, header);

    ACPI_INFO((AE_INFO,
    - "%4.4s %p %05X (v%.2d %6.6s %8.8s %08X %4.4s %08X)",
    - local_header.signature, ACPI_CAST_PTR(void, address),
    + "%-4.4s 0x%8.8X%8.8X"
    + " %05X (v%.2d %-6.6s %-8.8s %08X %-4.4s %08X)",
    + local_header.signature, ACPI_FORMAT_UINT64(address),
    local_header.length, local_header.revision,
    local_header.oem_id, local_header.oem_table_id,
    local_header.oem_revision,
    --
    2.3.7


    \
     
     \ /
      Last update: 2015-05-16 11:21    [W:4.142 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site