2 files changed, 19 insertions, 2 deletions

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index ff1e2f8ef94a..c30615e605ac 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -629,10 +629,27 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,
                 break;
         case KVM_S390_SIGP_STOP:
         case KVM_S390_RESTART:
+                VCPU_EVENT(vcpu, 3, "inject: type %x", s390int->type);
+                inti->type = s390int->type;
+                break;
         case KVM_S390_INT_EXTERNAL_CALL:
+                if (s390int->parm & 0xffff0000) {
+                        kfree(inti);
+                        return -EINVAL;
+                }
+                VCPU_EVENT(vcpu, 3, "inject: external call source-cpu:%u",
+                           s390int->parm);
+                inti->type = s390int->type;
+                inti->extcall.code = s390int->parm;
+                break;
         case KVM_S390_INT_EMERGENCY:
-                VCPU_EVENT(vcpu, 3, "inject: type %x", s390int->type);
+                if (s390int->parm & 0xffff0000) {
+                        kfree(inti);
+                        return -EINVAL;
+                }
+                VCPU_EVENT(vcpu, 3, "inject: emergency %u\n", s390int->parm);
                 inti->type = s390int->type;
+                inti->emerg.code = s390int->parm;
                 break;
         case KVM_S390_INT_VIRTIO:
         case KVM_S390_INT_SERVICE:
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index ecced9d18986..38883f0bf27e 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -997,7 +997,7 @@ static int __init kvm_s390_init(void)
         }
         memcpy(facilities, S390_lowcore.stfle_fac_list, 16);
         facilities[0] &= 0xff00fff3f47c0000ULL;
-        facilities[1] &= 0x201c000000000000ULL;
+        facilities[1] &= 0x001c000000000000ULL;
         return 0;
 }