]> git.baikalelectronics.ru Git - kernel.git/commit
KVM: ARM64: fix phy counter access failure in guest.
authorHu Huajun <huhuajun@huawei.com>
Mon, 12 Jun 2017 14:37:48 +0000 (22:37 +0800)
committerMarc Zyngier <marc.zyngier@arm.com>
Thu, 15 Jun 2017 08:45:12 +0000 (09:45 +0100)
commit17c2602ed80a261422f175ddad50ffd08fd07d33
treed1fb76c8696dbb25b06537167e6eac19f7ade8ec
parentda91411f419dbf67e7d319e4370797b75e465844
KVM: ARM64: fix phy counter access failure in guest.

When reading the cntpct_el0 in guest with VHE (Virtual Host Extension)
enabled in host, the "Unsupported guest sys_reg access" error reported.
The reason is cnthctl_el2.EL1PCTEN is not enabled, which is expected
to be done in kvm_timer_init_vhe(). The problem is kvm_timer_init_vhe
is called by cpu_init_hyp_mode, and which is called when VHE is disabled.
This patch remove the incorrect call to kvm_timer_init_vhe() from
cpu_init_hyp_mode(), and calls kvm_timer_init_vhe() to enable
cnthctl_el2.EL1PCTEN in cpu_hyp_reinit().

Fixes: 89b61fbdc754 ("KVM: arm64: Access CNTHCTL_EL2 bit fields correctly on VHE systems")
Cc: stable@vger.kernel.org
Signed-off-by: Hu Huajun <huhuajun@huawei.com>
Reviewed-by: Christoffer Dall <cdall@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
virt/kvm/arm/arm.c