kvm: introduce kvm_arch_msi_data_to_gsi

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 <eric.auger@linaro.org>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 4878959404df62acfdb697ecbe9d19d15d3778cc..f459fbdbd423ba3b630913a4d4801a271b5c6b4d 100644 (file)
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -287,6 +287,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 17a3771efe7a600fba6b497b390a6ec02c310fd1..b2b1bc3359e6c9126d6918938a219c9402674140 100644 (file)
--- 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 16abbf198c922b1d32c6b7969e77e8f72680e480..548bfd768de908bf8540c16d7a1192675caffeaa 100644 (file)
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@@ -600,3 +600,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 a26d25a81fbf1df5d9311b191e27e341f4e8941d..ca2da84501b05d541ef1e039a728488155127bf3 100644 (file)
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -2766,3 +2766,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 59eb11105a42bec718dd165ca503f129ea45e17d..948619fbab8fa9790867073f82d4caa519aa2f19 100644 (file)
--- a/target-mips/kvm.c
+++ b/target-mips/kvm.c
@@ -696,3 +696,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 1da9ea81e5415e940c6cbed25a7300e133309d2c..8f7cee5ec11590f9a949af509a8dd2540ebd83c8 100644 (file)
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -2410,3 +2410,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 6de7759b67b1562ecb4b9ceb7082e8653a7ff63e..2740ec4eefb6dfe93757d4f61a288377a168851f 100644 (file)
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -2216,3 +2216,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();
+}