yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From 7596bd04d37a608d06cf7a2f589a67d332a21dfb Mon Sep 17 00:00:00 2001
218e99
From: Alex Williamson <alex.williamson@redhat.com>
218e99
Date: Fri, 1 Nov 2013 19:50:26 +0100
218e99
Subject: [PATCH 01/25] pci-assign: Add MSI affinity support
218e99
218e99
RH-Author: Alex Williamson <alex.williamson@redhat.com>
218e99
Message-id: <20131101195026.25461.63530.stgit@bling.home>
218e99
Patchwork-id: 55233
218e99
O-Subject: [RHEL7 qemu-kvm PATCH 1/3] pci-assign: Add MSI affinity support
218e99
Bugzilla: 1025877
218e99
RH-Acked-by: Bandan Das <bsd@redhat.com>
218e99
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
218e99
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
218e99
218e99
Bugzilla: 1025877
218e99
Upstream commit: 3459f01b2d9612070ec23221a4ccb60a41b775ae
218e99
218e99
To support guest MSI affinity changes update the MSI message any time
218e99
the guest writes to the address or data fields.
218e99
218e99
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
218e99
Acked-by: Michael S. Tsirkin <mst@redhat.com>
218e99
Message-id: 20130513201840.5430.86331.stgit@bling.home
218e99
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
218e99
---
218e99
 hw/i386/kvm/pci-assign.c |   18 ++++++++++++++++++
218e99
 1 file changed, 18 insertions(+)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 hw/i386/kvm/pci-assign.c |   18 ++++++++++++++++++
218e99
 1 files changed, 18 insertions(+), 0 deletions(-)
218e99
218e99
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
218e99
index 1684f8c..221a8f7 100644
218e99
--- a/hw/i386/kvm/pci-assign.c
218e99
+++ b/hw/i386/kvm/pci-assign.c
218e99
@@ -1026,6 +1026,21 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev)
218e99
     }
218e99
 }
218e99
 
218e99
+static void assigned_dev_update_msi_msg(PCIDevice *pci_dev)
218e99
+{
218e99
+    AssignedDevice *assigned_dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
218e99
+    uint8_t ctrl_byte = pci_get_byte(pci_dev->config + pci_dev->msi_cap +
218e99
+                                     PCI_MSI_FLAGS);
218e99
+
218e99
+    if (assigned_dev->assigned_irq_type != ASSIGNED_IRQ_MSI ||
218e99
+        !(ctrl_byte & PCI_MSI_FLAGS_ENABLE)) {
218e99
+        return;
218e99
+    }
218e99
+
218e99
+    kvm_irqchip_update_msi_route(kvm_state, assigned_dev->msi_virq[0],
218e99
+                                 msi_get_message(pci_dev, 0));
218e99
+}
218e99
+
218e99
 static bool assigned_dev_msix_masked(MSIXTableEntry *entry)
218e99
 {
218e99
     return (entry->ctrl & cpu_to_le32(0x1)) != 0;
218e99
@@ -1201,6 +1216,9 @@ static void assigned_dev_pci_write_config(PCIDevice *pci_dev, uint32_t address,
218e99
         if (range_covers_byte(address, len,
218e99
                               pci_dev->msi_cap + PCI_MSI_FLAGS)) {
218e99
             assigned_dev_update_msi(pci_dev);
218e99
+        } else if (ranges_overlap(address, len, /* 32bit MSI only */
218e99
+                                  pci_dev->msi_cap + PCI_MSI_ADDRESS_LO, 6)) {
218e99
+            assigned_dev_update_msi_msg(pci_dev);
218e99
         }
218e99
     }
218e99
     if (assigned_dev->cap.available & ASSIGNED_DEVICE_CAP_MSIX) {
218e99
-- 
218e99
1.7.1
218e99