On Thu, Jul 20, 2017 at 01:15:34PM +0200, Christoffer Dall wrote:
> From: Hu Huajun <huhuajun@xxxxxxxxxx>
>
> Commit 02d50cdaff36c135d222015cffdca3ff11d168ea upstream.
>
> 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@xxxxxxxxxxxxxxx
> Signed-off-by: Hu Huajun <huhuajun@xxxxxxxxxx>
> Reviewed-by: Christoffer Dall <cdall@xxxxxxxxxx>
> Acked-by: Marc Zyngier <marc.zyngier@xxxxxxx>
> Signed-off-by: Christoffer Dall <cdall@xxxxxxxxxx>
> ---
> arch/arm/kvm/arm.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
4.11 is now end-of-life, sorry.
greg k-h