clocksource: arm_arch_timer: add structs to describe MMIO timer

BugLink: http://bugs.launchpad.net/bugs/1688114
In preparation for ACPI GTDT support, this patch adds structs to
describe the MMIO timers indepedent of the firmware interface.

Subsequent patches will use these to split the FW/HW probing logic, so
that the HW probing logic can be shared by ACPI and DT.

Signed-off-by: Fu Wei <fu.wei@linaro.org>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
(cherry picked from commit b3251b8fd12337bf04bce46d4af35988742eef95)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h
index 4a98c060d80a89a6a9497617795de3b15b9205c4..cc805b72994acd1442a50a4ec6e7d5593a833d76 100644 (file)
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
@@ -57,6 +57,8 @@ enum arch_timer_spi_nr {
 #define ARCH_TIMER_MEM_PHYS_ACCESS     2
 #define ARCH_TIMER_MEM_VIRT_ACCESS     3
 
+#define ARCH_TIMER_MEM_MAX_FRAMES      8
+
 #define ARCH_TIMER_USR_PCT_ACCESS_EN   (1 << 0) /* physical counter */
 #define ARCH_TIMER_USR_VCT_ACCESS_EN   (1 << 1) /* virtual counter */
 #define ARCH_TIMER_VIRT_EVT_EN         (1 << 2)
@@ -72,6 +74,20 @@ struct arch_timer_kvm_info {
        int virtual_irq;
 };
 
+struct arch_timer_mem_frame {
+       bool valid;
+       phys_addr_t cntbase;
+       size_t size;
+       int phys_irq;
+       int virt_irq;
+};
+
+struct arch_timer_mem {
+       phys_addr_t cntctlbase;
+       size_t size;
+       struct arch_timer_mem_frame frame[ARCH_TIMER_MEM_MAX_FRAMES];
+};
+
 #ifdef CONFIG_ARM_ARCH_TIMER
 
 extern u32 arch_timer_get_rate(void);