summaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm/kvm-s390.c
diff options
context:
space:
mode:
authorJason J. Herne2017-03-20 14:57:42 +0100
committerChristian Borntraeger2017-04-26 14:19:01 +0200
commite000b8e0968dd7bfa09c444607ce1e48e57aafd3 (patch)
tree0565a2247daeacceb4c272ff2543d944d7785a03 /arch/s390/kvm/kvm-s390.c
parentMerge branch 's390forkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kv... (diff)
downloadkernel-qcow2-linux-e000b8e0968dd7bfa09c444607ce1e48e57aafd3.tar.gz
kernel-qcow2-linux-e000b8e0968dd7bfa09c444607ce1e48e57aafd3.tar.xz
kernel-qcow2-linux-e000b8e0968dd7bfa09c444607ce1e48e57aafd3.zip
s390: kvm: Cpu model support for msa6, msa7 and msa8
msa6 and msa7 require no changes. msa8 adds kma instruction and feature area. Signed-off-by: Jason J. Herne <jjherne@linux.vnet.ibm.com> Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
-rw-r--r--arch/s390/kvm/kvm-s390.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 8771fef112a1..7eb1275cc265 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -276,6 +276,10 @@ static void kvm_s390_cpu_feat_init(void)
__cpacf_query(CPACF_PPNO, (cpacf_mask_t *)
kvm_s390_available_subfunc.ppno);
+ if (test_facility(146)) /* MSA8 */
+ __cpacf_query(CPACF_KMA, (cpacf_mask_t *)
+ kvm_s390_available_subfunc.kma);
+
if (MACHINE_HAS_ESOP)
allow_cpu_feat(KVM_S390_VM_CPU_FEAT_ESOP);
/*