[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/7] s390x/kvm: Fixup interrupt type for non-adapter
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 7/7] s390x/kvm: Fixup interrupt type for non-adapter I/O interrupts |
Date: |
Tue, 14 Jun 2016 14:13:55 +0200 |
From: Christian Borntraeger <address@hidden>
The current algorithm for I/O interrupts would result in a wrong
interrupt type for subchannel numbers fffe and ffff. In addition
a non adapter interrupt might look like an adapter interrupt for
any subchannel number that has the 0x0400 bit set.
No kernel has ever used the type outside logging - and the logging
was wrong all the time. For everything else the kernel used the
interrupt parameters.
Let's use the KVM_S390_INT_IO macro as for adapter interrupts.
Signed-off-by: Christian Borntraeger <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target-s390x/kvm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 8f46fd0..f108cd3 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -2071,8 +2071,9 @@ void kvm_s390_io_interrupt(uint16_t subchannel_id,
if (io_int_word & IO_INT_WORD_AI) {
irq.type = KVM_S390_INT_IO(1, 0, 0, 0);
} else {
- irq.type = ((subchannel_id & 0xff00) << 24) |
- ((subchannel_id & 0x00060) << 22) | (subchannel_nr << 16);
+ irq.type = KVM_S390_INT_IO(0, (subchannel_id & 0xff00) >> 8,
+ (subchannel_id & 0x0006),
+ subchannel_nr);
}
kvm_s390_floating_interrupt(&irq);
}
--
2.9.0
- [Qemu-devel] [PULL 0/7] s390x: next batch of patches, Cornelia Huck, 2016/06/14
- [Qemu-devel] [PULL 3/7] s390x/css: clear IO irqs when generating IPI CRW, Cornelia Huck, 2016/06/14
- [Qemu-devel] [PULL 1/7] linux-headers: update, Cornelia Huck, 2016/06/14
- [Qemu-devel] [PULL 7/7] s390x/kvm: Fixup interrupt type for non-adapter I/O interrupts,
Cornelia Huck <=
- [Qemu-devel] [PULL 5/7] virtio-ccw: Provide traces for indicator changes, Cornelia Huck, 2016/06/14
- [Qemu-devel] [PULL 2/7] s390x/kvm: add interface for clearing IO irqs, Cornelia Huck, 2016/06/14
- [Qemu-devel] [PULL 4/7] s390x/css: introduce property type for device ids, Cornelia Huck, 2016/06/14
- [Qemu-devel] [PULL 6/7] s390x: Limit s390-ccw machines to 248 CPUs, Cornelia Huck, 2016/06/14
- Re: [Qemu-devel] [PULL 0/7] s390x: next batch of patches, Peter Maydell, 2016/06/14