clocksource: arm_arch_timer: Extend arch_timer_kvm_info to get the virtual IRQ

Julien Grall · chazy · commit d9b5e41591ca · 2016-05-03T12:54:21.000+02:00
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
IRQ.

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

Signed-off-by: Julien Grall &lt;julien.grall@arm.com&gt;
Acked-by: Christoffer Dall &lt;christoffer.dall@linaro.org&gt;
Signed-off-by: Christoffer Dall &lt;christoffer.dall@linaro.org&gt;
diff --git 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_register();
 	arch_timer_common_init();
+
+	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
@@ -51,6 +51,7 @@ enum arch_timer_reg {
 
 struct arch_timer_kvm_info {
 	struct timecounter timecounter;
+	int virtual_irq;
 };
 
 #ifdef CONFIG_ARM_ARCH_TIMER

Original file line number	Diff line number	Diff line change
`@@ -750,6 +750,8 @@ static void __init arch_timer_init(void)`
`750`	`750`
`751`	`751`	`arch_timer_register();`
`752`	`752`	`arch_timer_common_init();`
	`753`	`+`
	`754`	`+ arch_timer_kvm_info.virtual_irq = arch_timer_ppi[VIRT_PPI];`
`753`	`755`	`}`
`754`	`756`
`755`	`757`	`static void __init arch_timer_of_init(struct device_node *np)`