diff options
| author | Michael Ellerman <[email protected]> | 2024-11-17 21:39:59 +1100 |
|---|---|---|
| committer | Michael Ellerman <[email protected]> | 2024-11-17 21:42:32 +1100 |
| commit | ba6d8efb1bd7318f173846a8f5730a54c93f3ff5 (patch) | |
| tree | 8486d39105cb3b733c051e33286bbc963a4e44d5 /arch/powerpc/kvm/book3s_hv_nestedv2.c | |
| parent | 27aef9391bd3bc08eb07fe23e6c4d7c9afabe1e8 (diff) | |
| parent | 590d2f9347f7974d7954400e5d937672fd844a8b (diff) | |
Merge branch 'topic/ppc-kvm' into next
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_nestedv2.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_nestedv2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_nestedv2.c b/arch/powerpc/kvm/book3s_hv_nestedv2.c index eeecea8f202b..e5c7ce1fb761 100644 --- a/arch/powerpc/kvm/book3s_hv_nestedv2.c +++ b/arch/powerpc/kvm/book3s_hv_nestedv2.c @@ -370,7 +370,9 @@ static int gs_msg_ops_vcpu_fill_info(struct kvmppc_gs_buff *gsb, * default to L1's PVR. */ if (!vcpu->arch.vcore->arch_compat) { - if (cpu_has_feature(CPU_FTR_ARCH_31)) + if (cpu_has_feature(CPU_FTR_P11_PVR)) + arch_compat = PVR_ARCH_31_P11; + else if (cpu_has_feature(CPU_FTR_ARCH_31)) arch_compat = PVR_ARCH_31; else if (cpu_has_feature(CPU_FTR_ARCH_300)) arch_compat = PVR_ARCH_300; |