| From f254e3c57b9d952e987502aefa0804c177dd2503 Mon Sep 17 00:00:00 2001 |
| From: Lv Zheng <lv.zheng@intel.com> |
| Date: Mon, 13 Apr 2015 11:48:18 +0800 |
| Subject: ACPICA: Tables: Change acpi_find_root_pointer() to use acpi_physical_address. |
| |
| 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 | 12 ++++++------ |
| 2 files changed, 10 insertions(+), 9 deletions(-) |
| |
| --- a/drivers/acpi/acpica/tbxfroot.c |
| +++ b/drivers/acpi/acpica/tbxfroot.c |
| @@ -142,7 +142,7 @@ acpi_status acpi_tb_validate_rsdp(struct |
| * |
| ******************************************************************************/ |
| |
| -acpi_status __init acpi_find_root_pointer(acpi_size *table_address) |
| +acpi_status __init acpi_find_root_pointer(acpi_physical_address * table_address) |
| { |
| u8 *table_ptr; |
| u8 *mem_rover; |
| @@ -200,7 +200,8 @@ acpi_status __init acpi_find_root_pointe |
| 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); |
| } |
| } |
| @@ -233,7 +234,7 @@ acpi_status __init acpi_find_root_pointe |
| (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 |
| @@ -431,13 +431,13 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status |
| ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_reallocate_root_table(void)) |
| |
| ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init |
| - acpi_find_root_pointer(acpi_size * rsdp_address)) |
| - |
| + acpi_find_root_pointer(acpi_physical_address * |
| + rsdp_address)) |
| ACPI_EXTERNAL_RETURN_STATUS(acpi_status |
| - acpi_get_table_header(acpi_string signature, |
| - u32 instance, |
| - struct acpi_table_header |
| - *out_table_header)) |
| + acpi_get_table_header(acpi_string signature, |
| + u32 instance, |
| + struct acpi_table_header |
| + *out_table_header)) |
| ACPI_EXTERNAL_RETURN_STATUS(acpi_status |
| acpi_get_table(acpi_string signature, u32 instance, |
| struct acpi_table_header |
