diff options
author | Jens Freimann <jfrei@linux.vnet.ibm.com> | 2014-11-10 11:20:07 -0500 |
---|---|---|
committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2014-11-28 07:59:03 -0500 |
commit | 60f90a14dd3e675adfa5c3e0a153696a0230e725 (patch) | |
tree | 4d6ea2982284b8dbe9560de499eca1b9f0381ca5 /arch/s390 | |
parent | af43eb2fd76a275a14d0fcbed43dbf650f2c315b (diff) |
KVM: s390: add defines for virtio and pfault interrupt code
Get rid of open coded value for virtio and pfault completion interrupts.
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kvm/interrupt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index bccda76c5cc2..481f1368c6eb 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c | |||
@@ -27,6 +27,8 @@ | |||
27 | #define IOINT_CSSID_MASK 0x03fc0000 | 27 | #define IOINT_CSSID_MASK 0x03fc0000 |
28 | #define IOINT_AI_MASK 0x04000000 | 28 | #define IOINT_AI_MASK 0x04000000 |
29 | #define PFAULT_INIT 0x0600 | 29 | #define PFAULT_INIT 0x0600 |
30 | #define PFAULT_DONE 0x0680 | ||
31 | #define VIRTIO_PARAM 0x0d00 | ||
30 | 32 | ||
31 | static int __must_check deliver_ckc_interrupt(struct kvm_vcpu *vcpu); | 33 | static int __must_check deliver_ckc_interrupt(struct kvm_vcpu *vcpu); |
32 | 34 | ||
@@ -391,7 +393,7 @@ static int __must_check __do_deliver_interrupt(struct kvm_vcpu *vcpu, | |||
391 | trace_kvm_s390_deliver_interrupt(vcpu->vcpu_id, inti->type, 0, | 393 | trace_kvm_s390_deliver_interrupt(vcpu->vcpu_id, inti->type, 0, |
392 | inti->ext.ext_params2); | 394 | inti->ext.ext_params2); |
393 | rc = put_guest_lc(vcpu, 0x2603, (u16 *)__LC_EXT_INT_CODE); | 395 | rc = put_guest_lc(vcpu, 0x2603, (u16 *)__LC_EXT_INT_CODE); |
394 | rc |= put_guest_lc(vcpu, 0x0680, (u16 *)__LC_EXT_CPU_ADDR); | 396 | rc |= put_guest_lc(vcpu, PFAULT_DONE, (u16 *)__LC_EXT_CPU_ADDR); |
395 | rc |= write_guest_lc(vcpu, __LC_EXT_OLD_PSW, | 397 | rc |= write_guest_lc(vcpu, __LC_EXT_OLD_PSW, |
396 | &vcpu->arch.sie_block->gpsw, | 398 | &vcpu->arch.sie_block->gpsw, |
397 | sizeof(psw_t)); | 399 | sizeof(psw_t)); |
@@ -408,7 +410,7 @@ static int __must_check __do_deliver_interrupt(struct kvm_vcpu *vcpu, | |||
408 | inti->ext.ext_params, | 410 | inti->ext.ext_params, |
409 | inti->ext.ext_params2); | 411 | inti->ext.ext_params2); |
410 | rc = put_guest_lc(vcpu, 0x2603, (u16 *)__LC_EXT_INT_CODE); | 412 | rc = put_guest_lc(vcpu, 0x2603, (u16 *)__LC_EXT_INT_CODE); |
411 | rc |= put_guest_lc(vcpu, 0x0d00, (u16 *)__LC_EXT_CPU_ADDR); | 413 | rc |= put_guest_lc(vcpu, VIRTIO_PARAM, (u16 *)__LC_EXT_CPU_ADDR); |
412 | rc |= write_guest_lc(vcpu, __LC_EXT_OLD_PSW, | 414 | rc |= write_guest_lc(vcpu, __LC_EXT_OLD_PSW, |
413 | &vcpu->arch.sie_block->gpsw, | 415 | &vcpu->arch.sie_block->gpsw, |
414 | sizeof(psw_t)); | 416 | sizeof(psw_t)); |