This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


Re: [Xen-devel] [PATCH] Dont call msi_unmap_pirq() if did not enabled ms

To: Joe Jin <joe.jin@xxxxxxxxxx>
Subject: Re: [Xen-devel] [PATCH] Dont call msi_unmap_pirq() if did not enabled msi
From: Joe Jin <joe.jin@xxxxxxxxxx>
Date: Tue, 24 Nov 2009 10:02:53 +0800
Cc: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxx>, Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>, Kurt Hackel <kurt.hackel@xxxxxxxxxx>, "Jiang, Yunhong" <yunhong.jiang@xxxxxxxxx>, "Shan, Haitao" <haitao.shan@xxxxxxxxx>, Jan Beulich <JBeulich@xxxxxxxxxx>, Jerry Yuanjiang Ou <yuanjiang.ou@xxxxxxxxxx>, Keir Fraser <keir.fraser@xxxxxxxxxxxxx>, "greg.marsden@xxxxxxxxxx" <greg.marsden@xxxxxxxxxx>
Delivery-date: Mon, 23 Nov 2009 18:03:37 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <20091123022404.GA9692@xxxxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <20091116120030.GA13803@xxxxxxxxxxxxxxxxxxxxxxx> <20091116151546.GC30967@xxxxxxxxxxxxxxxxxxx> <20091117001909.GA18296@xxxxxxxxxxxxxxxxxxxxxxx> <4B0265DA02000078000200FF@xxxxxxxxxxxxxxxxxx> <20091117101416.GA23253@xxxxxxxxxxxxxxxxxxxxxxx> <4B0295380200007800020165@xxxxxxxxxxxxxxxxxx> <E2263E4A5B2284449EEBD0AAB751098418E55FBD04@xxxxxxxxxxxxxxxxxxxxxxxxxxxx> <20091123022404.GA9692@xxxxxxxxxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mutt/
Sorry I lost to set @dev->msi_enabled to false in pci_disable_msi,
here are the patch, please review and comment:

When device driver unload, it may call pci_disable_msi(), if msi did not
enabled but do msi_unmap_pirq(), then later driver reload and without
msi, then will failed in request_irq() for irq_desc[irq]->chip valie is
no_irq_chip. So when did not enable msi during driver initializing, then
unloaded driver will not try to disable it.

How to reproduce it:
  At the server with QLogic 25xx, try to reload qla2xxx will hit it.

Signed-off-by: Joe Jin <joe.jin@xxxxxxxxxx>
 msi-xen.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff -r c5c40e80bd7d drivers/pci/msi-xen.c
--- a/drivers/pci/msi-xen.c     Fri Nov 13 22:01:54 2009 +0000
+++ b/drivers/pci/msi-xen.c     Tue Nov 24 09:56:52 2009 +0800
@@ -618,6 +618,7 @@
                        return ret;
                dev->irq = evtchn_map_pirq(-1, dev->irq);
+               dev->msi_enabled = 1;
                msi_dev_entry->default_irq = temp;
                return ret;
@@ -662,9 +663,15 @@
        if (!is_initial_xendomain()) {
+               if (!(dev->msi_enabled)) {
+                       printk(KERN_INFO "PCI: %s: Device did not enabled 
+                              pci_name(dev));
+                       return;
+               }
                evtchn_map_pirq(dev->irq, 0);
                dev->irq = msi_dev_entry->default_irq;
+               dev->msi_enabled = 0;
@@ -673,6 +680,12 @@
        if (!pos)
+       if (!(dev->msi_enabled)) {
+               printk(KERN_INFO "PCI: %s: Device did not enabled MSI.\n",
+                      pci_name(dev));
+               return;
+       }
        pirq = dev->irq;
        /* Restore dev->irq to its default pin-assertion vector */
        dev->irq = msi_dev_entry->default_irq;

Xen-devel mailing list