openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: arm/arm64: arch_timer: Rely on the arch timer to parse the firmware tables 

The firmware table is currently 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, use the newly function arch_timer_get_kvm_info()
which return all the information required by the virtual timer code.

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>
This commit is contained in:
Julien Grall 2016-04-11 16:32:58 +01:00 committed by Christoffer Dall
parent 1839e57696
commit 29c2d6ff4c
1 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
virt/kvm/arm/arch_timer.c
View File

@ -17,7 +17,6 @@
*/ */
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/of_irq.h>
#include <linux/kvm.h> #include <linux/kvm.h>
#include <linux/kvm_host.h> #include <linux/kvm_host.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
@ -438,45 +437,29 @@ static struct notifier_block kvm_timer_cpu_nb = {
.notifier_call = kvm_timer_cpu_notify, .notifier_call = kvm_timer_cpu_notify,
}; };
static const struct of_device_id arch_timer_of_match[] = {
{ .compatible = "arm,armv7-timer", },
{ .compatible = "arm,armv8-timer", },
{},
};
int kvm_timer_hyp_init(void) int kvm_timer_hyp_init(void)
{ {
struct device_node *np; struct arch_timer_kvm_info *info;
unsigned int ppi;
int err; int err;
timecounter = arch_timer_get_timecounter(); info = arch_timer_get_kvm_info();
if (!timecounter) timecounter = &info->timecounter;
return -ENODEV;
np = of_find_matching_node(NULL, arch_timer_of_match); if (info->virtual_irq <= 0) {
if (!np) { kvm_err("kvm_arch_timer: invalid virtual timer IRQ: %d\n",
kvm_err("kvm_arch_timer: can't find DT node\n"); info->virtual_irq);
return -ENODEV; return -ENODEV;
} }
host_vtimer_irq = info->virtual_irq;
ppi = irq_of_parse_and_map(np, 2); err = request_percpu_irq(host_vtimer_irq, kvm_arch_timer_handler,
if (!ppi) {
kvm_err("kvm_arch_timer: no virtual timer interrupt\n");
err = -EINVAL;
goto out;
}
err = request_percpu_irq(ppi, kvm_arch_timer_handler,
"kvm guest timer", kvm_get_running_vcpus()); "kvm guest timer", kvm_get_running_vcpus());
if (err) { if (err) {
kvm_err("kvm_arch_timer: can't request interrupt %d (%d)\n", kvm_err("kvm_arch_timer: can't request interrupt %d (%d)\n",
ppi, err); host_vtimer_irq, err);
goto out; goto out;
} }
host_vtimer_irq = ppi;
err = __register_cpu_notifier(&kvm_timer_cpu_nb); err = __register_cpu_notifier(&kvm_timer_cpu_nb);
if (err) { if (err) {
kvm_err("Cannot register timer CPU notifier\n"); kvm_err("Cannot register timer CPU notifier\n");
@ -489,14 +472,13 @@ int kvm_timer_hyp_init(void)
goto out_free; goto out_free;
} }
kvm_info("%s IRQ%d\n", np->name, ppi); kvm_info("virtual timer IRQ%d\n", host_vtimer_irq);
on_each_cpu(kvm_timer_init_interrupt, NULL, 1); on_each_cpu(kvm_timer_init_interrupt, NULL, 1);
goto out; goto out;
out_free: out_free:
free_percpu_irq(ppi, kvm_get_running_vcpus()); free_percpu_irq(host_vtimer_irq, kvm_get_running_vcpus());
out: out:
of_node_put(np);
return err; return err;
} }