Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8092936d authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

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: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c2e56e54

drivers/acpi/acpica/hwtimer.c

+9 −1
Original line number Diff line number Diff line
@@ -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);

}