ACPICA: Update acpi_get_timer for 64-bit interface to acpi_hw_read

ACPICA commit 1cdcf16447c15694faa564c0cd8e357b910344a0

Return value from acpi_hw_read is now 64 bits, but the ACPI PM
Timer is defined by the ACPI spec to be 32 bits.

Link: https://github.com/acpica/acpica/commit/1cdcf16447c1
Signed-off-by: Bob Moore <[email protected]>
Signed-off-by: Lv Zheng <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>

diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index b3c5d8c754bb864a0ddf18ac4759bbb301a1e93f..a2f4e25d45b18e5c241a02890d3302256b68c0d0 100644 (file)
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -94,6 +94,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_timer_resolution)
 acpi_status acpi_get_timer(u32 * ticks)
 {
        acpi_status status;
+       u64 timer_value;
 
        ACPI_FUNCTION_TRACE(acpi_get_timer);
 
@@ -107,7 +108,14 @@ acpi_status acpi_get_timer(u32 * ticks)
                return_ACPI_STATUS(AE_SUPPORT);
        }
 
-       status = acpi_hw_read(ticks, &acpi_gbl_FADT.xpm_timer_block);
+       status = acpi_hw_read(&timer_value, &acpi_gbl_FADT.xpm_timer_block);
+       if (ACPI_SUCCESS(status)) {
+
+               /* ACPI PM Timer is defined to be 32 bits (PM_TMR_LEN) */
+
+               *ticks = (u32)timer_value;
+       }
+
        return_ACPI_STATUS(status);
 }