xen: Utilize the restore_msi_irqs hook.

to make a hypercall to restore the vectors in the MSI/MSI-X
configuration space.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index f567965c06201cf0315605cde43c6eaa9bb228a5..f140999aed47e0de998b6fcda82c3c9a891f1fdf 100644 (file)
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -241,6 +241,17 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 out:
        return ret;
 }
+
+static void xen_initdom_restore_msi_irqs(struct pci_dev *dev, int irq)
+{
+       int ret = 0;
+       struct physdev_restore_msi restore;
+
+       restore.bus = dev->bus->number;
+       restore.devfn = dev->devfn;
+       ret = HYPERVISOR_physdev_op(PHYSDEVOP_restore_msi, &restore);
+       WARN(ret && ret != -ENOSYS, "restore_msi -> %d\n", ret);
+}
 #endif
 #endif
 
@@ -458,6 +469,7 @@ static int __init pci_xen_initial_domain(void)
 #ifdef CONFIG_PCI_MSI
        x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;
        x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
+       x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs;
 #endif
        xen_setup_acpi_sci();
        __acpi_register_gsi = acpi_register_gsi_xen;

diff --git a/include/xen/interface/physdev.h b/include/xen/interface/physdev.h
index 534cac89a77deb20242aaf0b567c9a663c2db1d5..44aefa92598d880dba609e0324cd2f546b1595ef 100644 (file)
--- a/include/xen/interface/physdev.h
+++ b/include/xen/interface/physdev.h
@@ -144,6 +144,13 @@ struct physdev_manage_pci {
        uint8_t devfn;
 };
 
+#define PHYSDEVOP_restore_msi            19
+struct physdev_restore_msi {
+       /* IN */
+       uint8_t bus;
+       uint8_t devfn;
+};
+
 #define PHYSDEVOP_manage_pci_add_ext   20
 struct physdev_manage_pci_ext {
        /* IN */