diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-17 22:35:35 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-17 22:35:35 +0000 |
| commit | 82b5d3cd6b0d6597724deef4896e93e4152e3ef2 (patch) | |
| tree | 07943ad4f3a0a3c2f664712c6cffa41acc49cb01 /arch/arm64/kvm | |
| parent | a8a2b9ee4bec0b29d031324160b7f11af42a563a (diff) | |
| parent | ceed81a883dc43e2073ecdcfd273fa179e24df5b (diff) | |
Merge tag 'v5.4.90' into 5.4-2.3.x-imx
This is the 5.4.90 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'arch/arm64/kvm')
| -rw-r--r-- | arch/arm64/kvm/sys_regs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 6478635ff214..98a177dd1f89 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -625,6 +625,10 @@ static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) { u64 pmcr, val; + /* No PMU available, PMCR_EL0 may UNDEF... */ + if (!kvm_arm_support_pmu_v3()) + return; + pmcr = read_sysreg(pmcr_el0); /* * Writable bits of PMCR_EL0 (ARMV8_PMU_PMCR_MASK) are reset to UNKNOWN |