lkml.org 
[lkml]   [2015]   [May]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 16/17] ACPICA: Tables: Change acpi_find_root_pointer() to use acpi_physical_address.
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Lv Zheng <lv.zheng@intel.com>

    commit f254e3c57b9d952e987502aefa0804c177dd2503 upstream.

    ACPICA commit 7d9fd64397d7c38899d3dc497525f6e6b044e0e3

    OSPMs like Linux expect an acpi_physical_address returning value from
    acpi_find_root_pointer(). This triggers warnings if sizeof (acpi_size) doesn't
    equal to sizeof (acpi_physical_address):
    drivers/acpi/osl.c:275:3: warning: passing argument 1 of 'acpi_find_root_pointer' from incompatible pointer type [enabled by default]
    In file included from include/acpi/acpi.h:64:0,
    from include/linux/acpi.h:36,
    from drivers/acpi/osl.c:41:
    include/acpi/acpixf.h:433:1: note: expected 'acpi_size *' but argument is of type 'acpi_physical_address *'
    This patch corrects acpi_find_root_pointer().

    Link: https://github.com/acpica/acpica/commit/7d9fd643
    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/acpi/acpica/tbxfroot.c | 7 ++++---
    include/acpi/acpixf.h | 2 +-
    2 files changed, 5 insertions(+), 4 deletions(-)

    --- a/drivers/acpi/acpica/tbxfroot.c
    +++ b/drivers/acpi/acpica/tbxfroot.c
    @@ -118,7 +118,7 @@ static acpi_status acpi_tb_validate_rsdp
    *
    ******************************************************************************/

    -acpi_status acpi_find_root_pointer(acpi_size *table_address)
    +acpi_status acpi_find_root_pointer(acpi_physical_address * table_address)
    {
    u8 *table_ptr;
    u8 *mem_rover;
    @@ -176,7 +176,8 @@ acpi_status acpi_find_root_pointer(acpi_
    physical_address +=
    (u32) ACPI_PTR_DIFF(mem_rover, table_ptr);

    - *table_address = physical_address;
    + *table_address =
    + (acpi_physical_address) physical_address;
    return_ACPI_STATUS(AE_OK);
    }
    }
    @@ -209,7 +210,7 @@ acpi_status acpi_find_root_pointer(acpi_
    (ACPI_HI_RSDP_WINDOW_BASE +
    ACPI_PTR_DIFF(mem_rover, table_ptr));

    - *table_address = physical_address;
    + *table_address = (acpi_physical_address) physical_address;
    return_ACPI_STATUS(AE_OK);
    }

    --- a/include/acpi/acpixf.h
    +++ b/include/acpi/acpixf.h
    @@ -177,7 +177,7 @@ acpi_status acpi_load_tables(void);
    */
    acpi_status acpi_reallocate_root_table(void);

    -acpi_status acpi_find_root_pointer(acpi_size *rsdp_address);
    +acpi_status acpi_find_root_pointer(acpi_physical_address *rsdp_address);

    acpi_status acpi_unload_table_id(acpi_owner_id id);




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