浏览代码

clocksource: arm_arch_timer: Extend arch_timer_kvm_info to get the virtual IRQ

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 <julien.grall@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Julien Grall 9 年之前
父节点
当前提交
d9b5e41591
共有 2 个文件被更改,包括 3 次插入0 次删除
  1. 2 0
      drivers/clocksource/arm_arch_timer.c
  2. 1 0
      include/clocksource/arm_arch_timer.h

+ 2 - 0
drivers/clocksource/arm_arch_timer.c

@@ -750,6 +750,8 @@ static void __init arch_timer_init(void)
 
 
 	arch_timer_register();
 	arch_timer_register();
 	arch_timer_common_init();
 	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)
 static void __init arch_timer_of_init(struct device_node *np)

+ 1 - 0
include/clocksource/arm_arch_timer.h

@@ -51,6 +51,7 @@ enum arch_timer_reg {
 
 
 struct arch_timer_kvm_info {
 struct arch_timer_kvm_info {
 	struct timecounter timecounter;
 	struct timecounter timecounter;
+	int virtual_irq;
 };
 };
 
 
 #ifdef CONFIG_ARM_ARCH_TIMER
 #ifdef CONFIG_ARM_ARCH_TIMER