[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH v2 09/22] x86/xen/MSI: Use MSI chip framework to configure MSI/MSI-X irq



Use MSI chip framework instead of arch MSI functions to configure
MSI/MSI-X irq. So we can manage MSI/MSI-X irq in a unified framework.

Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx>
Acked-by: David Vrabel <david.vrabel@xxxxxxxxxx>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
CC: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
---
 arch/x86/pci/xen.c |   46 ++++++++++++++++++++++++++++++----------------
 1 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 84c2fce..e669ee4 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -376,6 +376,11 @@ static void xen_initdom_restore_msi_irqs(struct pci_dev 
*dev)
 }
 #endif
 
+static void xen_teardown_msi_irq(unsigned int irq)
+{
+       xen_destroy_irq(irq);
+}
+
 static void xen_teardown_msi_irqs(struct pci_dev *dev)
 {
        struct msi_desc *msidesc;
@@ -385,19 +390,26 @@ static void xen_teardown_msi_irqs(struct pci_dev *dev)
                xen_pci_frontend_disable_msix(dev);
        else
                xen_pci_frontend_disable_msi(dev);
-
-       /* Free the IRQ's and the msidesc using the generic code. */
-       default_teardown_msi_irqs(dev);
-}
-
-static void xen_teardown_msi_irq(unsigned int irq)
-{
-       xen_destroy_irq(irq);
+       
+       list_for_each_entry(msidesc, &dev->msi_list, list) {
+               int i, nvec;
+               if (msidesc->irq == 0)
+                       continue;
+               if (msidesc->nvec_used)
+                       nvec = msidesc->nvec_used;
+               else
+                       nvec = 1 << msidesc->msi_attrib.multiple;
+               for (i = 0; i < nvec; i++)
+                       xen_teardown_msi_irq(msidesc->irq + i);
+       }
 }
 
 void xen_nop_msi_mask(struct irq_data *data)
 {
 }
+
+struct msi_chip xen_msi_chip;
+
 #endif
 
 int __init pci_xen_init(void)
@@ -418,9 +430,9 @@ int __init pci_xen_init(void)
 #endif
 
 #ifdef CONFIG_PCI_MSI
-       x86_msi.setup_msi_irqs = xen_setup_msi_irqs;
-       x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
-       x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs;
+       xen_msi_chip.setup_irqs = xen_setup_msi_irqs;
+       xen_msi_chip.teardown_irqs = xen_teardown_msi_irqs;
+       x86_msi_chip = &xen_msi_chip;
        msi_chip.irq_mask = xen_nop_msi_mask;
        msi_chip.irq_unmask = xen_nop_msi_mask;
 #endif
@@ -441,8 +453,9 @@ int __init pci_xen_hvm_init(void)
 #endif
 
 #ifdef CONFIG_PCI_MSI
-       x86_msi.setup_msi_irqs = xen_hvm_setup_msi_irqs;
-       x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
+       xen_msi_chip.setup_irqs = xen_hvm_setup_msi_irqs;
+       xen_msi_chip.teardown_irq = xen_teardown_msi_irq;
+       x86_msi_chip = &xen_msi_chip;
 #endif
        return 0;
 }
@@ -499,9 +512,10 @@ int __init pci_xen_initial_domain(void)
        int irq;
 
 #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;
+       xen_msi_chip.setup_irqs = xen_initdom_setup_msi_irqs;
+       xen_msi_chip.teardown_irq = xen_teardown_msi_irq;
+       xen_msi_chip.restore_irqs = xen_initdom_restore_msi_irqs;
+       x86_msi_chip = &xen_msi_chip;
        msi_chip.irq_mask = xen_nop_msi_mask;
        msi_chip.irq_unmask = xen_nop_msi_mask;
 #endif
-- 
1.7.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.