summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hildenbrand <dahi@linux.vnet.ibm.com>2016-04-04 15:49:34 +0200
committerChristian Borntraeger <borntraeger@de.ibm.com>2016-06-10 12:07:23 +0200
commit48ee7d3a7f8f3ca90dfc5e1103e68c0044051acc (patch)
treea2dab1a50062c77d7ed5c1adda99d3146349f772
parent4a5c3e08271216891ce1b5315cec3dcadbd01cd4 (diff)
downloadop-kernel-dev-48ee7d3a7f8f3ca90dfc5e1103e68c0044051acc.zip
op-kernel-dev-48ee7d3a7f8f3ca90dfc5e1103e68c0044051acc.tar.gz
KVM: s390: enable cei only if available
Let's only enable conditional-external-interruption if the facility is actually available. Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
-rw-r--r--arch/s390/kvm/kvm-s390.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 340fb40..1a239a6 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -1845,7 +1845,9 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
if (test_kvm_facility(vcpu->kvm, 8))
vcpu->arch.sie_block->ecb2 |= 0x08;
- vcpu->arch.sie_block->eca = 0x81002000U;
+ vcpu->arch.sie_block->eca = 0x1002000U;
+ if (sclp.has_cei)
+ vcpu->arch.sie_block->eca |= 0x80000000U;
if (sclp.has_ib)
vcpu->arch.sie_block->eca |= 0x40000000U;
if (sclp.has_siif)
OpenPOWER on IntegriCloud