Commit 62248889 authored by Lv Zheng's avatar Lv Zheng Committed by Jiri Slaby

ACPICA: Tables: Change acpi_find_root_pointer() to use acpi_physical_address.

commit f254e3c5 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/7d9fd643Signed-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>
Signed-off-by: default avatarDirk Behme <dirk.behme@gmail.com>
Signed-off-by: default avatarGeorge G. Davis <george_davis@mentor.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent fae12cf4
...@@ -112,7 +112,7 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp) ...@@ -112,7 +112,7 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *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 *table_ptr;
u8 *mem_rover; u8 *mem_rover;
...@@ -170,7 +170,8 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address) ...@@ -170,7 +170,8 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address)
physical_address += physical_address +=
(u32) ACPI_PTR_DIFF(mem_rover, table_ptr); (u32) ACPI_PTR_DIFF(mem_rover, table_ptr);
*table_address = physical_address; *table_address =
(acpi_physical_address) physical_address;
return_ACPI_STATUS(AE_OK); return_ACPI_STATUS(AE_OK);
} }
} }
...@@ -203,7 +204,7 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address) ...@@ -203,7 +204,7 @@ acpi_status acpi_find_root_pointer(acpi_size *table_address)
(ACPI_HI_RSDP_WINDOW_BASE + (ACPI_HI_RSDP_WINDOW_BASE +
ACPI_PTR_DIFF(mem_rover, table_ptr)); ACPI_PTR_DIFF(mem_rover, table_ptr));
*table_address = physical_address; *table_address = (acpi_physical_address) physical_address;
return_ACPI_STATUS(AE_OK); return_ACPI_STATUS(AE_OK);
} }
......
...@@ -181,7 +181,7 @@ acpi_status acpi_load_tables(void); ...@@ -181,7 +181,7 @@ acpi_status acpi_load_tables(void);
*/ */
acpi_status acpi_reallocate_root_table(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); acpi_status acpi_unload_table_id(acpi_owner_id id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment