| Message ID | 1413990720-39602-4-git-send-email-blaschka@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Wed, 22 Oct 2014 17:12:00 +0200 Frank Blaschka <blaschka@linux.vnet.ibm.com> wrote: > From: Frank Blaschka <frank.blaschka@de.ibm.com> > > on s390 MSI-X irqs are presented as thin or adapter interrupts > for this we have to reorganize the routing entry to contain > valid information for the adapter interrupt code on s390. > To minimize impact on existing code we introduce an architecture > function to fixup the routing entry. > > Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> > --- > include/sysemu/kvm.h | 4 ++++ > kvm-all.c | 2 ++ > target-arm/kvm.c | 5 +++++ > target-i386/kvm.c | 5 +++++ > target-mips/kvm.c | 5 +++++ > target-ppc/kvm.c | 5 +++++ > target-s390x/kvm.c | 25 +++++++++++++++++++++++++ > 7 files changed, 51 insertions(+) > > diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c > index 9280132..c3b3b0f 100644 > --- a/target-s390x/kvm.c > +++ b/target-s390x/kvm.c > @@ -43,6 +43,7 @@ > #include "trace.h" > #include "qapi-event.h" > #include "pci_ic.h" > +#include "hw/s390x/s390-pci-bus.h" > > /* #define DEBUG_KVM */ > > @@ -1639,3 +1640,27 @@ int kvm_s390_get_machine_props(S390MachineProps *prop) > { > return cpu_model_get(KVM_S390_VM_CPU_MACHINE, (uint64_t) prop); > } > + > +void kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, > + uint64_t address, uint32_t data) > +{ > + S390PCIBusDevice *pbdev; > + uint32_t fid = data >> ZPCI_MSI_VEC_BITS; > + uint32_t vec = data & ZPCI_MSI_VEC_MASK; I think this needs a comment so it is easier to understand why you're mucking around with PCI devices and I/O adapters here without referring to git blame :) > + > + pbdev = s390_pci_find_dev_by_fid(fid); > + if (!pbdev) { > + DPRINTF("add_msi_route no dev\n"); > + return; This feels wrong. Shouldn't this function fail if you can't find the pci device? The calling function can probably just release the virq again and return an error. > + } > + > + pbdev->routes.adapter.ind_offset = vec; > + > + route->type = KVM_IRQ_ROUTING_S390_ADAPTER; > + route->flags = 0; > + route->u.adapter.summary_addr = pbdev->routes.adapter.summary_addr; > + route->u.adapter.ind_addr = pbdev->routes.adapter.ind_addr; > + route->u.adapter.summary_offset = pbdev->routes.adapter.summary_offset; > + route->u.adapter.ind_offset = pbdev->routes.adapter.ind_offset; > + route->u.adapter.adapter_id = pbdev->routes.adapter.adapter_id; > +}
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 77ee240..d4c89c3 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -148,6 +148,7 @@ extern bool kvm_readonly_mem_allowed; struct kvm_run; struct kvm_lapic_state; +struct kvm_irq_routing_entry; typedef struct KVMCapabilityInfo { const char *name; @@ -261,6 +262,9 @@ int kvm_arch_on_sigbus(int code, void *addr); void kvm_arch_init_irq_routing(KVMState *s); +void kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, + uint64_t address, uint32_t data); + int kvm_set_irq(KVMState *s, int irq, int level); int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg); diff --git a/kvm-all.c b/kvm-all.c index 682420b..965c888 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1198,6 +1198,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) kroute.u.msi.address_lo = (uint32_t)msg.address; kroute.u.msi.address_hi = msg.address >> 32; kroute.u.msi.data = le32_to_cpu(msg.data); + kvm_arch_fixup_msi_route(&kroute, msg.address, msg.data); kvm_add_routing_entry(s, &kroute); kvm_irqchip_commit_routes(s); @@ -1223,6 +1224,7 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg) kroute.u.msi.address_lo = (uint32_t)msg.address; kroute.u.msi.address_hi = msg.address >> 32; kroute.u.msi.data = le32_to_cpu(msg.data); + kvm_arch_fixup_msi_route(&kroute, msg.address, msg.data); return kvm_update_routing_entry(s, &kroute); } diff --git a/target-arm/kvm.c b/target-arm/kvm.c index 319784d..5204c48 100644 --- a/target-arm/kvm.c +++ b/target-arm/kvm.c @@ -441,3 +441,8 @@ int kvm_arch_irqchip_create(KVMState *s) return 0; } + +void kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, + uint64_t address, uint32_t data) +{ +} diff --git a/target-i386/kvm.c b/target-i386/kvm.c index ddedc73..5e80ecd 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -2688,3 +2688,8 @@ int kvm_device_msix_deassign(KVMState *s, uint32_t dev_id) return kvm_deassign_irq_internal(s, dev_id, KVM_DEV_IRQ_GUEST_MSIX | KVM_DEV_IRQ_HOST_MSIX); } + +void kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, + uint64_t address, uint32_t data) +{ +} diff --git a/target-mips/kvm.c b/target-mips/kvm.c index 97fd51a..fe34eb2 100644 --- a/target-mips/kvm.c +++ b/target-mips/kvm.c @@ -688,3 +688,8 @@ int kvm_arch_get_registers(CPUState *cs) return ret; } + +void kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, + uint64_t address, uint32_t data) +{ +} diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 9c23c6b..55627b9 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -2388,3 +2388,8 @@ out_close: error_out: return; } + +void kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, + uint64_t address, uint32_t data) +{ +} diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 9280132..c3b3b0f 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -43,6 +43,7 @@ #include "trace.h" #include "qapi-event.h" #include "pci_ic.h" +#include "hw/s390x/s390-pci-bus.h" /* #define DEBUG_KVM */ @@ -1639,3 +1640,27 @@ int kvm_s390_get_machine_props(S390MachineProps *prop) { return cpu_model_get(KVM_S390_VM_CPU_MACHINE, (uint64_t) prop); } + +void kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, + uint64_t address, uint32_t data) +{ + S390PCIBusDevice *pbdev; + uint32_t fid = data >> ZPCI_MSI_VEC_BITS; + uint32_t vec = data & ZPCI_MSI_VEC_MASK; + + pbdev = s390_pci_find_dev_by_fid(fid); + if (!pbdev) { + DPRINTF("add_msi_route no dev\n"); + return; + } + + pbdev->routes.adapter.ind_offset = vec; + + route->type = KVM_IRQ_ROUTING_S390_ADAPTER; + route->flags = 0; + route->u.adapter.summary_addr = pbdev->routes.adapter.summary_addr; + route->u.adapter.ind_addr = pbdev->routes.adapter.ind_addr; + route->u.adapter.summary_offset = pbdev->routes.adapter.summary_offset; + route->u.adapter.ind_offset = pbdev->routes.adapter.ind_offset; + route->u.adapter.adapter_id = pbdev->routes.adapter.adapter_id; +}