[PATCH v4 2/9] clocksource: arm_arch_timer: Extend arch_timer_kvm_info to get the virtual IRQ

From: Julien Grall
Date: Thu Mar 24 2016 - 13:57:10 EST

Currently, the firmware table is parsed by the virtual timer code in
order to retrieve the virtual timer interrupt. However, this is already
done by the arch timer driver.

To avoid code duplication, extend arch_timer_kvm_info to get the virtual

Note that the KVM code will be modified in a subsequent patch.

Signed-off-by: Julien Grall <julien.grall@xxxxxxx>

Cc: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Marc Zyngier <marc.zyngier@xxxxxxx>

Changes in v4:
- Move the initialization of the virtual_irq into
arch_timer_init as KVM mandates the system registers timer.

Changes in v3:
- Move the KVM changes into a separate patch and rename the patch
- Move the initialization of the virtual_irq into
drivers/clocksource/arm_arch_timer.c | 2 ++
include/clocksource/arm_arch_timer.h | 1 +
2 files changed, 3 insertions(+)

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 62bdfe7..bb58224 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -750,6 +750,8 @@ static void __init arch_timer_init(void)

+ arch_timer_kvm_info.virtual_irq = arch_timer_ppi[VIRT_PPI];

static void __init arch_timer_of_init(struct device_node *np)
diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h
index 9101ed6b..9dd996a 100644
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
@@ -51,6 +51,7 @@ enum arch_timer_reg {

struct arch_timer_kvm_info {
struct timecounter timecounter;
+ int virtual_irq;