summaryrefslogtreecommitdiff
path: root/arch/arm64/include
diff options
context:
space:
mode:
authorHu Huajun <huhuajun@huawei.com>2017-06-12 17:37:48 +0300
committerMarc Zyngier <marc.zyngier@arm.com>2017-06-15 11:45:12 +0300
commit02d50cdaff36c135d222015cffdca3ff11d168ea (patch)
treed1fb76c8696dbb25b06537167e6eac19f7ade8ec /arch/arm64/include
parent0959db6c0b069739ffedf3f6b97644213df586d4 (diff)
downloadlinux-02d50cdaff36c135d222015cffdca3ff11d168ea.tar.xz
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: 488f94d7212b ("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>
Diffstat (limited to 'arch/arm64/include')
0 files changed, 0 insertions, 0 deletions