Merge tag 'stable/for-linus-3.15-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull Xen features and fixes from David Vrabel:
 "Support PCI devices with multiple MSIs, performance improvement for
  kernel-based backends (by not populated m2p overrides when mapping),
  and assorted minor bug fixes and cleanups"

* tag 'stable/for-linus-3.15-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/acpi-processor: fix enabling interrupts on syscore_resume
  xen/grant-table: Refactor gnttab_[un]map_refs to avoid m2p_override
  xen: remove XEN_PRIVILEGED_GUEST
  xen: add support for MSI message groups
  xen-pciback: Use pci_enable_msix_exact() instead of pci_enable_msix()
  xen/xenbus: remove unused xenbus_bind_evtchn()
  xen/events: remove unnecessary call to bind_evtchn_to_cpu()
  xen/events: remove the unused resend_irq_on_evtchn()
  drivers:xen-selfballoon:reset 'frontswap_inertia_counter' after frontswap_shrink
  drivers: xen: Include appropriate header file in pcpu.c
  drivers: xen: Mark function as static in platform-pci.c

1 files changed, 20 insertions, 9 deletions

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 103e702ec5a7..905956f16465 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -178,6 +178,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
         i = 0;
         list_for_each_entry(msidesc, &dev->msi_list, list) {
                 irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i],
+                                               (type == PCI_CAP_ID_MSI) ? nvec : 1,
                                                (type == PCI_CAP_ID_MSIX) ?
                                                "pcifront-msi-x" :
                                                "pcifront-msi",
@@ -245,6 +246,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                                 "xen: msi already bound to pirq=%d\n", pirq);
                 }
                 irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq,
+                                               (type == PCI_CAP_ID_MSI) ? nvec : 1,
                                                (type == PCI_CAP_ID_MSIX) ?
                                                "msi-x" : "msi",
                                                DOMID_SELF);
@@ -269,9 +271,6 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
         int ret = 0;
         struct msi_desc *msidesc;
 
-        if (type == PCI_CAP_ID_MSI && nvec > 1)
-                return 1;
-
         list_for_each_entry(msidesc, &dev->msi_list, list) {
                 struct physdev_map_pirq map_irq;
                 domid_t domid;
@@ -291,7 +290,10 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                               (pci_domain_nr(dev->bus) << 16);
                 map_irq.devfn = dev->devfn;
 
-                if (type == PCI_CAP_ID_MSIX) {
+                if (type == PCI_CAP_ID_MSI && nvec > 1) {
+                        map_irq.type = MAP_PIRQ_TYPE_MULTI_MSI;
+                        map_irq.entry_nr = nvec;
+                } else if (type == PCI_CAP_ID_MSIX) {
                         int pos;
                         u32 table_offset, bir;
 
@@ -308,6 +310,16 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                 if (pci_seg_supported)
                         ret = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq,
                                                     &map_irq);
+                if (type == PCI_CAP_ID_MSI && nvec > 1 && ret) {
+                        /*
+                         * If MAP_PIRQ_TYPE_MULTI_MSI is not available
+                         * there's nothing else we can do in this case.
+                         * Just set ret > 0 so driver can retry with
+                         * single MSI.
+                         */
+                        ret = 1;
+                        goto out;
+                }
                 if (ret == -EINVAL && !pci_domain_nr(dev->bus)) {
                         map_irq.type = MAP_PIRQ_TYPE_MSI;
                         map_irq.index = -1;
@@ -324,11 +336,10 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                         goto out;
                 }
 
-                ret = xen_bind_pirq_msi_to_irq(dev, msidesc,
-                                               map_irq.pirq,
-                                               (type == PCI_CAP_ID_MSIX) ?
-                                               "msi-x" : "msi",
-                                                domid);
+                ret = xen_bind_pirq_msi_to_irq(dev, msidesc, map_irq.pirq,
+                                               (type == PCI_CAP_ID_MSI) ? nvec : 1,
+                                               (type == PCI_CAP_ID_MSIX) ? "msi-x" : "msi",
+                                               domid);
                 if (ret < 0)
                         goto out;
         }