From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgTfs-0003B0-Pc for qemu-devel@nongnu.org; Fri, 10 Apr 2015 03:48:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YgTfn-0005sm-5U for qemu-devel@nongnu.org; Fri, 10 Apr 2015 03:48:24 -0400 Received: from mail-wg0-f54.google.com ([74.125.82.54]:34983) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgTfm-0005sY-Vl for qemu-devel@nongnu.org; Fri, 10 Apr 2015 03:48:19 -0400 Received: by wgyo15 with SMTP id o15so9476206wgy.2 for ; Fri, 10 Apr 2015 00:48:18 -0700 (PDT) From: Eric Auger Date: Fri, 10 Apr 2015 08:48:09 +0100 Message-Id: <1428652090-5354-2-git-send-email-eric.auger@linaro.org> In-Reply-To: <1428652090-5354-1-git-send-email-eric.auger@linaro.org> References: <1428652090-5354-1-git-send-email-eric.auger@linaro.org> Subject: [Qemu-devel] [PATCH v2 1/2] kvm: introduce kvm_arch_msi_data_to_gsi List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, pbonzini@redhat.com, peter.maydell@linaro.org, cornelia.huck@de.ibm.com, borntraeger@de.ibm.com, agraf@suse.de, james.hogan@imgtec.com Cc: aik@ozlabs.ru, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, patches@linaro.org On ARM the MSI data corresponds to the shared peripheral interrupt (SPI) ID. This latter equals to the SPI index + 32. to retrieve the SPI index, matching the gsi, an architecture specific function is introduced. Signed-off-by: Eric Auger --- v1 -> v2: - abort on i386/mips/s390x since those archs do not support kvm_gsi_direct_mapping --- include/sysemu/kvm.h | 2 ++ 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 | 5 +++++ 7 files changed, 28 insertions(+), 1 deletion(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 197e6c0..ebd8b17 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -286,6 +286,8 @@ void kvm_arch_init_irq_routing(KVMState *s); int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, uint64_t address, uint32_t data); +int kvm_arch_msi_data_to_gsi(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 dd44f8c..3e9675e 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1228,7 +1228,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) int virq; if (kvm_gsi_direct_mapping()) { - return msg.data & 0xffff; + return kvm_arch_msi_data_to_gsi(msg.data); } if (!kvm_gsi_routing_enabled()) { diff --git a/target-arm/kvm.c b/target-arm/kvm.c index fdd9ba3..05d5634 100644 --- a/target-arm/kvm.c +++ b/target-arm/kvm.c @@ -598,3 +598,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, { return 0; } + +int kvm_arch_msi_data_to_gsi(uint32_t data) +{ + return (data - 32) & 0xffff; +} diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 41d09e5..a832328 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -2764,3 +2764,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, { return 0; } + +int kvm_arch_msi_data_to_gsi(uint32_t data) +{ + abort(); +} diff --git a/target-mips/kvm.c b/target-mips/kvm.c index 4d1f7ea..09eb8f9 100644 --- a/target-mips/kvm.c +++ b/target-mips/kvm.c @@ -694,3 +694,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, { return 0; } + +int kvm_arch_msi_data_to_gsi(uint32_t data) +{ + abort(); +} diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 12328a4..53569f6 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -2408,3 +2408,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, { return 0; } + +int kvm_arch_msi_data_to_gsi(uint32_t data) +{ + return data & 0xffff; +} diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index b48c643..5911a38 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -1940,3 +1940,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, route->u.adapter.adapter_id = pbdev->routes.adapter.adapter_id; return 0; } + +int kvm_arch_msi_data_to_gsi(uint32_t data) +{ + abort(); +} -- 1.8.3.2